From dbb267308dfcc458570e3c0af7835059aa06126c Mon Sep 17 00:00:00 2001 From: Erwin Bronkhorst Date: Wed, 13 Jan 2016 22:12:46 +0100 Subject: [PATCH 1/2] Translated using Weblate (Dutch) Currently translated at 100.0% (3210 of 3210 strings) [CI skip] --- po/nl.po | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index b8974345af..061fbade31 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-01-14 09:16+0100\n" -"PO-Revision-Date: 2016-01-13 22:12+0000\n" -"Last-Translator: Erwin Bronkhorst \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2016-01-15 18:35+0000\n" +"Last-Translator: dingo thirteen \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2610,6 +2610,12 @@ msgid "" "cause such a problem, clearing your \"Offline Website Data\" might help. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" +"Er was een probleem met het lezen van uw lokale browser opslag, sommige " +"functies kunnen daardoor mogelijk niet goed werken. Waarschijnlijk " +"ondersteunt uw browser geen lokale opslag of gelimiteerd. In Firefox kan " +"gecorrumpeerde opslag ook dit probleem veroorzaken, wissen van uw \"" +"Offslinewebsitegegevens\" kan dan helpen. In Safari wordt dit probleem " +"meestal veroorzaakt door \"Privénavigatie\"." #: js/messages.php:635 msgctxt "Previous month" From 0f7927e16f8750b747bc4e3985ef082bacba8aea Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 15 Jan 2016 16:52:26 -0500 Subject: [PATCH 2/2] 4.5.5-dev Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69c85c0ff8..2ab46b6f42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.5.5.0 (not yet released) + 4.5.4.0 (not yet released) - issue #11724 live data edit of big sets is not working - issue Table list not saved in db QBE bookmarked search diff --git a/README b/README index ff8ab7af92..93991384e0 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.4-dev +Version 4.5.5-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 133e310fd6..8232cd14e3 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.4-dev' +version = '4.5.5-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index c811d7b21a..c3b220f9be 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.4-dev'); + $this->set('PMA_VERSION', '4.5.5-dev'); /** * @deprecated */