The branch, master has been updated via d1ee11c08c0c1c92dcac2092c6fc0ec4c2abf2c9 (commit) via 1cda66e6fe74cad1921c9702bcc75190060517ce (commit) via 76775bca40ca986ee529e2ed34dd5d1e7ab82976 (commit) via c25d4e23656fb3c352f5466a5d38688ca9e5fc62 (commit) via b46f66319d2aaf887c21e1c3aad22c97f185d71c (commit) via 9999ed7b95a4dc6f61ed3adf5707e58e67196ab6 (commit) via 5140ebe48bee7fef7003c1fff5edd8f8135820f7 (commit) via bd75063569d6f1ed557e31a1cb83fe4b685f458b (commit) via fbc53f9b884e0803358ea8719f25573aa48b13fd (commit) via fadc3c6f5001d5ee6f18234d31c2285efa6c9c2a (commit) via 38cdbc925267be376724481334591c9c79c2e63a (commit) via 85ac08d91c8610f13c972eeb6d0d85f94220e489 (commit) via 11dfc559be70ee765208f692f10d6ff30926bfc1 (commit) via 1e0a6b69d14d6161bc296abe88701033c0f36e59 (commit) via 5cd132c0c4000bbff3bf862f88b272e468e0f42d (commit) via f12d1866376a8ac5df68831d6c3fc4871f0abe66 (commit) via 35316464c1d0cb03d4114a684492d20784e18fcc (commit) via ae9ab3cecaca2547bfb7aeb51b4db0fcde2167a5 (commit) via 98354fdddaa5d7ad57440e6f5f2fac0f182ea0c1 (commit) via 8bce47f3d6441fece31be97c09ad8d8402804440 (commit) via 40c9e5db153753f6e626b25fd92de1c103f8caa3 (commit) via cecbc2acf309bbde9e1d05808ac29d108ba983a6 (commit) via 7bb1b72680b6f912a09cf31f8e5092dad1950060 (commit) via 1025b156a3e0cefac337478388d3f6099f67fe99 (commit) via 4513c3c52affd394e029c719bc0cf0746ac3444d (commit) via d2be3f9fa48006f5dda4b32672190b12ee365902 (commit) via 77234074ae6dd550e8b2b4eb63ba227ecd788642 (commit) via 90f44678ac1054b3b9b00ec78f31c4e38e01f1e1 (commit) via 31e65813eaa7441132cce9835ab36704bd658fb4 (commit) from f68e2dcfe77ba5c638706ffc317062970d90f6e5 (commit)
- Log ----------------------------------------------------------------- commit d1ee11c08c0c1c92dcac2092c6fc0ec4c2abf2c9 Merge: f68e2dcfe77ba5c638706ffc317062970d90f6e5 1cda66e6fe74cad1921c9702bcc75190060517ce Author: Michal Čihař mcihar@novell.com Date: Tue May 17 16:12:03 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit 1cda66e6fe74cad1921c9702bcc75190060517ce Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:11:51 2011 +0200
Translation update done using Pootle.
commit 76775bca40ca986ee529e2ed34dd5d1e7ab82976 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:11:44 2011 +0200
Translation update done using Pootle.
commit c25d4e23656fb3c352f5466a5d38688ca9e5fc62 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:11:32 2011 +0200
Translation update done using Pootle.
commit b46f66319d2aaf887c21e1c3aad22c97f185d71c Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:10:42 2011 +0200
Translation update done using Pootle.
commit 9999ed7b95a4dc6f61ed3adf5707e58e67196ab6 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:09:29 2011 +0200
Translation update done using Pootle.
commit 5140ebe48bee7fef7003c1fff5edd8f8135820f7 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:09:16 2011 +0200
Translation update done using Pootle.
commit bd75063569d6f1ed557e31a1cb83fe4b685f458b Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:08:31 2011 +0200
Translation update done using Pootle.
commit fbc53f9b884e0803358ea8719f25573aa48b13fd Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:08:16 2011 +0200
Translation update done using Pootle.
commit fadc3c6f5001d5ee6f18234d31c2285efa6c9c2a Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:06:57 2011 +0200
Translation update done using Pootle.
commit 38cdbc925267be376724481334591c9c79c2e63a Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:06:49 2011 +0200
Translation update done using Pootle.
commit 85ac08d91c8610f13c972eeb6d0d85f94220e489 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:06:31 2011 +0200
Translation update done using Pootle.
commit 11dfc559be70ee765208f692f10d6ff30926bfc1 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:06:26 2011 +0200
Translation update done using Pootle.
commit 1e0a6b69d14d6161bc296abe88701033c0f36e59 Author: stoyanster stoyanster@gmail.com Date: Tue May 17 16:03:18 2011 +0200
Translation update done using Pootle.
commit 5cd132c0c4000bbff3bf862f88b272e468e0f42d Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:58:37 2011 +0200
Translation update done using Pootle.
commit f12d1866376a8ac5df68831d6c3fc4871f0abe66 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:57:23 2011 +0200
Translation update done using Pootle.
commit 35316464c1d0cb03d4114a684492d20784e18fcc Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:56:59 2011 +0200
Translation update done using Pootle.
commit ae9ab3cecaca2547bfb7aeb51b4db0fcde2167a5 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:56:43 2011 +0200
Translation update done using Pootle.
commit 98354fdddaa5d7ad57440e6f5f2fac0f182ea0c1 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:56:28 2011 +0200
Translation update done using Pootle.
commit 8bce47f3d6441fece31be97c09ad8d8402804440 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:56:15 2011 +0200
Translation update done using Pootle.
commit 40c9e5db153753f6e626b25fd92de1c103f8caa3 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:56:03 2011 +0200
Translation update done using Pootle.
commit cecbc2acf309bbde9e1d05808ac29d108ba983a6 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:55:50 2011 +0200
Translation update done using Pootle.
commit 7bb1b72680b6f912a09cf31f8e5092dad1950060 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:55:09 2011 +0200
Translation update done using Pootle.
commit 1025b156a3e0cefac337478388d3f6099f67fe99 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:54:37 2011 +0200
Translation update done using Pootle.
commit 4513c3c52affd394e029c719bc0cf0746ac3444d Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:54:19 2011 +0200
Translation update done using Pootle.
commit d2be3f9fa48006f5dda4b32672190b12ee365902 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:54:07 2011 +0200
Translation update done using Pootle.
commit 77234074ae6dd550e8b2b4eb63ba227ecd788642 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:54:00 2011 +0200
Translation update done using Pootle.
commit 90f44678ac1054b3b9b00ec78f31c4e38e01f1e1 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:53:45 2011 +0200
Translation update done using Pootle.
commit 31e65813eaa7441132cce9835ab36704bd658fb4 Author: Martin Lacina martin@whistler.sk Date: Tue May 17 15:53:26 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/bg.po | 24 ++++++++++++------------ po/sk.po | 44 +++++++++++++++----------------------------- 2 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/po/bg.po b/po/bg.po index 7bc4275..ebc985f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31-0400\n" -"PO-Revision-Date: 2011-05-17 15:16+0200\n" +"PO-Revision-Date: 2011-05-17 16:11+0200\n" "Last-Translator: stoyanster@gmail.com\n" "Language-Team: bulgarian bg@li.org\n" "Language: bg\n" @@ -2150,11 +2150,11 @@ msgstr "Директорията която сте указали за upload н
#: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "Няма файлве за качване"
#: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "И двете"
#: libraries/config.values.php:74 msgid "Open" @@ -2175,7 +2175,7 @@ msgstr "структура" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "данни"
#: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2224,29 +2224,29 @@ msgstr "" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "Невалиден номер на порт"
#: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "Невалидна стойност"
#: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Стойността трябва да е по-малка или равна на %s"
#: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "Липсващи данни за %s"
#: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 msgid "unavailable" -msgstr "" +msgstr "недостъпно"
#: libraries/config/FormDisplay.class.php:737 #: libraries/config/FormDisplay.class.php:741 @@ -2257,12 +2257,12 @@ msgstr ""%s" изисква разширението %s" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "импортът не работи, липсваща функционалност (%s)"
#: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "експортът не работи, липсваща функционалност (%s)"
#: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" @@ -2658,7 +2658,7 @@ msgstr "" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 msgid "Overwrite existing file(s)" -msgstr "Препокриване на съществуващите файл(ове)" +msgstr "Презаписване на съществуващите файл(ове)"
#: libraries/config/messages.inc.php:116 msgid "Remember file name template" diff --git a/po/sk.po b/po/sk.po index 0046108..dd17adf 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31-0400\n" -"PO-Revision-Date: 2011-05-17 15:53+0200\n" +"PO-Revision-Date: 2011-05-17 15:58+0200\n" "Last-Translator: Martin Lacina martin@whistler.sk\n" "Language-Team: slovak sk@li.org\n" "Language: sk\n" @@ -7927,7 +7927,7 @@ msgid "Unable to change master" msgstr ""
#: server_replication.php:72 -#, fuzzy, php-format +#, php-format #| msgid "Master server changed succesfully to %s" msgid "Master server changed successfully to %s" msgstr "Master server zmenený úspešne na %s" @@ -8033,20 +8033,18 @@ msgid "Reset slave" msgstr ""
#: server_replication.php:326 -#, fuzzy #| msgid "Structure only" msgid "Start SQL Thread only" -msgstr "Iba štruktúru" +msgstr "Spustiť len SQL vlákno"
#: server_replication.php:328 msgid "Stop SQL Thread only" msgstr ""
#: server_replication.php:331 -#, fuzzy #| msgid "Structure only" msgid "Start IO Thread only" -msgstr "Iba štruktúru" +msgstr "Spustiť len IO vlákno"
#: server_replication.php:333 msgid "Stop IO Thread only" @@ -8790,7 +8788,6 @@ msgid "Show processes" msgstr "Zobraziť procesy"
#: server_status.php:470 -#, fuzzy #| msgid "Reset" msgctxt "for Show status" msgid "Reset" @@ -9009,10 +9006,9 @@ msgid "Enter manually" msgstr ""
#: server_synchronize.php:1138 -#, fuzzy #| msgid "max. concurrent connections" msgid "Current connection" -msgstr "max. súčasných pripojení" +msgstr "Súčasné pripojenie"
#: server_synchronize.php:1167 #, php-format @@ -9076,10 +9072,9 @@ msgid "Insecure connection" msgstr ""
#: setup/frames/index.inc.php:92 -#, fuzzy #| msgid "Configuration file" msgid "Configuration saved." -msgstr "Konfiguračný súbor" +msgstr "Konfigurácia bola uložená."
#: setup/frames/index.inc.php:93 msgid "" @@ -9343,10 +9338,9 @@ msgid "Showing SQL query" msgstr "Zobrazujem SQL dotaz"
#: sql.php:622 -#, fuzzy #| msgid "Validate SQL" msgid "Validated SQL" -msgstr "Potvrdiť platnosť SQL" +msgstr "Skontrolované SQL"
#: sql.php:897 #, php-format @@ -9430,10 +9424,9 @@ msgid "Continue insertion with %s rows" msgstr ""
#: tbl_chart.php:56 -#, fuzzy #| msgid "The privileges were reloaded successfully." msgid "Chart generated successfully." -msgstr "Práva boli úspešne znovunačítané." +msgstr "Graf bol úspešne vytvorený."
#: tbl_chart.php:59 #| msgid "" @@ -9475,10 +9468,9 @@ msgid "Legend margins" msgstr ""
#: tbl_chart.php:134 -#, fuzzy #| msgid "Mar" msgid "Bar" -msgstr "Mar" +msgstr "Stĺpec"
#: tbl_chart.php:135 msgid "Line" @@ -9489,16 +9481,14 @@ msgid "Radar" msgstr ""
#: tbl_chart.php:138 -#, fuzzy #| msgid "PiB" msgid "Pie" -msgstr "PB" +msgstr "Koláč"
#: tbl_chart.php:144 -#, fuzzy #| msgid "Query type" msgid "Bar type" -msgstr "Typ dopytu" +msgstr "Typ stĺpca"
#: tbl_chart.php:146 msgid "Stacked" @@ -9653,26 +9643,23 @@ msgid "Table %s has been flushed" msgstr "Tabuľka %s bola vyprázdnená"
#: tbl_operations.php:668 -#, fuzzy #| msgid "Flush the table ("FLUSH")" msgid "Flush the table (FLUSH)" -msgstr "Vyprázdniť tabuľku ("FLUSH")" +msgstr "Vyprázdniť tabuľku (FLUSH)"
#: tbl_operations.php:677 -#, fuzzy #| msgid "Dumping data for table" msgid "Delete data or table" -msgstr "Sťahujem dáta pre tabuľku" +msgstr "Odstrániť dáta alebo tabuľku"
#: tbl_operations.php:692 msgid "Empty the table (TRUNCATE)" msgstr ""
#: tbl_operations.php:712 -#, fuzzy #| msgid "Go to database" msgid "Delete the table (DROP)" -msgstr "Prejsť do databázy" +msgstr "Odstrániť tabuľku (DROP)"
#: tbl_operations.php:733 #, fuzzy @@ -9947,10 +9934,9 @@ msgid "Show %s with dates from %s to %s by user %s %s" msgstr ""
#: tbl_tracking.php:432 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete tracking data row from report" -msgstr "Odstrániť všetky informácie o sledovaní tejto tabuľky" +msgstr "Odstrániť riadok o sledovaní tabuľky z výpisu"
#: tbl_tracking.php:443 #| msgid "No databases"
hooks/post-receive