From 917e126e5e6bbd8713722ec8f86f27ea30b0fd3f Mon Sep 17 00:00:00 2001 From: Tony Chen Date: Tue, 30 Jul 2013 10:31:33 +0200 Subject: [PATCH 1/4] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2609.0 of 2609) --- po/zh_TW.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 25faa2ccfd..4f22854400 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-06-25 11:10+0200\n" +"PO-Revision-Date: 2013-07-30 10:31+0200\n" "Last-Translator: Tony Chen \n" -"Language-Team: Traditional Chinese \n" +"Language-Team: Traditional Chinese " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.6-dev\n" +"X-Generator: Weblate 1.6\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344 #: libraries/DisplayResults.class.php:813 @@ -2562,16 +2562,16 @@ msgid "" msgstr "這個檢視至少需包含這個數目的資料，請參考%sdocumentation%s。" #: libraries/DisplayResults.class.php:4927 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "顯示行" +msgstr "顯示行 %1s-%2s" #: libraries/DisplayResults.class.php:4939 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "總計" +msgstr "總數 %d" #: libraries/DisplayResults.class.php:4951 sql.php:945 #, php-format From a58c58a29af1fa55e937e8e5a8c20cb4e83cafa0 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Tue, 30 Jul 2013 11:15:34 +0200 Subject: [PATCH 2/4] Translated using Weblate (Swedish) Currently translated at 100.0% (2609.0 of 2609) --- po/sv.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/sv.po b/po/sv.po index 74da97cdf9..0629f38265 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-07-19 18:15+0200\n" -"Last-Translator: ProUser \n" +"PO-Revision-Date: 2013-07-30 11:15+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.6-dev\n" +"X-Generator: Weblate 1.6\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344 #: libraries/DisplayResults.class.php:813 @@ -2603,16 +2603,16 @@ msgid "" msgstr "Denna vy har åtminstone detta antal rader. Se %sdokumentationen%s." #: libraries/DisplayResults.class.php:4927 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "Visar rader" +msgstr "Visar raderna %1s - %2s" #: libraries/DisplayResults.class.php:4939 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "totalt" +msgstr "%d totalt" #: libraries/DisplayResults.class.php:4951 sql.php:945 #, php-format From a46c38ca9447e889c840afd08e3e2b7ffd264898 Mon Sep 17 00:00:00 2001 From: "G. S" Date: Tue, 30 Jul 2013 14:14:46 +0200 Subject: [PATCH 3/4] Translated using Weblate (Hungarian) Currently translated at 100.0% (2609.0 of 2609) --- po/hu.po | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/po/hu.po b/po/hu.po index 4e4239f967..b187480d2e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,16 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-07-09 11:53+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2013-07-30 14:14+0200\n" +"Last-Translator: G. S. \n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.6-dev\n" +"X-Generator: Weblate 1.6\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344 #: libraries/DisplayResults.class.php:813 @@ -2621,16 +2620,16 @@ msgstr "" "%sdokumentációban%s." #: libraries/DisplayResults.class.php:4927 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "Megjelenített sorok" +msgstr "Sorok megjelenítése %1s-%2s" #: libraries/DisplayResults.class.php:4939 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "összesen" +msgstr "összesen %d" #: libraries/DisplayResults.class.php:4951 sql.php:945 #, php-format @@ -3320,7 +3319,7 @@ msgid "" "range is 0 to 4,294,967,295." msgstr "" "4 bájtos integer, signed tartomány -2 147 483 648 és 2 147 483 647 között, " -"unsigned tartomány 0 és 4 294 967 295 között" +"unsigned tartomány 0 és 4 294 967 295 között." #: libraries/Types.class.php:304 msgid "" @@ -4782,7 +4781,6 @@ msgid "Customize import defaults" msgstr "Importálás alapértelmezéseinek testreszabása" #: libraries/config/messages.inc.php:211 -#, fuzzy #| msgid "Customize navigation frame" msgid "Customize navigation panel" msgstr "A navigációs keret testreszabása" From baf3dd9b6a14c74005b3f7123be61536c4dd7e5b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 30 Jul 2013 08:27:12 -0400 Subject: [PATCH 4/4] Bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) --- ChangeLog | 1 + doc/require.rst | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 548df626cb..e188914b30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.0.6.0 (not yet released) +- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) 4.0.5.0 (not yet released) - bug #3977 Not detected configuration storage diff --git a/doc/require.rst b/doc/require.rst index 1452ee34ff..e7c5350d9a 100644 --- a/doc/require.rst +++ b/doc/require.rst @@ -13,13 +13,10 @@ PHP --- * You need PHP 5.2.0 or newer, with ``session`` support, the Standard PHP Library - (SPL) extension and JSON support. + (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions. * To support uploading of ZIP files, you need the PHP ``zip`` extension. -* For proper support of multibyte strings (eg. UTF-8, which is currently - the default), you should install the ``mbstring`` and ``ctype`` extensions. - * You need GD2 support in PHP to display inline thumbnails of JPEGs ("image/jpeg: inline") with their original aspect ratio.