- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25778-g870be93
by Michal Čihař 01 Jan '12

01 Jan '12

The branch, master has been updated via 870be9328c340cb4673b8af777d8168135ad540d (commit) via 1673b546d937a8042c1b92f3d04b9bebb649aadc (commit) via 12086c6eea0ac22804014d74396556d8c11d0e97 (commit) via 930d21f0a1e70a71e2fb46f5b9cc678269376301 (commit) via 7777d12ae9a14b02311ae24ddbdf8b015a90379a (commit) via b44d713d8ff061b997fe5ad46bac5d8e5fc84ea2 (commit) via f66768f018501321a71b55e902d1e7b990a9a841 (commit) via 111bac71231d1e9529c366f86f3410767e016cb3 (commit) via 7886b5652c224a0b6ce4926be8e602b1f6e9f9f1 (commit) via 24339718461aa9cf8dd662fd6cf6147f54bd8a86 (commit) via ed6e6fb2b49b3bc9bbdf89d6c27fb571c7258b01 (commit) via 4cf08d48bb7f5e0b58dbedc51e9e4c3f943f70d9 (commit) via a95cbea19dd688533ce859b1258049debe9b376a (commit) via aec787ef1a2c3efd5ffa2baeaacc9ce82966c7f5 (commit) via f80191e80c25bddf3b52f88bbf3397212456e0eb (commit) via f84993e65a148e709b7ac8e7339772505914c716 (commit) via 3e5501f72e305c93da13ba741f4ceaa6b46162da (commit) via 8b90a94a1b7512b4aa2b8b38ca83e922a33a7d5d (commit) via e3defb7af7a51e197dd6cde99c45e1b31a068470 (commit) via 5d33c7267e3e601d4f327b33925f30af14e28d8f (commit) via 6f66fb01775580cb3533e2737be6c0be6b898ac0 (commit) via db96afd964a7739b54acf3a1fa7e055ca1d98043 (commit) via 70178ab588c70be37fb1f68282d67d2ada52582a (commit) via 8c695003a75d8f19855400f8ddf78bc66fbd4b30 (commit) via 90ee497824dad7d41d4f9bbf34b3e495f3535b94 (commit) via 89db7838efc559735d94174afa35a0987af2d6a6 (commit) via 7071e83b3d426de7b5a67d4e6c513814aa0c5078 (commit) via db9329014eaab0ce7e5563c9246ac9160579f6bd (commit) via 4265bbe6462fdd1efc84831f8f5b4ace4d523d6a (commit) via d98e93718202a7fafe77caa0518d36b7c3bcc3f9 (commit) via 0d4cc7866071459b4bc7273f7b9ee705c2b40d3e (commit) via d6f601951b7a8b34cf350f1541bf7a38a4163810 (commit) via 249d1bcc3f0a0024c7f0f5bc3b0479c888b676ce (commit) via 25f52e7ee06e6c1f5087e5a05381d737aa77aa46 (commit) via 6439dd06683bb5b67e6e076e342eba00df269fad (commit) via 9f7011c5e7dcdacbb2a009b971d5491472b67c74 (commit) via bb0a347cd3956ff0fe473f8d7554bd681e34eecd (commit) via b2ddc6a25fa3e7a47184bfe6241b2c587b7ea7fa (commit) via fbae15e466abdab2a17f0ad797d8820f583efe91 (commit) via 4ff239f6824624c9af637b2d9688e1ab5e0e064c (commit) via e9f207e500858d0fedfbe246dcfcd9f3307491f0 (commit) via fc077c980095b6cc5bceb8b807114d2c68764ad4 (commit) via 24e14dd42d67805ba70dd7c5e04bb0724f777813 (commit) via ce1a74977b7de95be4344dcb078e8034c59185f7 (commit) via f4064e5ed14fc604e7124643c09b55d88d3d00c0 (commit) via 60d48c66bacfc1d9d750415d354d053c1fcb33d8 (commit) via 15323ad816d0c4d9a35c11304592a3e9cd6c75df (commit) via 18007a1d8f55ef76e3910612f36fa05dc051561e (commit) via dc84147cf101b21a81b2fca9d8af25389cb89a06 (commit) via 620d4db86ac90dd970e15df3e78c4e1c0ce94c78 (commit) via eaf4f6cac34096e3828adb4b1bb1c12ddaa85a89 (commit) via 2edeff8d530dd97425077d11bc023555a31eddb8 (commit) via 42ba21dd691532dc394180be18c17a8d423f4efc (commit) via 6df4260a7be0b745804543343b2441ee44147bab (commit) via 47318fce2ed4ca444277b604f028f4db1470aa01 (commit) via 10fbf3d5ce28f29d7c12bfa7ba600570e64fefae (commit) via a46afab42f293107055872ef0de998fc02a285f0 (commit) via c29924fad68081c699cadc954bd5bc01a3c36d0b (commit) via 34c49d2db349dd434328dd7107ceee6d9c55f8a7 (commit) via e82ad394887790ae2bca87655dbf2dc7f9ca6883 (commit) via b3f90f17ea80f4accac2afe688698d28110fdb09 (commit) via 72983da0286f8892019c02e01b52a382c8c1725a (commit) from 78c1a6519b4b8007251c6cdc0aa3ba4491066816 (commit) - Log ----------------------------------------------------------------- commit 870be9328c340cb4673b8af777d8168135ad540d Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 15:54:16 2012 +0100 Fix po file header commit 1673b546d937a8042c1b92f3d04b9bebb649aadc Author: any anonymous user <> Date: Sun Jan 1 16:53:12 2012 +0200 Translation update done using Pootle. commit 12086c6eea0ac22804014d74396556d8c11d0e97 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:53:12 2012 +0200 Translation update done using Pootle. commit 930d21f0a1e70a71e2fb46f5b9cc678269376301 Author: any anonymous user <> Date: Sun Jan 1 16:53:03 2012 +0200 Translation update done using Pootle. commit 7777d12ae9a14b02311ae24ddbdf8b015a90379a Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:53:03 2012 +0200 Translation update done using Pootle. commit b44d713d8ff061b997fe5ad46bac5d8e5fc84ea2 Author: any anonymous user <> Date: Sun Jan 1 16:52:58 2012 +0200 Translation update done using Pootle. commit f66768f018501321a71b55e902d1e7b990a9a841 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:58 2012 +0200 Translation update done using Pootle. commit 111bac71231d1e9529c366f86f3410767e016cb3 Author: any anonymous user <> Date: Sun Jan 1 16:52:54 2012 +0200 Translation update done using Pootle. commit 7886b5652c224a0b6ce4926be8e602b1f6e9f9f1 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:54 2012 +0200 Translation update done using Pootle. commit 24339718461aa9cf8dd662fd6cf6147f54bd8a86 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:50 2012 +0200 Translation update done using Pootle. commit ed6e6fb2b49b3bc9bbdf89d6c27fb571c7258b01 Author: any anonymous user <> Date: Sun Jan 1 16:52:42 2012 +0200 Translation update done using Pootle. commit 4cf08d48bb7f5e0b58dbedc51e9e4c3f943f70d9 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:42 2012 +0200 Translation update done using Pootle. commit a95cbea19dd688533ce859b1258049debe9b376a Author: any anonymous user <> Date: Sun Jan 1 16:52:38 2012 +0200 Translation update done using Pootle. commit aec787ef1a2c3efd5ffa2baeaacc9ce82966c7f5 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:38 2012 +0200 Translation update done using Pootle. commit f80191e80c25bddf3b52f88bbf3397212456e0eb Author: any anonymous user <> Date: Sun Jan 1 16:52:34 2012 +0200 Translation update done using Pootle. commit f84993e65a148e709b7ac8e7339772505914c716 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:33 2012 +0200 Translation update done using Pootle. commit 3e5501f72e305c93da13ba741f4ceaa6b46162da Author: any anonymous user <> Date: Sun Jan 1 16:52:30 2012 +0200 Translation update done using Pootle. commit 8b90a94a1b7512b4aa2b8b38ca83e922a33a7d5d Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:30 2012 +0200 Translation update done using Pootle. commit e3defb7af7a51e197dd6cde99c45e1b31a068470 Author: any anonymous user <> Date: Sun Jan 1 16:52:26 2012 +0200 Translation update done using Pootle. commit 5d33c7267e3e601d4f327b33925f30af14e28d8f Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:26 2012 +0200 Translation update done using Pootle. commit 6f66fb01775580cb3533e2737be6c0be6b898ac0 Author: any anonymous user <> Date: Sun Jan 1 16:52:23 2012 +0200 Translation update done using Pootle. commit db96afd964a7739b54acf3a1fa7e055ca1d98043 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:22 2012 +0200 Translation update done using Pootle. commit 70178ab588c70be37fb1f68282d67d2ada52582a Author: any anonymous user <> Date: Sun Jan 1 16:52:18 2012 +0200 Translation update done using Pootle. commit 8c695003a75d8f19855400f8ddf78bc66fbd4b30 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:17 2012 +0200 Translation update done using Pootle. commit 90ee497824dad7d41d4f9bbf34b3e495f3535b94 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:13 2012 +0200 Translation update done using Pootle. commit 89db7838efc559735d94174afa35a0987af2d6a6 Author: any anonymous user <> Date: Sun Jan 1 16:52:08 2012 +0200 Translation update done using Pootle. commit 7071e83b3d426de7b5a67d4e6c513814aa0c5078 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jan 1 16:52:08 2012 +0200 Translation update done using Pootle. commit db9329014eaab0ce7e5563c9246ac9160579f6bd Author: any anonymous user <> Date: Sun Jan 1 16:52:02 2012 +0200 Translation update done using Pootle. commit 4265bbe6462fdd1efc84831f8f5b4ace4d523d6a Author: Pootle server <noreply(a)l10n.cihar.com> Date: Sun Jan 1 16:52:01 2012 +0200 Translation update done using Pootle. commit d98e93718202a7fafe77caa0518d36b7c3bcc3f9 Merge: 0d4cc78 78c1a65 Author: Pootle server <pootle(a)cihar.com> Date: Sat Dec 31 06:40:22 2011 +0100 Merge remote-tracking branch 'origin/master' commit 0d4cc7866071459b4bc7273f7b9ee705c2b40d3e Merge: d6f6019 8078441 Author: Pootle server <pootle(a)cihar.com> Date: Fri Dec 30 22:40:30 2011 +0100 Merge remote-tracking branch 'origin/master' commit d6f601951b7a8b34cf350f1541bf7a38a4163810 Author: Pootle server <noreply(a)l10n.cihar.com> Date: Thu Dec 29 18:19:27 2011 +0200 Translation update done using Pootle. commit 249d1bcc3f0a0024c7f0f5bc3b0479c888b676ce Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:17:28 2011 +0200 Translation update done using Pootle. commit 25f52e7ee06e6c1f5087e5a05381d737aa77aa46 Author: any anonymous user <> Date: Thu Dec 29 18:15:00 2011 +0200 Translation update done using Pootle. commit 6439dd06683bb5b67e6e076e342eba00df269fad Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:15:00 2011 +0200 Translation update done using Pootle. commit 9f7011c5e7dcdacbb2a009b971d5491472b67c74 Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:14:15 2011 +0200 Translation update done using Pootle. commit bb0a347cd3956ff0fe473f8d7554bd681e34eecd Author: any anonymous user <> Date: Thu Dec 29 18:12:30 2011 +0200 Translation update done using Pootle. commit b2ddc6a25fa3e7a47184bfe6241b2c587b7ea7fa Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:12:30 2011 +0200 Translation update done using Pootle. commit fbae15e466abdab2a17f0ad797d8820f583efe91 Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:12:23 2011 +0200 Translation update done using Pootle. commit 4ff239f6824624c9af637b2d9688e1ab5e0e064c Author: any anonymous user <> Date: Thu Dec 29 18:11:16 2011 +0200 Translation update done using Pootle. commit e9f207e500858d0fedfbe246dcfcd9f3307491f0 Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:11:16 2011 +0200 Translation update done using Pootle. commit fc077c980095b6cc5bceb8b807114d2c68764ad4 Author: any anonymous user <> Date: Thu Dec 29 18:11:00 2011 +0200 Translation update done using Pootle. commit 24e14dd42d67805ba70dd7c5e04bb0724f777813 Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:11:00 2011 +0200 Translation update done using Pootle. commit ce1a74977b7de95be4344dcb078e8034c59185f7 Author: any anonymous user <> Date: Thu Dec 29 18:10:33 2011 +0200 Translation update done using Pootle. commit f4064e5ed14fc604e7124643c09b55d88d3d00c0 Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:10:33 2011 +0200 Translation update done using Pootle. commit 60d48c66bacfc1d9d750415d354d053c1fcb33d8 Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:10:04 2011 +0200 Translation update done using Pootle. commit 15323ad816d0c4d9a35c11304592a3e9cd6c75df Author: any anonymous user <> Date: Thu Dec 29 18:09:17 2011 +0200 Translation update done using Pootle. commit 18007a1d8f55ef76e3910612f36fa05dc051561e Author: WillBa <widelan10(a)gmail.com> Date: Thu Dec 29 18:09:17 2011 +0200 Translation update done using Pootle. commit dc84147cf101b21a81b2fca9d8af25389cb89a06 Author: mariemidias <mariemidias(a)yahoo.com.br> Date: Thu Dec 29 18:00:25 2011 +0200 Translation update done using Pootle. commit 620d4db86ac90dd970e15df3e78c4e1c0ce94c78 Merge: eaf4f6c d5dede3 Author: Pootle server <pootle(a)cihar.com> Date: Thu Dec 29 16:40:08 2011 +0100 Merge remote-tracking branch 'origin/master' commit eaf4f6cac34096e3828adb4b1bb1c12ddaa85a89 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:55:01 2011 +0200 Translation update done using Pootle. commit 2edeff8d530dd97425077d11bc023555a31eddb8 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:54:32 2011 +0200 Translation update done using Pootle. commit 42ba21dd691532dc394180be18c17a8d423f4efc Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:54:21 2011 +0200 Translation update done using Pootle. commit 6df4260a7be0b745804543343b2441ee44147bab Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:54:11 2011 +0200 Translation update done using Pootle. commit 47318fce2ed4ca444277b604f028f4db1470aa01 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:54:02 2011 +0200 Translation update done using Pootle. commit 10fbf3d5ce28f29d7c12bfa7ba600570e64fefae Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:53:54 2011 +0200 Translation update done using Pootle. commit a46afab42f293107055872ef0de998fc02a285f0 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:53:42 2011 +0200 Translation update done using Pootle. commit c29924fad68081c699cadc954bd5bc01a3c36d0b Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:53:34 2011 +0200 Translation update done using Pootle. commit 34c49d2db349dd434328dd7107ceee6d9c55f8a7 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:53:26 2011 +0200 Translation update done using Pootle. commit e82ad394887790ae2bca87655dbf2dc7f9ca6883 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:53:18 2011 +0200 Translation update done using Pootle. commit b3f90f17ea80f4accac2afe688698d28110fdb09 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 14:53:05 2011 +0200 Translation update done using Pootle. commit 72983da0286f8892019c02e01b52a382c8c1725a Author: Macrotus <rokkeri(a)hotmail.com> Date: Thu Dec 29 03:40:25 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 34 ++++++++++++++-------------------- po/fi.po | 4 ++-- po/pt_BR.po | 39 ++++++++++++++++----------------------- po/tk.po | 39 ++++++++++++++++++++++----------------- 4 files changed, 54 insertions(+), 62 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 27ed54d..1b51f51 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-12-06 22:32+0200\n" -"Last-Translator: Michal Čihař <michal(a)cihar.com>\n" +"PO-Revision-Date: 2011-12-29 14:54+0200\n" +"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -1528,10 +1528,9 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analysing & loading logs. This may take a while." #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "Read requests" +msgstr "Cancel request" #: js/messages.php:177 msgid "" @@ -1566,16 +1565,14 @@ msgid "Log analysed, but no data found in this time span." msgstr "Log analyzed, but no data found in this time span." #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "Analyse" +msgstr "Analyzing..." #: js/messages.php:185 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Explain SQL" +msgstr "Explain output" #: js/messages.php:187 js/messages.php:487 libraries/rte/rte_list.lib.php:62 #: libraries/rte/rte_triggers.lib.php:326 server_status.php:1236 sql.php:893 @@ -1583,16 +1580,14 @@ msgid "Time" msgstr "Time" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Total:" +msgstr "Total time:" #: js/messages.php:189 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Profiling" +msgstr "Profiling results" #: js/messages.php:190 #, fuzzy @@ -1602,10 +1597,9 @@ msgid "Table" msgstr "Table" #: js/messages.php:191 -#, fuzzy #| msgid "Charts" msgid "Chart" -msgstr "Charts" +msgstr "Chart" #. l10n: A collection of available filters #: js/messages.php:194 @@ -2292,7 +2286,7 @@ msgstr "per hour" #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "per day" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" @@ -2314,7 +2308,7 @@ msgstr "Font size" #: libraries/Error_Handler.class.php:62 msgid "Too many error messages, some are not displayed." -msgstr "" +msgstr "Too many error messages, some are not displayed." #: libraries/File.class.php:221 msgid "File was not an uploaded file." @@ -4727,12 +4721,13 @@ msgid "" "Limits number of table preferences which are stored in database, the oldest " "records are automatically removed" msgstr "" +"Limits number of table preferences which are stored in database, the oldest " +"records are automatically removed" #: libraries/config/messages.inc.php:403 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximal number of table preferences to store" -msgstr "Maximum number of tables displayed in table list" +msgstr "Maximal number of table preferences to store" #: libraries/config/messages.inc.php:404 msgid "Try to connect without password" @@ -8611,10 +8606,9 @@ msgid "Toggle small/big" msgstr "Toggle small/big" #: pmd_general.php:99 -#, fuzzy #| msgid "To select relation, click :" msgid "Toggle relation lines" -msgstr "To select relation, click :" +msgstr "Toggle relation lines" #: pmd_general.php:104 pmd_pdf.php:76 msgid "Import/Export coordinates for PDF schema" diff --git a/po/fi.po b/po/fi.po index 9b43b57..80f9d66 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-11-15 17:18+0200\n" +"PO-Revision-Date: 2011-11-15 17:19+0200\n" "Last-Translator: Macrotus <rokkeri(a)hotmail.com>\n" "Language-Team: finnish <fi(a)li.org>\n" "Language: fi\n" @@ -1782,7 +1782,7 @@ msgstr "Pääavaimen lisäys" #: pmd_general.php:537 pmd_general.php:585 pmd_general.php:661 #: pmd_general.php:715 pmd_general.php:778 msgid "OK" -msgstr "Kunnossa" +msgstr "OK" #: js/messages.php:238 msgid "Click to dismiss this notification" diff --git a/po/pt_BR.po b/po/pt_BR.po index e15c8a1..0802221 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-11-14 19:39+0200\n" -"Last-Translator: mariemidias <mariemidias(a)yahoo.com.br>\n" +"PO-Revision-Date: 2011-12-29 18:17+0200\n" +"Last-Translator: WillBa <widelan10(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 #: libraries/display_tbl.lib.php:358 server_privileges.php:1677 msgid "Show all" -msgstr "Mostrar todos" +msgstr "Mostrar tudo" #: browse_foreigners.php:70 libraries/PDF.class.php:42 #: libraries/common.lib.php:2445 @@ -806,10 +806,9 @@ msgid "ENUM/SET editor" msgstr "Editor ENUM/SET" #: enum_editor.php:28 js/messages.php:267 -#, fuzzy #| msgid "Values for the column \"%s\"" msgid "Values for a new column" -msgstr "Valores para nova coluna" +msgstr "Valores para uma nova coluna" #: enum_editor.php:30 js/messages.php:266 #, php-format @@ -817,13 +816,11 @@ msgid "Values for column %s" msgstr "Valores para coluna %s" #: enum_editor.php:34 js/messages.php:268 -#, fuzzy #| msgid "Enter each value in a separate field." msgid "Enter each value in a separate field" -msgstr "Digite cada valor em um campo separado" +msgstr "Insira cada valor em um campo separado" #: enum_editor.php:123 -#, fuzzy #| msgid "+ Add a value" msgid "Add a value" msgstr "Adicionar um valor" @@ -1110,22 +1107,20 @@ msgid "This is not a number!" msgstr "Isto não é um número!" #: js/messages.php:46 -#, fuzzy #| msgid "Add index" msgid "Add Index" msgstr "Adicionar índice" #: js/messages.php:47 -#, fuzzy #| msgid "Edit mode" msgid "Edit Index" -msgstr "Modo de edição" +msgstr "Editar índice" #: js/messages.php:48 tbl_indexes.php:293 -#, fuzzy, php-format +#, php-format #| msgid "Add %s field(s)" msgid "Add %d column(s) to index" -msgstr "Adicionar %s campo(s)" +msgstr "Adicionar %d coluna(s) ao índice" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:52 @@ -1381,11 +1376,11 @@ msgid "EiB" msgstr "EB" #: js/messages.php:132 -#, fuzzy, php-format +#, php-format #| msgid "%s table" #| msgid_plural "%s tables" msgid "%d table(s)" -msgstr "%s tabela" +msgstr "%d tabela(s)" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:135 @@ -1558,10 +1553,9 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analisando e carregando logs. Isso pode demorar." #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "Leitura requisitada" +msgstr "Cancelar solicitação" #: js/messages.php:177 msgid "" @@ -1597,10 +1591,9 @@ msgid "Log analysed, but no data found in this time span." msgstr "Log analizado, nenhum dado encontrado neste intervalo de tempo" #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "Analizar" +msgstr "Analisando..." #: js/messages.php:185 #, fuzzy @@ -1614,10 +1607,9 @@ msgid "Time" msgstr "Tempo" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Total:" +msgstr "Tempo total:" #: js/messages.php:189 #, fuzzy @@ -1626,7 +1618,6 @@ msgid "Profiling results" msgstr "Perfil" #: js/messages.php:190 -#, fuzzy #| msgid "Table" msgctxt "Display format" msgid "Table" @@ -2419,7 +2410,9 @@ msgstr "Erro desconhecido no carregamento do arquivo." msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" -msgstr "Erro ao mover o arquivo carregado, veja FAQ 1.11" +msgstr "" +"Erro ao mover o arquivo carregado, veja " +"[a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]" #: libraries/File.class.php:508 msgid "Error while moving uploaded file." diff --git a/po/tk.po b/po/tk.po index c90861d..c5ca052 100644 --- a/po/tk.po +++ b/po/tk.po @@ -5,23 +5,23 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2012-01-01 16:53+0200\n" +"Last-Translator: any anonymous user <>\n" +"Language-Team: Turkmen <tk(a)li.org>\n" "Language: tk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -"X-Generator: Translate Toolkit 1.9.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 #: libraries/display_tbl.lib.php:358 server_privileges.php:1677 msgid "Show all" -msgstr "" +msgstr "Hemmesini görkez" #: browse_foreigners.php:70 libraries/PDF.class.php:42 #: libraries/common.lib.php:2445 @@ -30,7 +30,7 @@ msgstr "" #: libraries/schema/User_Schema.class.php:396 #: libraries/select_lang.lib.php:487 msgid "Page number:" -msgstr "" +msgstr "Sahypa belgisi:" #: browse_foreigners.php:138 msgid "" @@ -38,13 +38,16 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" +"Nyşan edilen brauzer äpişgesi täzelenilmedi. Belki siz hossar äpişgesini " +"ýapdyňyz, ýada siziň brauzeriňiziň hopsuzlyk sazlamalary äpişgeler-arasy " +"täzelemäni saklaýandyr." #: browse_foreigners.php:156 libraries/common.lib.php:3126 #: libraries/common.lib.php:3133 libraries/common.lib.php:3342 #: libraries/common.lib.php:3343 libraries/db_links.inc.php:60 #: libraries/tbl_links.inc.php:68 msgid "Search" -msgstr "" +msgstr "Gözle" #: browse_foreigners.php:159 db_operations.php:378 db_operations.php:418 #: db_operations.php:528 db_operations.php:555 db_search.php:337 @@ -81,36 +84,36 @@ msgstr "" #: tbl_tracking.php:554 tbl_zoom_select.php:313 view_create.php:181 #: view_operations.php:99 msgid "Go" -msgstr "" +msgstr "Git" #: browse_foreigners.php:174 browse_foreigners.php:178 #: libraries/Index.class.php:440 tbl_tracking.php:304 msgid "Keyname" -msgstr "" +msgstr "Açarsözi" #: browse_foreigners.php:175 browse_foreigners.php:177 #: server_collations.php:54 server_collations.php:66 server_engines.php:55 #: server_plugins.php:147 server_status.php:1472 msgid "Description" -msgstr "" +msgstr "Düşündiriş" #: browse_foreigners.php:255 browse_foreigners.php:264 #: browse_foreigners.php:276 browse_foreigners.php:284 msgid "Use this value" -msgstr "" +msgstr "Şu bahany ulan" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:385 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Damja akym serweri sazlanmadyk!" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "" +msgstr "Başlaryny alyp bolmady" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Daşlykdaky URL-y açyp bolmady" #: changelog.php:32 license.php:28 #, possible-php-format @@ -118,11 +121,13 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"%s faýly sistemada ýok, has giňişleýin maglumatlar üçin www.phpmyadmin.net " +"sahypa seretmegiňizi haýyş edýäris" #: db_create.php:60 #, possible-php-format msgid "Database %1$s has been created." -msgstr "" +msgstr "%1$s maglumatlar ulgamy döredildi" #: db_datadict.php:49 db_operations.php:370 msgid "Database comment: " hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25716-g78c1a65
by Rouslan Placella 31 Dec '11

31 Dec '11

The branch, master has been updated via 78c1a6519b4b8007251c6cdc0aa3ba4491066816 (commit) from 8078441519952d5853f322feabf0aefb2d75606f (commit) - Log ----------------------------------------------------------------- commit 78c1a6519b4b8007251c6cdc0aa3ba4491066816 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Dec 31 01:21:55 2011 +0000 Speed-up jQuery selectors in RTE ----------------------------------------------------------------------- Summary of changes: js/rte/common.js | 20 ++++++++++---------- js/rte/events.js | 2 +- js/rte/routines.js | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/js/rte/common.js b/js/rte/common.js index e618151..a1a553c 100644 --- a/js/rte/common.js +++ b/js/rte/common.js @@ -34,13 +34,13 @@ var RTE = { var $elm = null; // Common validation. At the very least the name // and the definition must be provided for an item - $elm = $('.rte_table').last().find('input[name=item_name]'); + $elm = $('table.rte_table').last().find('input[name=item_name]'); if ($elm.val() === '') { $elm.focus(); alert(PMA_messages['strFormEmpty']); return false; } - $elm = $('.rte_table').find('textarea[name=item_definition]'); + $elm = $('table.rte_table').find('textarea[name=item_definition]'); if ($elm.val() === '') { this.syntaxHiglighter.focus(); alert(PMA_messages['strFormEmpty']); @@ -78,7 +78,7 @@ $(document).ready(function () { /** * Attach Ajax event handlers for the Add/Edit functionality. */ - $('.ajax_add_anchor, .ajax_edit_anchor').live('click', function (event) { + $('a.ajax_add_anchor, a.ajax_edit_anchor').live('click', function (event) { event.preventDefault(); /** * @var $edit_row jQuery object containing the reference to @@ -112,9 +112,9 @@ $(document).ready(function () { /** * @var data Form data to be sent in the AJAX request. */ - var data = $('.rte_form').last().serialize(); + var data = $('form.rte_form').last().serialize(); $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $.post($('.rte_form').last().attr('action'), data, function (data) { + $.post($('form.rte_form').last().attr('action'), data, function (data) { if (data.success === true) { // Item created successfully PMA_ajaxRemoveMessage($msg); @@ -220,7 +220,7 @@ $(document).ready(function () { } }); RTE.$ajaxDialog.find('input[name=item_name]').focus(); - RTE.$ajaxDialog.find('.datefield, .datetimefield').each(function () { + RTE.$ajaxDialog.find('input.datefield, input.datetimefield').each(function () { PMA_addDatepicker($(this).css('width', '95%')); }); /** @@ -255,7 +255,7 @@ $(document).ready(function () { * and the routine execution dialog used to submit the Ajax * request when the ENTER key is pressed. */ - $('.rte_table').find('input[name^=item], input[name^=params]').live('keydown', function (e) { + $('table.rte_table').find('input[name^=item], input[name^=params]').live('keydown', function (e) { if (e.which === 13) { // 13 is the ENTER key e.preventDefault(); if (typeof RTE.buttonOptions[PMA_messages['strGo']] === 'function') { @@ -267,7 +267,7 @@ $(document).ready(function () { /** * Attach Ajax event handlers for Export of Routines, Triggers and Events. */ - $('.ajax_export_anchor').live('click', function (event) { + $('a.ajax_export_anchor').live('click', function (event) { event.preventDefault(); var $msg = PMA_ajaxShowMessage(); // Fire the ajax request straight away @@ -309,7 +309,7 @@ $(document).ready(function () { /** * Attach Ajax event handlers for Drop functionality of Routines, Triggers and Events. */ - $('.ajax_drop_anchor').live('click', function (event) { + $('a.ajax_drop_anchor').live('click', function (event) { event.preventDefault(); /** * @var $curr_row Object containing reference to the current row @@ -318,7 +318,7 @@ $(document).ready(function () { /** * @var question String containing the question to be asked for confirmation */ - var question = $('<div></div>').text($curr_row.children('td').children('.drop_sql').html()); + var question = $('<div/>').text($curr_row.children('td').children('.drop_sql').html()); // We ask for confirmation first here, before submitting the ajax request $(this).PMA_confirm(question, $(this).attr('href'), function (url) { /** diff --git a/js/rte/events.js b/js/rte/events.js index 257a17d..b2ba54c 100644 --- a/js/rte/events.js +++ b/js/rte/events.js @@ -38,6 +38,6 @@ RTE.validateCustom = function () { */ $(document).ready(function () { $('select[name=item_type]').live('change', function () { - $('.recurring_event_row, .onetime_event_row').toggle(); + $('tr.recurring_event_row, tr.onetime_event_row').toggle(); }); // end $.live() }); // end of $(document).ready() diff --git a/js/rte/routines.js b/js/rte/routines.js index b351e7b..27c2aea 100644 --- a/js/rte/routines.js +++ b/js/rte/routines.js @@ -16,12 +16,12 @@ RTE.postDialogShow = function (data) { // Cache the template for a parameter table row RTE.param_template = data.param_template; // Make adjustments in the dialog to make it AJAX compatible - $('.routine_param_remove').show(); + $('td.routine_param_remove').show(); $('input[name=routine_removeparameter]').remove(); $('input[name=routine_addparameter]').css('width', '100%'); // Enable/disable the 'options' dropdowns for parameters as necessary - $('.routine_params_table').last().find('th[colspan=2]').attr('colspan', '1'); - $('.routine_params_table').last().find('tr').has('td').each(function () { + $('table.routine_params_table').last().find('th[colspan=2]').attr('colspan', '1'); + $('table.routine_params_table').last().find('tr').has('td').each(function () { RTE.setOptionsForParameter( $(this).find('select[name^=item_param_type]'), $(this).find('input[name^=item_param_length]'), @@ -32,10 +32,10 @@ RTE.postDialogShow = function (data) { // Enable/disable the 'options' dropdowns for // function return value as necessary RTE.setOptionsForParameter( - $('.rte_table').last().find('select[name=item_returntype]'), - $('.rte_table').last().find('input[name=item_returnlength]'), - $('.rte_table').last().find('select[name=item_returnopts_text]'), - $('.rte_table').last().find('select[name=item_returnopts_num]') + $('table.rte_table').last().find('select[name=item_returntype]'), + $('table.rte_table').last().find('input[name=item_returnlength]'), + $('table.rte_table').last().find('select[name=item_returnopts_text]'), + $('table.rte_table').last().find('select[name=item_returnopts_num]') ); }; // end RTE.postDialogShow() @@ -52,7 +52,7 @@ RTE.validateCustom = function () { * the field that is being processed */ var inputname = ''; - $('.routine_params_table').last().find('tr').each(function () { + $('table.routine_params_table').last().find('tr').each(function () { // Every parameter of a routine must have // a non-empty direction, name and type if (isSuccess) { @@ -76,7 +76,7 @@ RTE.validateCustom = function () { alert(PMA_messages['strFormEmpty']); return false; } - $('.routine_params_table').last().find('tr').each(function () { + $('table.routine_params_table').last().find('tr').each(function () { // SET, ENUM, VARCHAR and VARBINARY fields must have length/values var $inputtyp = $(this).find('select[name^=item_param_type]'); var $inputlen = $(this).find('input[name^=item_param_length]'); @@ -107,7 +107,7 @@ RTE.validateCustom = function () { } if ($('select[name=item_type]').find(':selected').val() === 'FUNCTION') { // A function must contain a RETURN statement in its definition - if ($('.rte_table').find('textarea[name=item_definition]').val().toUpperCase().indexOf('RETURN') < 0) { + if ($('table.rte_table').find('textarea[name=item_definition]').val().toUpperCase().indexOf('RETURN') < 0) { RTE.syntaxHiglighter.focus(); alert(PMA_messages['MissingReturn']); return false; @@ -232,15 +232,15 @@ $(document).ready(function () { // Append the new row to the parameters table $routine_params_table.append(new_param_row); // Make sure that the row is correctly shown according to the type of routine - if ($('.rte_table').find('select[name=item_type]').val() === 'FUNCTION') { - $('.routine_return_row').show(); - $('.routine_direction_cell').hide(); + if ($('table.rte_table').find('select[name=item_type]').val() === 'FUNCTION') { + $('tr.routine_return_row').show(); + $('td.routine_direction_cell').hide(); } /** * @var $newrow jQuery object containing the reference to the newly * inserted row in the routine parameters table. */ - var $newrow = $('.routine_params_table').last().find('tr').has('td').last(); + var $newrow = $('table.routine_params_table').last().find('tr').has('td').last(); // Enable/disable the 'options' dropdowns for parameters as necessary RTE.setOptionsForParameter( $newrow.find('select[name^=item_param_type]'), @@ -253,7 +253,7 @@ $(document).ready(function () { /** * Attach Ajax event handlers for the "Remove parameter from routine" functionality. */ - $('.routine_param_remove_anchor').live('click', function (event) { + $('a.routine_param_remove_anchor').live('click', function (event) { event.preventDefault(); $(this).parent().parent().remove(); // After removing a parameter, the indices of the name attributes in @@ -263,7 +263,7 @@ $(document).ready(function () { * fields in the routine parameters table. */ var index = 0; - $('.routine_params_table').last().find('tr').has('td').each(function () { + $('table.routine_params_table').last().find('tr').has('td').each(function () { $(this).find(':input').each(function () { /** * @var inputname The value of the name attribute of @@ -295,7 +295,7 @@ $(document).ready(function () { * fields are shown in the editor when changing the routine type */ $('select[name=item_type]').live('change', function () { - $('.routine_return_row, .routine_direction_cell').toggle(); + $('tr.routine_return_row, td.routine_direction_cell').toggle(); }); // end $.live() /** @@ -325,17 +325,17 @@ $(document).ready(function () { */ $('select[name=item_returntype]').live('change', function () { RTE.setOptionsForParameter( - $('.rte_table').find('select[name=item_returntype]'), - $('.rte_table').find('input[name=item_returnlength]'), - $('.rte_table').find('select[name=item_returnopts_text]'), - $('.rte_table').find('select[name=item_returnopts_num]') + $('table.rte_table').find('select[name=item_returntype]'), + $('table.rte_table').find('input[name=item_returnlength]'), + $('table.rte_table').find('select[name=item_returnopts_text]'), + $('table.rte_table').find('select[name=item_returnopts_num]') ); }); // end $.live() /** * Attach Ajax event handlers for the Execute routine functionality. */ - $('.ajax_exec_anchor').live('click', function (event) { + $('a.ajax_exec_anchor').live('click', function (event) { event.preventDefault(); /** * @var $msg jQuery object containing the reference to @@ -355,7 +355,7 @@ $(document).ready(function () { /** * @var data Form data to be sent in the AJAX request. */ - var data = $('.rte_form').last().serialize(); + var data = $('form.rte_form').last().serialize(); $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.post('db_routines.php', data, function (data) { if (data.success === true) { @@ -387,7 +387,7 @@ $(document).ready(function () { /** * Attach the datepickers to the relevant form fields */ - $ajaxDialog.find('.datefield, .datetimefield').each(function () { + $ajaxDialog.find('input.datefield, input.datetimefield').each(function () { PMA_addDatepicker($(this).css('width', '95%')); }); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25715-g8078441
by Dieter Adriaenssens 30 Dec '11

30 Dec '11

The branch, master has been updated via 8078441519952d5853f322feabf0aefb2d75606f (commit) from d5dede3530258c661f398282677f8733e7ab80eb (commit) - Log ----------------------------------------------------------------- commit 8078441519952d5853f322feabf0aefb2d75606f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Fri Dec 30 19:53:11 2011 +0100 typo ----------------------------------------------------------------------- Summary of changes: export.php | 2 +- libraries/export/codegen.php | 12 ++++++------ libraries/export/csv.php | 12 ++++++------ libraries/export/htmlword.php | 14 +++++++------- libraries/export/json.php | 12 ++++++------ libraries/export/latex.php | 14 +++++++------- libraries/export/mediawiki.php | 12 ++++++------ libraries/export/ods.php | 12 ++++++------ libraries/export/odt.php | 14 +++++++------- libraries/export/pdf.php | 12 ++++++------ libraries/export/php_array.php | 12 ++++++------ libraries/export/sql.php | 16 ++++++++-------- libraries/export/texytext.php | 14 +++++++------- libraries/export/xml.php | 12 ++++++------ libraries/export/yaml.php | 12 ++++++------ 15 files changed, 91 insertions(+), 91 deletions(-) diff --git a/export.php b/export.php index d91c0eb..9ed0d87 100644 --- a/export.php +++ b/export.php @@ -130,7 +130,7 @@ $time_start = time(); * $dump_buffer, otherwise it prints thems out. * * @param string $line the insert statement - * @return bool Whether output suceeded + * @return bool Whether output succeeded */ function PMA_exportOutputHandler($line) { diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 0108442..40111ff 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -49,7 +49,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -61,7 +61,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -74,7 +74,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -87,7 +87,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -100,7 +100,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -117,7 +117,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 7410767..15eb09f 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -38,7 +38,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -49,7 +49,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -97,7 +97,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -109,7 +109,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -121,7 +121,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -137,7 +137,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index e14ecc9..104165e 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -37,7 +37,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -48,7 +48,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -70,7 +70,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -82,7 +82,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -94,7 +94,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -110,7 +110,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -184,7 +184,7 @@ if (isset($plugin_list)) { * @param bool $dates whether to include creation/update/check dates * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/json.php b/libraries/export/json.php index cca82b9..313742c 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -37,7 +37,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -49,7 +49,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -68,7 +68,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -82,7 +82,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -95,7 +95,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -112,7 +112,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 2792644..5963974 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -104,7 +104,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -116,7 +116,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -145,7 +145,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -163,7 +163,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -177,7 +177,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -195,7 +195,7 @@ if (isset($plugin_list)) { * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -326,7 +326,7 @@ if (isset($plugin_list)) { * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' * @param string $export_type 'server', 'database', 'table' * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 41af34b..752f196 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -27,7 +27,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -38,7 +38,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -50,7 +50,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -62,7 +62,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -74,7 +74,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -90,7 +90,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 868edf3..1ee1fb7 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -36,7 +36,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -53,7 +53,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -103,7 +103,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -115,7 +115,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -127,7 +127,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -143,7 +143,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 7ee3ef7..d6f6936 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -68,7 +68,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -86,7 +86,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -104,7 +104,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -120,7 +120,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -134,7 +134,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -152,7 +152,7 @@ if (isset($plugin_list)) { * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -236,7 +236,7 @@ if (isset($plugin_list)) { * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' * @param string $export_type 'server', 'database', 'table' * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 5f603e6..cd09706 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -348,7 +348,7 @@ if (isset($plugin_list)) { /** * Finalize the pdf. * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -367,7 +367,7 @@ if (isset($plugin_list)) { /** * Initialize the pdf to export data. * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -390,7 +390,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -404,7 +404,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -418,7 +418,7 @@ if (isset($plugin_list)) { * * @param string $db Database name * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -436,7 +436,7 @@ if (isset($plugin_list)) { * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 7716d98..e40145d 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -37,7 +37,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -49,7 +49,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -69,7 +69,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -83,7 +83,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -96,7 +96,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -113,7 +113,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 21a9eec..ace8129 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -318,7 +318,7 @@ if (isset($plugin_list)) { * Exports routines (procedures and functions) * * @param string $db - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -418,7 +418,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -457,7 +457,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -551,7 +551,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -592,7 +592,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -608,7 +608,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -1002,7 +1002,7 @@ if (isset($plugin_list)) { * @param bool $dates whether to include creation/update/check dates * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -1071,7 +1071,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 151b123..ba8e05f 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -35,7 +35,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -46,7 +46,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -58,7 +58,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -70,7 +70,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -82,7 +82,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -98,7 +98,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -166,7 +166,7 @@ if (isset($plugin_list)) { * @param bool $dates whether to include creation/update/check dates * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 056dbca..ac46918 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -85,7 +85,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -99,7 +99,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -279,7 +279,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -303,7 +303,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -322,7 +322,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -339,7 +339,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 6fda141..8c4695a 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -38,7 +38,7 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -51,7 +51,7 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -65,7 +65,7 @@ if (isset($plugin_list)) { * Outputs database header * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -78,7 +78,7 @@ if (isset($plugin_list)) { * Outputs database footer * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -91,7 +91,7 @@ if (isset($plugin_list)) { * Outputs CREATE DATABASE statement * * @param string $db Database name - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ @@ -108,7 +108,7 @@ if (isset($plugin_list)) { * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @return bool Whether it succeeded * * @access public */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25714-gd5dede3
by Marc Delisle 29 Dec '11

29 Dec '11

The branch, master has been updated via d5dede3530258c661f398282677f8733e7ab80eb (commit) via 8697ec3d488b03d2fdcee13c03492bc9a7fe219d (commit) from e07929af7aeeb4b943170aedb2f295fe713b63bd (commit) - Log ----------------------------------------------------------------- commit d5dede3530258c661f398282677f8733e7ab80eb Merge: e07929a 8697ec3 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 29 09:41:55 2011 -0500 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7713f7b..ba7c9fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ phpMyAdmin - ChangeLog - patch #3375984 [export] PHP Array export might generate invalid php code - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before - bug #3463933 [display] SELECT DISTINCT displays wrong total records found +- patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/Table.class.php b/libraries/Table.class.php index a2db8b2..7793347 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -871,6 +871,10 @@ class PMA_Table if (($what == 'data' || $what == 'dataonly') && ! PMA_Table::isView($target_db, $target_table) ) { + $sql_set_mode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'"; + PMA_DBI_query($sql_set_mode); + $GLOBALS['sql_query'] .= "\n\n" . $sql_set_mode . ';'; + $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; PMA_DBI_query($sql_insert_data); $GLOBALS['sql_query'] .= "\n\n" . $sql_insert_data . ';'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-16-g8697ec3
by Marc Delisle 29 Dec '11

29 Dec '11

The branch, QA_3_4 has been updated via 8697ec3d488b03d2fdcee13c03492bc9a7fe219d (commit) from f7a9d2a36a5cedd0b380e8ca89de856a44da1874 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 578bed5..ee2dccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - patch #3375984 [export] PHP Array export might generate invalid php code - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before - bug #3463933 [display] SELECT DISTINCT displays wrong total records found +- patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 5cb46fa..767cf64 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -775,6 +775,10 @@ class PMA_Table // Copy the data unless this is a VIEW if (($what == 'data' || $what == 'dataonly') && ! PMA_Table::_isView($target_db,$target_table)) { + $sql_set_mode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'"; + PMA_DBI_query($sql_set_mode); + $GLOBALS['sql_query'] .= "\n\n" . $sql_set_mode . ';'; + $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; PMA_DBI_query($sql_insert_data); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. d9811573c47ccb8b314f36f72e444fb934df0eb5
by Michal Čihař 28 Dec '11

28 Dec '11

The branch, master has been updated via d9811573c47ccb8b314f36f72e444fb934df0eb5 (commit) from 5b7fa0538813d55eb5ff980a6461e1ef23f0c52d (commit) - Log ----------------------------------------------------------------- commit d9811573c47ccb8b314f36f72e444fb934df0eb5 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Dec 28 15:28:45 2011 +0100 Add new language ----------------------------------------------------------------------- Summary of changes: data/langnames.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/data/langnames.py b/data/langnames.py index 18ad074..a0fa182 100644 --- a/data/langnames.py +++ b/data/langnames.py @@ -74,6 +74,7 @@ MAP = { 'ta' : 'tamil', 'te' : 'telugu', 'th' : 'thai', + 'tk' : 'turkmen', 'tr' : 'turkish', 'tt' : 'tatarish', 'ug' : 'uyghur', hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25712-ge07929a
by Michal Čihař 28 Dec '11

28 Dec '11

The branch, master has been updated via e07929af7aeeb4b943170aedb2f295fe713b63bd (commit) via 3114ffb5e38fe5f1a357d50d1fde510008203f08 (commit) via ac4c1251113cd5cfa9a153d1aa34f0395227d44f (commit) via 27a9e695dbd5751a51888a8032661d1853f4921e (commit) via 66d955cee65b971151cb58e830911bd961fd0f2c (commit) via c56f18c725fa954feb9739111c77ee0753984de3 (commit) via a4f427e8849f4fcf06640a8a6475a43d36402498 (commit) via f3b4a142f7af07e0b412ff13eb6a06655a1afdfd (commit) via a91e655175528d4dcfbe92555a4afc4a82a03d05 (commit) via 31e93e5d7976a486550738fd98b55c90ab9fc71d (commit) via cea6730ecbe4b6c01b3710846b3c839e67507574 (commit) via 226878e4af9b8b41e5c5d5476224a3318e0ae661 (commit) via 4356615dec588913308875fcf9bfb6f2e342bd47 (commit) via 97d458a474b990f09befdb9de5bcdb9896f3063f (commit) via 39db156aa72498abbf85e2732516f72bfa5f23c0 (commit) via b76643129ee06affea63b86c413a14c660089a42 (commit) via c374575eeccc620ff073e5b3c1c5800be997f434 (commit) via 89786ea3718aa13ac087fa439e1b90cf2f244d79 (commit) via 8923dd6539acca8bcbbed2805dac95c04ca64b5a (commit) via 0327d6824756a73ced30551af3a32f1f8eabaec4 (commit) via d39b0a65cef3e99f1695a173189859841f433534 (commit) via b9c4f32036a80bfc592897c793445c804aabb7ba (commit) via b90bed8613cd8224db1c31cd59e5b66b70f6aefd (commit) via 556d8139dc9b790d745addd62a2ef68726c1af2e (commit) via 61566294c66aa6fac524cc04d7a31907f3ee3cc1 (commit) via e71e06b0b53f2a7ca5297da345f8b1c7ba2facea (commit) via f4c0c2a759455ff04090b9d72759f2b80e685644 (commit) via 515301090f3c3967838c63a0ef4d55e214db226a (commit) via aa14f72e208d0781e47e066e36698ff6231bf833 (commit) via 971a2aa35541f8c8ce616e07a826b049aa6a7160 (commit) via 23a66a20659ca4ea8e5e78b07cbe705390fdc56e (commit) via f43dc7520f73970dcf309572a39f280a8e9477d0 (commit) via 5039cdb57fd8ed2a724533f3614920b3e7ac8ba5 (commit) via d3a93d0bdaf21316efa6dd0948b72abe966fb6fd (commit) via b5b84a1f36a5cc960cc181047cc05bd93acfe0db (commit) via ccc5b0328169d84125c43f484d4ece39669f58b1 (commit) via 00f7010af9010c229a654bdd34a279325e023576 (commit) via a549b26dfdff0b04e533d789e5ac3f7a5d9e74e0 (commit) via 8f379ab8c7f68ebb6ba6b04dee0a3b79c005aecb (commit) via 7b7b7902cbc70abb72587e39c697b1ef138140fa (commit) via 632d447f33c3f3f006ef7330ba4ce22cdd9208e2 (commit) via aa2031369dc6f0f176e8a712e5f5dc3af5090f60 (commit) via b0ba4a76bf03771dc08f346aadb2befbfe6e8eeb (commit) via d496d7a8a56831893c34e72659e49944e11fe9bd (commit) via 8f83addca928f9dc0197583bb0bfb3b59bba9a80 (commit) via df85a993a3f19b2bb30a8fc5f878bd442059660b (commit) from 554a55134d7b5655f63277554f0c5a9f0a3a1e03 (commit) - Log ----------------------------------------------------------------- commit e07929af7aeeb4b943170aedb2f295fe713b63bd Author: Michal Čihař <michal(a)cihar.com> Date: Wed Dec 28 15:28:25 2011 +0100 Description for Turkmen language commit 3114ffb5e38fe5f1a357d50d1fde510008203f08 Merge: 554a551 ac4c125 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Dec 28 15:26:06 2011 +0100 Merge remote-tracking branch 'pootle/master' commit ac4c1251113cd5cfa9a153d1aa34f0395227d44f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 28 15:53:46 2011 +0200 Translation update done using Pootle. commit 27a9e695dbd5751a51888a8032661d1853f4921e Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 28 15:53:28 2011 +0200 Translation update done using Pootle. commit 66d955cee65b971151cb58e830911bd961fd0f2c Author: any anonymous user <> Date: Wed Dec 28 15:53:12 2011 +0200 Translation update done using Pootle. commit c56f18c725fa954feb9739111c77ee0753984de3 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 28 15:53:10 2011 +0200 Translation update done using Pootle. commit a4f427e8849f4fcf06640a8a6475a43d36402498 Author: any anonymous user <> Date: Wed Dec 28 11:44:22 2011 +0200 Translation update done using Pootle. commit f3b4a142f7af07e0b412ff13eb6a06655a1afdfd Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:44:22 2011 +0200 Translation update done using Pootle. commit a91e655175528d4dcfbe92555a4afc4a82a03d05 Author: any anonymous user <> Date: Wed Dec 28 11:44:08 2011 +0200 Translation update done using Pootle. commit 31e93e5d7976a486550738fd98b55c90ab9fc71d Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:44:08 2011 +0200 Translation update done using Pootle. commit cea6730ecbe4b6c01b3710846b3c839e67507574 Author: any anonymous user <> Date: Wed Dec 28 11:44:00 2011 +0200 Translation update done using Pootle. commit 226878e4af9b8b41e5c5d5476224a3318e0ae661 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:44:00 2011 +0200 Translation update done using Pootle. commit 4356615dec588913308875fcf9bfb6f2e342bd47 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:43:31 2011 +0200 Translation update done using Pootle. commit 97d458a474b990f09befdb9de5bcdb9896f3063f Author: any anonymous user <> Date: Wed Dec 28 11:43:08 2011 +0200 Translation update done using Pootle. commit 39db156aa72498abbf85e2732516f72bfa5f23c0 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:43:08 2011 +0200 Translation update done using Pootle. commit b76643129ee06affea63b86c413a14c660089a42 Author: any anonymous user <> Date: Wed Dec 28 11:42:59 2011 +0200 Translation update done using Pootle. commit c374575eeccc620ff073e5b3c1c5800be997f434 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:59 2011 +0200 Translation update done using Pootle. commit 89786ea3718aa13ac087fa439e1b90cf2f244d79 Author: any anonymous user <> Date: Wed Dec 28 11:42:52 2011 +0200 Translation update done using Pootle. commit 8923dd6539acca8bcbbed2805dac95c04ca64b5a Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:52 2011 +0200 Translation update done using Pootle. commit 0327d6824756a73ced30551af3a32f1f8eabaec4 Author: any anonymous user <> Date: Wed Dec 28 11:42:44 2011 +0200 Translation update done using Pootle. commit d39b0a65cef3e99f1695a173189859841f433534 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:43 2011 +0200 Translation update done using Pootle. commit b9c4f32036a80bfc592897c793445c804aabb7ba Author: any anonymous user <> Date: Wed Dec 28 11:42:33 2011 +0200 Translation update done using Pootle. commit b90bed8613cd8224db1c31cd59e5b66b70f6aefd Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:32 2011 +0200 Translation update done using Pootle. commit 556d8139dc9b790d745addd62a2ef68726c1af2e Author: any anonymous user <> Date: Wed Dec 28 11:42:24 2011 +0200 Translation update done using Pootle. commit 61566294c66aa6fac524cc04d7a31907f3ee3cc1 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:24 2011 +0200 Translation update done using Pootle. commit e71e06b0b53f2a7ca5297da345f8b1c7ba2facea Author: any anonymous user <> Date: Wed Dec 28 11:42:16 2011 +0200 Translation update done using Pootle. commit f4c0c2a759455ff04090b9d72759f2b80e685644 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:16 2011 +0200 Translation update done using Pootle. commit 515301090f3c3967838c63a0ef4d55e214db226a Author: any anonymous user <> Date: Wed Dec 28 11:42:09 2011 +0200 Translation update done using Pootle. commit aa14f72e208d0781e47e066e36698ff6231bf833 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:42:08 2011 +0200 Translation update done using Pootle. commit 971a2aa35541f8c8ce616e07a826b049aa6a7160 Author: any anonymous user <> Date: Wed Dec 28 11:41:58 2011 +0200 Translation update done using Pootle. commit 23a66a20659ca4ea8e5e78b07cbe705390fdc56e Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:41:58 2011 +0200 Translation update done using Pootle. commit f43dc7520f73970dcf309572a39f280a8e9477d0 Author: any anonymous user <> Date: Wed Dec 28 11:41:38 2011 +0200 Translation update done using Pootle. commit 5039cdb57fd8ed2a724533f3614920b3e7ac8ba5 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:41:37 2011 +0200 Translation update done using Pootle. commit d3a93d0bdaf21316efa6dd0948b72abe966fb6fd Author: any anonymous user <> Date: Wed Dec 28 11:41:29 2011 +0200 Translation update done using Pootle. commit b5b84a1f36a5cc960cc181047cc05bd93acfe0db Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:41:29 2011 +0200 Translation update done using Pootle. commit ccc5b0328169d84125c43f484d4ece39669f58b1 Author: any anonymous user <> Date: Wed Dec 28 11:41:19 2011 +0200 Translation update done using Pootle. commit 00f7010af9010c229a654bdd34a279325e023576 Author: jsgrrc <jsgrrc(a)gmail.com> Date: Wed Dec 28 11:41:19 2011 +0200 Translation update done using Pootle. commit a549b26dfdff0b04e533d789e5ac3f7a5d9e74e0 Author: any anonymous user <> Date: Wed Dec 28 11:41:08 2011 +0200 Translation update done using Pootle. commit 8f379ab8c7f68ebb6ba6b04dee0a3b79c005aecb Author: Pootle server <noreply(a)l10n.cihar.com> Date: Wed Dec 28 11:41:07 2011 +0200 Translation update done using Pootle. commit 7b7b7902cbc70abb72587e39c697b1ef138140fa Author: Pootle server <noreply(a)l10n.cihar.com> Date: Wed Dec 28 00:17:46 2011 +0200 Translation update done using Pootle. commit 632d447f33c3f3f006ef7330ba4ce22cdd9208e2 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Dec 28 00:12:35 2011 +0200 Translation update done using Pootle. commit aa2031369dc6f0f176e8a712e5f5dc3af5090f60 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Dec 28 00:04:05 2011 +0200 Translation update done using Pootle. commit b0ba4a76bf03771dc08f346aadb2befbfe6e8eeb Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Dec 28 00:02:37 2011 +0200 Translation update done using Pootle. commit d496d7a8a56831893c34e72659e49944e11fe9bd Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Dec 28 00:01:18 2011 +0200 Translation update done using Pootle. commit 8f83addca928f9dc0197583bb0bfb3b59bba9a80 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Dec 28 00:01:06 2011 +0200 Translation update done using Pootle. commit df85a993a3f19b2bb30a8fc5f878bd442059660b Author: Pootle server <pootle(a)cihar.com> Date: Tue Dec 27 22:45:44 2011 +0100 New translation ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 2 ++ po/fr.po | 7 +++---- po/sk.po | 19 +++++++++++-------- po/ta.po | 38 +++++++++++++++++++------------------- po/{phpmyadmin.pot => tk.po} | 8 ++++---- 5 files changed, 39 insertions(+), 35 deletions(-) copy po/{phpmyadmin.pot => tk.po} (99%) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 087639b..84b47d7 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -301,6 +301,8 @@ function PMA_langDetails($lang) return array('te|telugu', 'te', 'తెలుగు'); case 'th': return array('th|thai', 'th', 'ภาษาไทย'); + case 'tk': + return array('tk|turkmen', 'tk', 'türkmençe'); case 'tr': return array('tr|turkish', 'tr', 'Türkçe'); case 'tt': diff --git a/po/fr.po b/po/fr.po index 51fe46e..45bc1c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-12-16 19:10+0200\n" +"PO-Revision-Date: 2011-12-28 15:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -1598,7 +1598,6 @@ msgid "Profiling results" msgstr "Profilage des résultats" #: js/messages.php:190 -#, fuzzy #| msgid "Table" msgctxt "Display format" msgid "Table" @@ -12315,10 +12314,10 @@ msgstr "" "seconde. Cette règle intervient s'il y a plus de 100 requêtes par seconde." #: po/advisory_rules.php:80 -#, fuzzy, php-format +#, php-format #| msgid "Query cache efficiency (%)" msgid "Query cache efficiency (%%)" -msgstr "Efficacité de la cache de requêtes (%)" +msgstr "Efficacité de la cache de requêtes (%%)" #: po/advisory_rules.php:81 msgid "Query cache not running efficiently, it has a low hit rate." diff --git a/po/sk.po b/po/sk.po index aef5f3d..6788fcd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-12-25 22:21+0200\n" +"PO-Revision-Date: 2011-12-28 00:12+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" "Language: sk\n" @@ -1062,7 +1062,7 @@ msgstr "Späť" #: index.php:164 msgid "phpMyAdmin is more friendly with a frames-capable browser." -msgstr "phpMyAdmin funguje lepšie s prehliadačmi podporujúcimi rámy." +msgstr "phpMyAdmin funguje lepšie s prehliadačmi podporujúcimi rámy." #: js/messages.php:27 libraries/import.lib.php:103 sql.php:247 msgid "\"DROP DATABASE\" statements are disabled." @@ -1238,7 +1238,7 @@ msgstr "Procesy" #: js/messages.php:85 msgid "Connections / Processes" -msgstr "Spojenia/Procesy" +msgstr "Spojenia / Procesy" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 @@ -1267,9 +1267,9 @@ msgid "" "likely that your current configuration will not work anymore. Please reset " "your configuration to default in the Settings menu." msgstr "" -"Usporiadanie grafov uložené vo vašem prehliadači nie je kompatibilné s touto " -"verziou monitora a pravdepodobne nebude fungovať správne. Prosím, obnovte " -"východzie nastavenie v ponuke Nastavenia." +"Usporiadanie grafov uložené vo vašem prehliadači už nie je kompatibilné s " +"touto verziou monitora a pravdepodobne nebude fungovať správne. Prosím, " +"obnovte východzie nastavenie v ponuke Nastavenia." #: js/messages.php:97 #| msgid "Query cache" @@ -3318,6 +3318,7 @@ msgstr "" "cookie[/kbd]" #: libraries/config/messages.inc.php:25 +#, fuzzy msgid "Blowfish secret" msgstr "Blowfish secret" @@ -4137,7 +4138,7 @@ msgstr "Import mien (5.00 namiesto $5.00)" #: libraries/config/messages.inc.php:259 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "Importovať percentá ako desatinné čísla (0.12 namiesto 12.00%)" +msgstr "Importovať percentá ako desatinné čísla (0,12 namiesto 12,00%)" #: libraries/config/messages.inc.php:260 msgid "Number of queries to skip from start" @@ -4613,6 +4614,7 @@ msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" msgstr "Názov pre zobrazenie pri použití HTTP autorizácie" #: libraries/config/messages.inc.php:369 +#, fuzzy msgid "HTTP Realm" msgstr "HTTP Realm" @@ -5990,6 +5992,7 @@ msgid "Well Known Text" msgstr "Text (Well Known Text)" #: libraries/display_tbl.lib.php:694 +#, fuzzy msgid "Well Known Binary" msgstr "Well Known Binary" @@ -7198,7 +7201,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" "Prosím prečítajte si dokumentáciu ako aktualizovať tabuľku s informáciami o " -"stĺpcoch (Column_comments Table)" +"stĺpcoch (column_comments tabuľka)" #: libraries/relation.lib.php:124 libraries/sql_query_form.lib.php:368 msgid "Bookmarked SQL query" diff --git a/po/ta.po b/po/ta.po index 579093d..1ff4c74 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-08-23 10:51+0200\n" -"Last-Translator: Sajeepan Yogenthiran <ysajeepan(a)live.com>\n" +"PO-Revision-Date: 2011-12-28 11:44+0200\n" +"Last-Translator: any anonymous user <>\n" "Language-Team: Tamil <ta(a)li.org>\n" "Language: ta\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: Pootle 2.0.5\n" +"X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 #: libraries/display_tbl.lib.php:358 server_privileges.php:1677 @@ -2033,55 +2033,55 @@ msgstr "இன்று" #: js/messages.php:400 msgid "January" -msgstr "தை" +msgstr "ஜனவரி" #: js/messages.php:401 msgid "February" -msgstr "மாசி" +msgstr "பெப்ரவரி" #: js/messages.php:402 msgid "March" -msgstr "பங்குனி" +msgstr "மார்ச்" #: js/messages.php:403 #, fuzzy #| msgid "Apr" msgid "April" -msgstr "சித்திரை" +msgstr "ஏப்ரல்" #: js/messages.php:404 msgid "May" -msgstr "வைகாசி" +msgstr "மே" #: js/messages.php:405 msgid "June" -msgstr "ஆணி" +msgstr "ஜூன்" #: js/messages.php:406 msgid "July" -msgstr "ஆடி" +msgstr "ஜூலை" #: js/messages.php:407 msgid "August" -msgstr "ஆவணி" +msgstr "ஆகஸ்ட்" #: js/messages.php:408 msgid "September" -msgstr "புரட்டாதி" +msgstr "செப்டம்பர்" #: js/messages.php:409 #, fuzzy #| msgid "Oct" msgid "October" -msgstr "ஐப்பசி" +msgstr "அக்டோபர்" #: js/messages.php:410 msgid "November" -msgstr "கார்த்திகை" +msgstr "நவம்பர்" #: js/messages.php:411 msgid "December" -msgstr "மார்கழி" +msgstr "டிசம்பர்" #. l10n: Short month name #: js/messages.php:415 libraries/common.lib.php:1606 @@ -2279,20 +2279,20 @@ msgstr "" #: libraries/Advisor.class.php:326 server_status.php:950 msgid "per second" -msgstr "" +msgstr "ஒரு வினாடிக்கு" #: libraries/Advisor.class.php:329 server_status.php:945 msgid "per minute" -msgstr "" +msgstr "ஒரு நிமிடத்திற்கு " #: libraries/Advisor.class.php:332 server_status.php:941 server_status.php:977 #: server_status.php:1096 server_status.php:1141 msgid "per hour" -msgstr "" +msgstr "ஒரு மணி நேரத்திற்கு " #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "ஒரு நாளைக்கு" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" diff --git a/po/phpmyadmin.pot b/po/tk.po similarity index 99% copy from po/phpmyadmin.pot copy to po/tk.po index b263225..c90861d 100644 --- a/po/phpmyadmin.pot +++ b/po/tk.po @@ -3,20 +3,20 @@ # This file is distributed under the same license as the phpMyAdmin package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.5.0-dev\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: \n" +"Language: tk\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"X-Generator: Translate Toolkit 1.9.0\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 #: libraries/display_tbl.lib.php:358 server_privileges.php:1677 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25666-g554a551
by Marc Delisle 28 Dec '11

28 Dec '11

The branch, master has been updated via 554a55134d7b5655f63277554f0c5a9f0a3a1e03 (commit) via f7a9d2a36a5cedd0b380e8ca89de856a44da1874 (commit) from d52db4be6a5915f07b7e633dbb2ee48546f1c61f (commit) - Log ----------------------------------------------------------------- commit 554a55134d7b5655f63277554f0c5a9f0a3a1e03 Merge: d52db4b f7a9d2a Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 28 08:44:04 2011 -0500 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + sql.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5e712a..7713f7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ phpMyAdmin - ChangeLog - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before +- bug #3463933 [display] SELECT DISTINCT displays wrong total records found 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/sql.php b/sql.php index 4f30ba5..4252efd 100644 --- a/sql.php +++ b/sql.php @@ -592,6 +592,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { if (! $is_group && ! isset($analyzed_sql[0]['queryflags']['union']) + && ! isset($analyzed_sql[0]['queryflags']['distinct']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ') && ! isset($find_real_end) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-15-gf7a9d2a
by Marc Delisle 28 Dec '11

28 Dec '11

The branch, QA_3_4 has been updated via f7a9d2a36a5cedd0b380e8ca89de856a44da1874 (commit) from cd294e5b97c723fa85e29d2b2c43eaa48e60c60a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + sql.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cbd325..578bed5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before +- bug #3463933 [display] SELECT DISTINCT displays wrong total records found 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/sql.php b/sql.php index 6b2628a..e22a32d 100644 --- a/sql.php +++ b/sql.php @@ -494,6 +494,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { if (!$is_group && !isset($analyzed_sql[0]['queryflags']['union']) + && !isset($analyzed_sql[0]['queryflags']['distinct']) && !isset($analyzed_sql[0]['table_ref'][1]['table_name']) && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25664-gd52db4b
by Michal Čihař 27 Dec '11

27 Dec '11

The branch, master has been updated via d52db4be6a5915f07b7e633dbb2ee48546f1c61f (commit) via 08c60d6384d0d55d02cf1e99878f417647f02a31 (commit) via 0fda79dab0355d3f29339c0b99dfbe96feea5174 (commit) via a5ff1829889f293fc5c7fc4dc341dd19586e5cc3 (commit) via a1ef1fe1690e634616718a82c430fc1ec4761fc1 (commit) via 610fb8ecc3f0caff94f4d9ce2ac18282997dfd41 (commit) via ac3381680767b81bec7f1fc0bdfaf636d370ba0b (commit) via e4fad1b0979ba11f267fca4dab5210c673b32097 (commit) via 47db26b65321fc739f4de51be6561a0eaa1c6a35 (commit) via f4db1fe3a7525efb60e1b2dff5dd08d3b0ed07d8 (commit) via efb72a813e9fc0d00d4e69e5d7faa8a7db6d4a91 (commit) via 2d0303db2856c525e9d9712673d9aea3e7193481 (commit) via 49aeed142f25fbc5ebe806a168a0f12fc96a3fe2 (commit) via 2fd69fc38cbf5aeb0114ca340a7b8f6cbb2dec13 (commit) via 56474d61f0d5d65a3b6c5644f2ecd54fa72ee8b1 (commit) via 896ad5e2d82117614881a580b0e45477a8d95785 (commit) via 0b2ae2b590c55e16ac7d8218c0a44546e83697d5 (commit) via f3461131a673fed839c6462dfc77ecdd14ca436f (commit) via 91ab48023ce8647f506b47abdc82f544074f1eaa (commit) via 9afc6ec3a2e4a270d25890f9a2d65360cd90b2fa (commit) via 49f93f41c7576eaec3444c02b93dbd96592c3cd3 (commit) via 2fa050d8d4cedff47f41fccfd9d107e471ebc8ec (commit) via 604167592818bb4da16f576edd4d6b846bfcb892 (commit) via 8fb06d4e2e5958fe7d720cb89fdf4cccb5167103 (commit) via 3574838a6fed3c7843b7b378b37a7029ca22a530 (commit) via f8634a47589071e511c0010cbca0934d3e08c3fb (commit) via f9189610b3b8a003c59ee27bc8775e8e0713092b (commit) via 10e6a79486bc17ab91ced1f30562b2ebfd79c267 (commit) via 899c4474176a2b8427c19d780b05690845ebe721 (commit) via 88ddd5066c4a2e918c6d467f22bb3cc9b98bac09 (commit) via 206d99296431c1851c5e5bf102bb67799879d9dc (commit) via 2c7a172dda20ad5bde4a5a85b92b83a610782ea3 (commit) via 1c459288f1a89dcf399da19cc493378afac9f4bb (commit) via 98ee8c97844ed5cc6fd30091b4cdfe6c6508938d (commit) via 0d45e0141d4621be40a88fb396f70b9a84850994 (commit) via 249c81d8cf4bd3db9d3bf7e845b19d7abb9e7f3e (commit) via 345575bf7f74d3c2722f55aeaf312f1398cf81d5 (commit) via 815ca312f8953240dbe2b74a24687386c431df71 (commit) via e518974d6c6de481cb2dd1d813e8bf3350d1179a (commit) via a233b93433c01a6fc1eb8e0577317110d6484688 (commit) from cca6e8efb3dd3c737a6e51a2b388723013c8f411 (commit) - Log ----------------------------------------------------------------- commit d52db4be6a5915f07b7e633dbb2ee48546f1c61f Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:24:48 2011 +0200 Translation update done using Pootle. commit 08c60d6384d0d55d02cf1e99878f417647f02a31 Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:24:27 2011 +0200 Translation update done using Pootle. commit 0fda79dab0355d3f29339c0b99dfbe96feea5174 Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:22:46 2011 +0200 Translation update done using Pootle. commit a5ff1829889f293fc5c7fc4dc341dd19586e5cc3 Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:21:46 2011 +0200 Translation update done using Pootle. commit a1ef1fe1690e634616718a82c430fc1ec4761fc1 Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:21:32 2011 +0200 Translation update done using Pootle. commit 610fb8ecc3f0caff94f4d9ce2ac18282997dfd41 Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:21:00 2011 +0200 Translation update done using Pootle. commit ac3381680767b81bec7f1fc0bdfaf636d370ba0b Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:20:13 2011 +0200 Translation update done using Pootle. commit e4fad1b0979ba11f267fca4dab5210c673b32097 Author: NunoCruz <ncruzdesign(a)gmail.com> Date: Tue Dec 27 22:19:52 2011 +0200 Translation update done using Pootle. commit 47db26b65321fc739f4de51be6561a0eaa1c6a35 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:22:26 2011 +0200 Translation update done using Pootle. commit f4db1fe3a7525efb60e1b2dff5dd08d3b0ed07d8 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:21:55 2011 +0200 Translation update done using Pootle. commit efb72a813e9fc0d00d4e69e5d7faa8a7db6d4a91 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:21:39 2011 +0200 Translation update done using Pootle. commit 2d0303db2856c525e9d9712673d9aea3e7193481 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:21:11 2011 +0200 Translation update done using Pootle. commit 49aeed142f25fbc5ebe806a168a0f12fc96a3fe2 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:21:02 2011 +0200 Translation update done using Pootle. commit 2fd69fc38cbf5aeb0114ca340a7b8f6cbb2dec13 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:19:19 2011 +0200 Translation update done using Pootle. commit 56474d61f0d5d65a3b6c5644f2ecd54fa72ee8b1 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:16:46 2011 +0200 Translation update done using Pootle. commit 896ad5e2d82117614881a580b0e45477a8d95785 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:16:36 2011 +0200 Translation update done using Pootle. commit 0b2ae2b590c55e16ac7d8218c0a44546e83697d5 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:11:28 2011 +0200 Translation update done using Pootle. commit f3461131a673fed839c6462dfc77ecdd14ca436f Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:10:58 2011 +0200 Translation update done using Pootle. commit 91ab48023ce8647f506b47abdc82f544074f1eaa Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:10:25 2011 +0200 Translation update done using Pootle. commit 9afc6ec3a2e4a270d25890f9a2d65360cd90b2fa Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:09:56 2011 +0200 Translation update done using Pootle. commit 49f93f41c7576eaec3444c02b93dbd96592c3cd3 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:08:39 2011 +0200 Translation update done using Pootle. commit 2fa050d8d4cedff47f41fccfd9d107e471ebc8ec Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:08:01 2011 +0200 Translation update done using Pootle. commit 604167592818bb4da16f576edd4d6b846bfcb892 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 22:04:03 2011 +0200 Translation update done using Pootle. commit 8fb06d4e2e5958fe7d720cb89fdf4cccb5167103 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:59:31 2011 +0200 Translation update done using Pootle. commit 3574838a6fed3c7843b7b378b37a7029ca22a530 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:56:12 2011 +0200 Translation update done using Pootle. commit f8634a47589071e511c0010cbca0934d3e08c3fb Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:55:19 2011 +0200 Translation update done using Pootle. commit f9189610b3b8a003c59ee27bc8775e8e0713092b Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:52:29 2011 +0200 Translation update done using Pootle. commit 10e6a79486bc17ab91ced1f30562b2ebfd79c267 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:51:59 2011 +0200 Translation update done using Pootle. commit 899c4474176a2b8427c19d780b05690845ebe721 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:38:23 2011 +0200 Translation update done using Pootle. commit 88ddd5066c4a2e918c6d467f22bb3cc9b98bac09 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:37:54 2011 +0200 Translation update done using Pootle. commit 206d99296431c1851c5e5bf102bb67799879d9dc Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:37:31 2011 +0200 Translation update done using Pootle. commit 2c7a172dda20ad5bde4a5a85b92b83a610782ea3 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:36:37 2011 +0200 Translation update done using Pootle. commit 1c459288f1a89dcf399da19cc493378afac9f4bb Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:35:41 2011 +0200 Translation update done using Pootle. commit 98ee8c97844ed5cc6fd30091b4cdfe6c6508938d Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:33:23 2011 +0200 Translation update done using Pootle. commit 0d45e0141d4621be40a88fb396f70b9a84850994 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:32:40 2011 +0200 Translation update done using Pootle. commit 249c81d8cf4bd3db9d3bf7e845b19d7abb9e7f3e Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:31:54 2011 +0200 Translation update done using Pootle. commit 345575bf7f74d3c2722f55aeaf312f1398cf81d5 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:31:45 2011 +0200 Translation update done using Pootle. commit 815ca312f8953240dbe2b74a24687386c431df71 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:31:33 2011 +0200 Translation update done using Pootle. commit e518974d6c6de481cb2dd1d813e8bf3350d1179a Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:31:24 2011 +0200 Translation update done using Pootle. commit a233b93433c01a6fc1eb8e0577317110d6484688 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun Dec 25 21:31:12 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt.po | 29 +++++++------------ po/sk.po | 93 ++++++++++++++++++++++++++++---------------------------------- 2 files changed, 53 insertions(+), 69 deletions(-) diff --git a/po/pt.po b/po/pt.po index 55edf4f..bbb7bf4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-11-24 23:02+0200\n" -"Last-Translator: JoaoTMDias <contacto(a)joaodias.me>\n" +"PO-Revision-Date: 2011-12-27 22:24+0200\n" +"Last-Translator: NunoCruz <ncruzdesign(a)gmail.com>\n" "Language-Team: portuguese <pt(a)li.org>\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -1378,11 +1378,11 @@ msgid "EiB" msgstr "EB" #: js/messages.php:132 -#, fuzzy, php-format +#, php-format #| msgid "%s table" #| msgid_plural "%s tables" msgid "%d table(s)" -msgstr "%s tabela" +msgstr "%d tabela(s)" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:135 @@ -1545,10 +1545,9 @@ msgid "Analysing & loading logs. This may take a while." msgstr "A analisar e a carregar registos. Isto pode demorar um um pouco." #: js/messages.php:176 -#, fuzzy #| msgid "Cancel" msgid "Cancel request" -msgstr "Cancelar" +msgstr "Cancelar pedido" #: js/messages.php:177 msgid "" @@ -1586,10 +1585,9 @@ msgstr "" "Registo analisado, mas nenhuns dados encontrados neste período de tempo" #: js/messages.php:184 -#, fuzzy #| msgid "Authenticating..." msgid "Analyzing..." -msgstr "A Autenticar..." +msgstr "Em análise..." #: js/messages.php:185 #, fuzzy @@ -1603,16 +1601,14 @@ msgid "Time" msgstr "Tempo" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Total:" +msgstr "Tempo Total:" #: js/messages.php:189 -#, fuzzy #| msgid "Query results" msgid "Profiling results" -msgstr "Resultado(s) das(s) consulta(s)" +msgstr "Resultado(s) da(s) consulta(s)" #: js/messages.php:190 #, fuzzy @@ -1622,10 +1618,9 @@ msgid "Table" msgstr "Tabela" #: js/messages.php:191 -#, fuzzy #| msgid "Charset" msgid "Chart" -msgstr "Mapa de Caractere" +msgstr "Mapa de Resultados" #. l10n: A collection of available filters #: js/messages.php:194 @@ -1823,10 +1818,9 @@ msgid "Browsing" msgstr "Navegação" #: js/messages.php:259 -#, fuzzy #| msgid "Deleting %s" msgid "Deleting" -msgstr "A apagar %s" +msgstr "A Eliminar" #: js/messages.php:262 msgid "The definition of a stored function must contain a RETURN statement!" @@ -1881,10 +1875,9 @@ msgid "Show search criteria" msgstr "Mostrar critérios de busca" #: js/messages.php:290 libraries/tbl_select.lib.php:110 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Pesquisar" +msgstr "Pesquisa Avançada" #: js/messages.php:292 msgid "Each point represents a data row." diff --git a/po/sk.po b/po/sk.po index 742858a..aef5f3d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-19 14:44+0100\n" -"PO-Revision-Date: 2011-12-25 12:45+0200\n" +"PO-Revision-Date: 2011-12-25 22:21+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" "Language: sk\n" @@ -811,7 +811,7 @@ msgstr "Upraviť ENUM/SET" #: enum_editor.php:28 js/messages.php:267 #| msgid "Values for the column \"%s\"" msgid "Values for a new column" -msgstr "Hodnoty pre nové pole \"%s\"" +msgstr "Hodnoty pre nový stĺpec" #: enum_editor.php:30 js/messages.php:266 #, php-format @@ -822,7 +822,7 @@ msgstr "Hodnoty pre pole %s" #: enum_editor.php:34 js/messages.php:268 #| msgid "Enter each value in a separate field." msgid "Enter each value in a separate field" -msgstr "Zadajte každú hodnotu do samostatného poľa." +msgstr "Zadajte každú hodnotu do samostatného poľa" #: enum_editor.php:123 msgid "Add a value" @@ -1013,7 +1013,7 @@ msgstr "" #: import.php:366 msgid "" "Cannot convert file's character set without character set conversion library" -msgstr "Bez potrebnej knižnice nemožno previesť konverziu znakovej sady" +msgstr "Bez potrebnej knižnice nemožno previesť konverziu znakovej sady" #: import.php:390 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -4859,7 +4859,6 @@ msgid "Server port" msgstr "Port servera" #: libraries/config/messages.inc.php:416 -#, fuzzy #| msgid "" #| "ve blank for no user preferences storage in database, suggested: [kbd]" #| "_config[/kbd]" @@ -4867,8 +4866,8 @@ msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma_recent[/kbd]" msgstr "" -"Nechajte prázdne pre vypnutie možnosti ukladania užívateľských nastavení v " -"databáze. Odporúčaná hodnota: [kbd]pma_config[/kbd]" +"Nechajte prázdne pre vypnutie možnosti \"trvalého\" ukladania nedívnych " +"tabuliek. Odporúčaná hodnota: [kbd]pma_recent[/kbd]" #: libraries/config/messages.inc.php:417 msgid "Recently used table" @@ -5394,7 +5393,7 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" -"Povoliť [a@http://en.wikipedia.org/wiki/ZIP_(súborový_formát)]ZIP[/a] " +"Povoliť [a@http://cs.wikipedia.org/wiki/ZIP_(souborový_formát)]ZIP[/a] " "kompresiu pre import a export operácie" #: libraries/config/messages.inc.php:523 @@ -5518,18 +5517,18 @@ msgid "possible deep recursion attack" msgstr "" #: libraries/database_interface.lib.php:1813 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" +msgstr "" +"Server neodpovedá (alebo socket lokálneho MySQL servera nie je správne " +"nastavený)." #: libraries/database_interface.lib.php:1816 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." -msgstr "Server neodpovedá" +msgstr "Server neodpovedá." #: libraries/database_interface.lib.php:1820 msgid "Please check privileges of directory containing database." @@ -6069,7 +6068,7 @@ msgid "" "The increment size for extending the size of an autoextending tablespace " "when it becomes full." msgstr "" -" Veľkosť, o ktorú je zväčšený automaticky sa zväčšujúci priestor tabuľky pri " +"Veľkosť, o ktorú je zväčšený automaticky sa zväčšujúci priestor tabuľky pri " "zaplnení." #: libraries/engines/innodb.lib.php:32 @@ -6598,9 +6597,7 @@ msgstr "" #: libraries/export/sql.php:45 msgid "Additional custom header comment (\\n splits lines):" -msgstr "" -"Pridať vlastný komentár do hlavičky (\n" -" oddeľuje riadky):" +msgstr "Pridať vlastný komentár do hlavičky (\\n oddeľuje riadky):" #: libraries/export/sql.php:50 msgid "" @@ -6721,10 +6718,9 @@ msgid "Stand-in structure for view" msgstr "" #: libraries/export/sql.php:1112 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Povolí čítanie dát." +msgstr "Chyba pri čítaní dát:" #: libraries/export/xml.php:19 libraries/import/xml.php:28 msgid "XML" @@ -8076,7 +8072,7 @@ msgstr "Oddeľovač" #: libraries/sql_query_form.lib.php:344 msgid "Show this query here again" -msgstr "Zobraziť tento dopyt znovu " +msgstr "Zobraziť tento dopyt znovu" #: libraries/sql_query_form.lib.php:399 msgid "View only" @@ -9222,7 +9218,7 @@ msgstr "Oprávnenia pre jednotlivé tabuľky" #: server_privileges.php:537 server_privileges.php:689 #: server_privileges.php:1704 msgid "Note: MySQL privilege names are expressed in English" -msgstr "Poznámka: názvy MySQL oprávnení sú uvádzané po anglicky " +msgstr "Poznámka: názvy MySQL oprávnení sú uvádzané po anglicky" #: server_privileges.php:614 msgid "Administration" @@ -9395,14 +9391,14 @@ msgstr "... zmazať pôvodného používateľa z tabuliek používateľov." msgid "" "... revoke all active privileges from the old one and delete it afterwards." msgstr "" -" ... odobrať všetky oprávnenia pôvodnému používateľovi a následne ho zmazať." +"... odobrať všetky oprávnenia pôvodnému používateľovi a následne ho zmazať." #: server_privileges.php:2192 msgid "" "... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -" ... zmazať pôvodného používateľa z tabuliek používateľov a potom " +"... zmazať pôvodného používateľa z tabuliek používateľov a potom " "znovunačítať oprávnenia." #: server_privileges.php:2215 @@ -9700,10 +9696,9 @@ msgid "Advisor" msgstr "" #: server_status.php:796 server_status.php:818 -#, fuzzy #| msgid "Refresh rate:" msgid "Refresh rate: " -msgstr "Obnovovacia frekvencia:" +msgstr "Obnovovacia frekvencia: " #: server_status.php:837 server_variables.php:115 #, fuzzy @@ -9795,10 +9790,10 @@ msgid "Network traffic since startup: %s" msgstr "" #: server_status.php:1054 -#, fuzzy, php-format +#, php-format #| msgid "This MySQL server has been running for %s. It started up on %s." msgid "This MySQL server has been running for %1$s. It started up on %2$s." -msgstr "Tento server beží %s. Bol spustený %s." +msgstr "Tento server beží %1s. Bol spustený %2s." #: server_status.php:1064 msgid "" @@ -10646,10 +10641,9 @@ msgid "Status variable(s)" msgstr "" #: server_status.php:1649 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Vybrať Tabuľky" +msgstr "Vybrať série:" #: server_status.php:1651 msgid "Commonly monitored" @@ -10695,10 +10689,9 @@ msgid "Log statistics" msgstr "Zobraziť štatistiky" #: server_status.php:1704 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Zvoliť stránku" +msgstr "Zvolený časový rozsah:" #: server_status.php:1709 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" @@ -10723,22 +10716,22 @@ msgid "Query analyzer" msgstr "Typ dopytu" #: server_status.php:1766 -#, fuzzy, php-format +#, php-format #| msgid "Second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "Sekundy" -msgstr[1] "Sekundy" -msgstr[2] "Sekundy" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekundy" +msgstr[2] "%d sekúnd" #: server_status.php:1768 -#, fuzzy, php-format +#, php-format #| msgid "Minute" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "Minúty" -msgstr[1] "Minúty" -msgstr[2] "Minúty" +msgstr[0] "%d minúta" +msgstr[1] "%d minúty" +msgstr[2] "%d minút" #: server_synchronize.php:99 msgid "Could not connect to the source" @@ -10788,11 +10781,11 @@ msgstr "Upraviť stĺpce" #: server_synchronize.php:446 server_synchronize.php:918 msgid "Remove index(s)" -msgstr "Odstrániť indexy" +msgstr "Odstrániť index(y)" #: server_synchronize.php:447 server_synchronize.php:919 msgid "Apply index(s)" -msgstr "Aplikovať indexy" +msgstr "Aplikovať index(y)" #: server_synchronize.php:448 server_synchronize.php:920 msgid "Update row(s)" @@ -11198,7 +11191,7 @@ msgstr "Tabuľka %1$s bola úspešné upravená" #: tbl_change.php:699 msgid "Because of its length, this column might not be editable" -msgstr "Kvôli dĺžke poľa, toto pole sa nemusí dať upraviť " +msgstr "Kvôli dĺžke poľa, toto pole sa nemusí dať upraviť" #: tbl_change.php:817 msgid "Remove BLOB Repository Reference" @@ -11585,7 +11578,7 @@ msgstr "Dĺžka riadku" #: tbl_printview.php:373 tbl_structure.php:898 msgid "Row size" -msgstr "Veľkosť riadku " +msgstr "Veľkosť riadku" #: tbl_printview.php:383 tbl_structure.php:906 msgid "Next autoindex" @@ -11956,10 +11949,9 @@ msgid "The uptime is only %s" msgstr "" #: po/advisory_rules.php:10 -#, fuzzy #| msgid "Questions" msgid "Questions below 1,000" -msgstr "Dopyty" +msgstr "Menej než 1000 dopytov" #: po/advisory_rules.php:11 msgid "" @@ -12107,10 +12099,9 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "" #: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "Mali by ste aktualizovať %s na verziu %s alebo vyššiu." +msgstr "Mali by ste aktualizovať na stabilnú verziu MySQL 5.5" #: po/advisory_rules.php:50 po/advisory_rules.php:55 po/advisory_rules.php:60 #, fuzzy @@ -12581,7 +12572,7 @@ msgstr "" #| msgid "%s table" #| msgid_plural "%s tables" msgid "Temp disk rate" -msgstr "%s tabuľka" +msgstr "Frekvencia dočasného ukladania na disk" #: po/advisory_rules.php:157 msgid "" @@ -13130,13 +13121,13 @@ msgstr "" #~ msgstr "Zabrané miesto" #~ msgid "% open files" -#~ msgstr "Zobraziť otvorené tabuľky" +#~ msgstr "% otvorených súborov" #~ msgid "% connections used" -#~ msgstr "Spojenia" +#~ msgstr "% použitých spojení" #~ msgid "% aborted connections" -#~ msgstr "Komprimovať pripojenie" +#~ msgstr "% prerušených spojení" #~ msgid "CPU Usage" #~ msgstr "Využitie" @@ -13375,7 +13366,7 @@ msgstr "" #~ msgstr "Pridať hodnotu AUTO_INCREMENT" #~ msgid "Dump %s row(s) starting at row # %s" -#~ msgstr "Zobraziť %s riadkov od riadku %s." +#~ msgstr "Zobraziť %s riadkov od riadku # %s." #~ msgid "remember template" #~ msgstr "zapamätať si vzor" hooks/post-receive -- phpMyAdmin

1 0