From eeed348ddc4bc28e909a1187879735441f715af9 Mon Sep 17 00:00:00 2001 From: cherbib mehdi Date: Tue, 17 Jun 2014 16:11:13 +0200 Subject: [PATCH 1/4] Translated using Weblate (Arabic) Currently translated at 41.0% (1138 of 2770) --- po/ar.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/ar.po b/po/ar.po index 4149e25247..f066e18bc8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,17 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-04-22 09:59+0200\n" -"Last-Translator: Nabil Kadimi \n" -"Language-Team: Arabic \n" +"PO-Revision-Date: 2014-06-17 16:11+0200\n" +"Last-Translator: cherbib mehdi \n" +"Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 1.9-dev\n" +"X-Generator: Weblate 1.10-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -440,15 +439,15 @@ msgstr "لربما يكون من الأفضل أن تقوم بتحديث هذه msgid "" "An error has been detected and an error report has been generated but failed " "to be sent." -msgstr "" +msgstr "لقد وقع خطء و لقد تم انشاء التقرير و لكن لم نتمكّن من إرساله." #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." -msgstr "" +msgstr "عند ملاحضة أي مشكلة نرجو منكم ان تعلنوا عنه يدويا." #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." -msgstr "" +msgstr "شكرا لك لتقديم هذا التقرير." #: error_report.php:74 msgid "Unfortunately the submission failed." From 7b2d66f08c565a7a474a985ebafe9f3a04811f9e Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Mon, 16 Jun 2014 19:44:24 +0200 Subject: [PATCH 2/4] Translated using Weblate (Interlingua) Currently translated at 52.0% (1441 of 2770) --- po/ia.po | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/po/ia.po b/po/ia.po index 28ade073e7..4ddb4e4e0a 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-06-11 10:28+0200\n" +"PO-Revision-Date: 2014-06-16 19:44+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -6775,23 +6775,23 @@ msgstr "" #: libraries/config/messages.inc.php:773 msgid "List of trusted proxies for IP allow/deny" -msgstr "" +msgstr "Lista de proxy digne de fide pro filtrar IP, accepta/refusa" #: libraries/config/messages.inc.php:774 msgid "Directory on server where you can upload files for import." -msgstr "" +msgstr "Directorio sur le servitor ubi tu pote incargar files de importar." #: libraries/config/messages.inc.php:775 msgid "Upload directory" -msgstr "" +msgstr "Directorio de incargar" #: libraries/config/messages.inc.php:776 msgid "Allow for searching inside the entire database." -msgstr "" +msgstr "Permitte cerca intra le integre base de datos." #: libraries/config/messages.inc.php:777 msgid "Use database search" -msgstr "" +msgstr "Usa cerca de base de datos" #: libraries/config/messages.inc.php:778 msgid "" @@ -6801,22 +6801,24 @@ msgstr "" #: libraries/config/messages.inc.php:779 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Habilita le scheda del Disveloppator in preferentias" #: libraries/config/messages.inc.php:780 setup/frames/index.inc.php:312 msgid "Check for latest version" -msgstr "" +msgstr "Verifica le ultime version" #: libraries/config/messages.inc.php:781 msgid "Enables check for latest version on main phpMyAdmin page." msgstr "" +"Habilita le verifica del ultime version sur le pagina principal de " +"phpMyAdmin." #: libraries/config/messages.inc.php:782 setup/lib/index.lib.php:117 #: setup/lib/index.lib.php:131 setup/lib/index.lib.php:144 #: setup/lib/index.lib.php:156 setup/lib/index.lib.php:164 #: setup/lib/index.lib.php:171 msgid "Version check" -msgstr "" +msgstr "Verifica de version" #: libraries/config/messages.inc.php:783 msgid "" @@ -6828,7 +6830,7 @@ msgstr "" #: libraries/config/messages.inc.php:784 msgid "Proxy url" -msgstr "" +msgstr "Url de proxy" #: libraries/config/messages.inc.php:785 msgid "" @@ -6839,11 +6841,11 @@ msgstr "" #: libraries/config/messages.inc.php:786 msgid "Proxy username" -msgstr "" +msgstr "Nomine de usator de proxy" #: libraries/config/messages.inc.php:787 msgid "The password for authenticating with the proxy." -msgstr "" +msgstr "Le contrasigno per authenticar se con le proxy." #: libraries/config/messages.inc.php:788 msgid "Proxy password" @@ -6859,23 +6861,23 @@ msgstr "" #: libraries/config/messages.inc.php:791 msgid "ZIP" -msgstr "" +msgstr "ZIP" #: libraries/config/messages.inc.php:792 msgid "Enter your public key for your domain reCaptcha service." -msgstr "" +msgstr "Inserta tu clave public pro le dominio servicio de reCaptcha." #: libraries/config/messages.inc.php:793 msgid "Public key for reCaptcha" -msgstr "" +msgstr "Clave public pro reCaptcha" #: libraries/config/messages.inc.php:794 msgid "Enter your private key for your domain reCaptcha service." -msgstr "" +msgstr "Inserta tu clave private pro tu servicio de dominio reCaptcha." #: libraries/config/messages.inc.php:795 msgid "Private key for reCaptcha" -msgstr "" +msgstr "Clave private pro reCaptcha" #: libraries/config/messages.inc.php:797 msgid "Choose the default action when sending error reports." @@ -6883,28 +6885,28 @@ msgstr "Selige le action predefinite quando on invia reportos de error." #: libraries/config/messages.inc.php:798 msgid "Send error reports" -msgstr "" +msgstr "Invia reportos de errores" #: libraries/config/setup.forms.php:40 msgid "Config authentication" -msgstr "" +msgstr "Authentication via Config" #: libraries/config/setup.forms.php:44 msgid "Cookie authentication" -msgstr "" +msgstr "Authentication via Cookie" #: libraries/config/setup.forms.php:47 msgid "HTTP authentication" -msgstr "" +msgstr "Authentication via HTTP" #: libraries/config/setup.forms.php:50 msgid "Signon authentication" -msgstr "" +msgstr "Authentication via signon" #: libraries/config/setup.forms.php:254 #: libraries/config/user_preferences.forms.php:158 msgid "CSV using LOAD DATA" -msgstr "" +msgstr "CSV usante LOAD DATA" #: libraries/config/setup.forms.php:263 libraries/config/setup.forms.php:360 #: libraries/config/user_preferences.forms.php:166 @@ -7629,7 +7631,7 @@ msgstr "" #: libraries/error_report.lib.php:293 msgid "Automatically send report next time" -msgstr "" +msgstr "Invia automaticamente le reporto le proxime vice" #: libraries/export.lib.php:113 libraries/export.lib.php:144 #: libraries/export.lib.php:364 From 8b9386467003b6c87097e4df7d24d1561b05abe2 Mon Sep 17 00:00:00 2001 From: Rui Ralha Date: Tue, 17 Jun 2014 14:34:30 +0200 Subject: [PATCH 3/4] Translated using Weblate (Portuguese) Currently translated at 63.2% (1751 of 2770) --- po/pt.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/pt.po b/po/pt.po index 484001ba0d..4a345ca540 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-05-12 17:44+0200\n" -"Last-Translator: Júlio Sebastião \n" -"Language-Team: Portuguese \n" +"PO-Revision-Date: 2014-06-17 14:34+0200\n" +"Last-Translator: Rui Ralha \n" +"Language-Team: Portuguese " +"\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.9\n" +"X-Generator: Weblate 1.10-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -7626,9 +7626,8 @@ msgid "Please explain the steps that lead to the error:" msgstr "" #: libraries/error_report.lib.php:293 -#, fuzzy msgid "Automatically send report next time" -msgstr "Versão do servidor" +msgstr "Enviar o relatóro automáticamente da próxima vez" #: libraries/export.lib.php:113 libraries/export.lib.php:144 #: libraries/export.lib.php:364 From aebfcfdc9f9f4f328c128e365e8e2ca209441e0c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 20 Jun 2014 08:47:51 -0400 Subject: [PATCH 4/4] 4.2.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 405dc8e04a..77fec6ae23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.2.5.0 (not yet released) + 4.2.4.0 (not yet released) - bug #4449 Mediawiki export does not produce table header row; also fix related PHP warnings - bug #4442 New lines are added to query every time diff --git a/README b/README index 27e3227dac..9b60db21f4 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.4-dev +Version 4.2.5-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 2df3dbb5ab..a04674dc2d 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.2.4-dev' +version = '4.2.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 e2f661e957..068cfb1603 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.4-dev'); + $this->set('PMA_VERSION', '4.2.5-dev'); /** * @deprecated */