From 46a0f83f8c7cbd7e2b80178915c3b93de09fb193 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 15 Oct 2015 20:37:27 +0200 Subject: [PATCH 1/7] Translated using Weblate (French) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index e5836475d7..1f3a25bd1a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-15 14:29-0400\n" -"PO-Revision-Date: 2015-10-14 13:28+0200\n" +"PO-Revision-Date: 2015-10-15 20:37+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12580,7 +12580,6 @@ msgid "SHA256 password authentication" msgstr "Authentification par mot de passe SHA256" #: libraries/server_privileges.lib.php:1463 -#, fuzzy #| msgid "Native MySQL authentication" msgid "Native MySQL Authentication" msgstr "Authentification MySQL native" From 169a6504f899362372aae17098b2947900d03b68 Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Thu, 15 Oct 2015 18:12:57 +0200 Subject: [PATCH 2/7] Translated using Weblate (Italian) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/it.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/it.po b/po/it.po index 9a9c61a578..e3476dbae1 100644 --- a/po/it.po +++ b/po/it.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-15 14:29-0400\n" -"PO-Revision-Date: 2015-10-15 18:12+0200\n" +"PO-Revision-Date: 2015-10-15 22:15+0200\n" "Last-Translator: Stefano Martinelli \n" -"Language-Team: Italian \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12587,7 +12587,6 @@ msgid "SHA256 password authentication" msgstr "Autenticazione password tramite SHA256" #: libraries/server_privileges.lib.php:1463 -#, fuzzy #| msgid "Native MySQL authentication" msgid "Native MySQL Authentication" msgstr "Autenticazione MySQL nativa" From 24bf7ac861a142b53845eff02c2d1551f35907a0 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Thu, 15 Oct 2015 23:18:11 +0200 Subject: [PATCH 3/7] Translated using Weblate (Dutch) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/nl.po | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index 95da590564..e790ac43b7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-15 14:29-0400\n" -"PO-Revision-Date: 2015-10-15 11:01+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2015-10-15 23:18+0200\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" @@ -965,10 +965,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Weet u zeker dat u de geselecteerde partitiie(s) wilt afbreken?" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to RESET SLAVE?" -msgstr "Weet u zeker dat u de query \"%s\" wil uitvoeren?" +msgstr "Weet u zeker dat u RESET SLAVE wil uitvoeren?" #: js/messages.php:68 msgid "" @@ -12550,22 +12549,19 @@ msgstr "" "rechtentabel opnieuw op te vragen." #: libraries/server_privileges.lib.php:1447 -#, fuzzy #| msgid "Cookie authentication" msgid "Native MySQL authentication" -msgstr "Cookie-authenticatie" +msgstr "MySQL authenticatie" #: libraries/server_privileges.lib.php:1449 -#, fuzzy #| msgid "Signon authentication" msgid "SHA256 password authentication" -msgstr "Signon-authenticatie" +msgstr "SHA256 wachtwoord authenticatie" #: libraries/server_privileges.lib.php:1463 -#, fuzzy #| msgid "Cookie authentication" msgid "Native MySQL Authentication" -msgstr "Cookie-authenticatie" +msgstr "MySQL authenticatie" #: libraries/server_privileges.lib.php:1517 #: libraries/server_privileges.lib.php:2989 @@ -12606,10 +12602,9 @@ msgid "Authentication Plugin" msgstr "Authenticatie Plugin" #: libraries/server_privileges.lib.php:1787 -#, fuzzy #| msgid "Password Hashing:" msgid "Password Hashing Method" -msgstr "Wachtwoord-hashing:" +msgstr "Wachtwoord hashing methode" #: libraries/server_privileges.lib.php:2058 #, php-format From 127b3e5564c1d22195fd6514dcae933281381fe8 Mon Sep 17 00:00:00 2001 From: Domen Date: Tue, 13 Oct 2015 20:52:59 +0200 Subject: [PATCH 4/7] Translated using Weblate (Slovenian) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/sl.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/sl.po b/po/sl.po index c5396a9d8b..584365418e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-15 14:29-0400\n" -"PO-Revision-Date: 2015-10-13 20:52+0200\n" +"PO-Revision-Date: 2015-10-15 23:49+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" "X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 @@ -12444,7 +12444,6 @@ msgid "SHA256 password authentication" msgstr "Overitev z geslom SHA256" #: libraries/server_privileges.lib.php:1463 -#, fuzzy #| msgid "Native MySQL authentication" msgid "Native MySQL Authentication" msgstr "Domorodna overitev MySQL" From c7025ee26d5ae68add9eb3c0e3bf764f590540ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Tue, 13 Oct 2015 22:30:17 +0200 Subject: [PATCH 5/7] Translated using Weblate (Greek) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/el.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/el.po b/po/el.po index 3067b5c5f2..312b21ecac 100644 --- a/po/el.po +++ b/po/el.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-15 14:29-0400\n" -"PO-Revision-Date: 2015-10-13 22:30+0200\n" +"PO-Revision-Date: 2015-10-16 01:24+0200\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" -"Language-Team: Greek \n" +"Language-Team: Greek " +"\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12578,10 +12578,9 @@ msgid "SHA256 password authentication" msgstr "Πιστοποίηση κωδικού πρόσβασης SHA256" #: libraries/server_privileges.lib.php:1463 -#, fuzzy #| msgid "Native MySQL authentication" msgid "Native MySQL Authentication" -msgstr "Γηγενής πιστοποίηση MySQL" +msgstr "Γηγενής Πιστοποίηση MySQL" #: libraries/server_privileges.lib.php:1517 #: libraries/server_privileges.lib.php:2989 From 95b5d9adf4bcc84954685d766d89d7937ced13af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 15 Oct 2015 11:09:07 +0200 Subject: [PATCH 6/7] Translated using Weblate (Turkish) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/tr.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/tr.po b/po/tr.po index 616ba19ea6..aedabb59d1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-15 14:29-0400\n" -"PO-Revision-Date: 2015-10-15 11:09+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Turkish \n" +"PO-Revision-Date: 2015-10-16 14:19+0200\n" +"Last-Translator: Burak Yavuz \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12461,10 +12461,9 @@ msgid "SHA256 password authentication" msgstr "SHA256 parola kimlik doğrulaması" #: libraries/server_privileges.lib.php:1463 -#, fuzzy #| msgid "Native MySQL authentication" msgid "Native MySQL Authentication" -msgstr "Yerel MySQL kimlik doğrulaması" +msgstr "Yerel MySQL Kimlik Doğrulaması" #: libraries/server_privileges.lib.php:1517 #: libraries/server_privileges.lib.php:2989 From 6fceaa298d48b4393d428ee70e74a8aabcafbea8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 17 Oct 2015 07:16:32 -0400 Subject: [PATCH 7/7] 4.5.2-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 d0bd66a90e..945c43be17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.5.2.0 (not yet released) + 4.5.1.0 (not yet released) - issue Invalid argument supplied for foreach() - issue array_key_exists() expects parameter 2 to be array diff --git a/README b/README index 1eba2efe6c..1b6cf7de5b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.1-dev +Version 4.5.2-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index de04fbfad5..fdd697df56 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.1-dev' +version = '4.5.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b02acfc272..67b1ca1e1a 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.1-dev'); + $this->set('PMA_VERSION', '4.5.2-dev'); /** * @deprecated */