The branch, master has been updated via 3a87a1b4476fd04124b5d4bcc47408b9e6f6a394 (commit) via c52e109f5ddc3be8ad02ea75130551ffd20ea707 (commit) via d8c8ca94461fa3c552beb5551501701ebc092eea (commit) via 83654851050c1ad75ea7e2e96678b3dceb890136 (commit) via 1f65a057fa170cedefeab7b010c1013ad3363ec7 (commit) via 4398f59495a97d8af0a3050fa1de9c14a40d6e0d (commit) via c1c8f494909083dc7e2c9153b0663487c0ab45e9 (commit) via 8f30ff201398fd1231c09004883398352b7c5687 (commit) via 76fbe5ce5431d798311cfa529abeb6ece5427106 (commit) via 2b52b310997c656648d3112ae7e8f18485e861e4 (commit) via 5506eb1dc61018669f71b7b0cda382afa8fc0165 (commit) from bbbf2c49ed922c73f24b8e9c9c01c0721893cd07 (commit)

- Log ----------------------------------------------------------------- commit 3a87a1b4476fd04124b5d4bcc47408b9e6f6a394 Author: Michal Čihař mcihar@novell.com Date: Fri Jun 3 15:13:29 2011 +0200

Fix format string

commit c52e109f5ddc3be8ad02ea75130551ffd20ea707 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:53:21 2011 +0200

Translation update done using Pootle.

commit d8c8ca94461fa3c552beb5551501701ebc092eea Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:51:09 2011 +0200

Translation update done using Pootle.

commit 83654851050c1ad75ea7e2e96678b3dceb890136 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:48:45 2011 +0200

Translation update done using Pootle.

commit 1f65a057fa170cedefeab7b010c1013ad3363ec7 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:47:15 2011 +0200

Translation update done using Pootle.

commit 4398f59495a97d8af0a3050fa1de9c14a40d6e0d Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:46:45 2011 +0200

Translation update done using Pootle.

commit c1c8f494909083dc7e2c9153b0663487c0ab45e9 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:45:55 2011 +0200

Translation update done using Pootle.

commit 8f30ff201398fd1231c09004883398352b7c5687 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:45:22 2011 +0200

Translation update done using Pootle.

commit 76fbe5ce5431d798311cfa529abeb6ece5427106 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:44:57 2011 +0200

Translation update done using Pootle.

commit 2b52b310997c656648d3112ae7e8f18485e861e4 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:44:03 2011 +0200

Translation update done using Pootle.

commit 5506eb1dc61018669f71b7b0cda382afa8fc0165 Author: Martin Lacina martin@whistler.sk Date: Fri Jun 3 14:43:04 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/sk.po | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/po/sk.po b/po/sk.po index 8c35a0b..867e910 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 11:25-0400\n" -"PO-Revision-Date: 2011-05-30 13:03+0200\n" +"PO-Revision-Date: 2011-06-03 14:53+0200\n" "Last-Translator: Martin Lacina martin@whistler.sk\n" "Language-Team: slovak sk@li.org\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n"

@@ -6543,7 +6543,7 @@ msgstr "Iba prezrieť"

#: libraries/sql_query_form.lib.php:491 prefs_manage.php:241 msgid "Location of the text file" -msgstr "Lokácia textového súboru" +msgstr "Umiestnenie textového súboru"

#: libraries/sql_query_form.lib.php:503 tbl_change.php:965 msgid "web server upload directory" @@ -6879,6 +6879,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vaše nastavenia budú uložené len počas tohto prihlásenia. Pre trvalé " +"nastavenie potrebujete nastaviť %smiesto uloženia phpMyAdmin konfigurácie%s."

#: libraries/user_preferences.lib.php:142 #, fuzzy @@ -6914,7 +6916,7 @@ msgstr "Nastavenia vzhľadu"

#: main.php:146 prefs_manage.php:274 msgid "More settings" -msgstr "Viac nastavení" +msgstr "Ďalšie nastavenia"

#: main.php:163 msgid "Protocol version" @@ -7296,24 +7298,23 @@ msgstr "Importovať zo súboru"

#: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Načítať z pamäte prehliadača"

#: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Nastavenia budú načítané z lokálneho úložišťa vášho prehliadača."

#: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "Nemáte žiadne uložené nastavenia!" +msgstr "Nemáte uložené žiadne nastavenia!"

#: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" msgstr ""

#: prefs_manage.php:263 -#, fuzzy msgid "Merge with current configuration" -msgstr "Master replikácia" +msgstr "Zlúčiť so súčasným nastavením"

#: prefs_manage.php:277 #, php-format @@ -7321,10 +7322,12 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím %" +"sNastavovacieho skriptu%s."

#: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Uložiť do úložiska prehliadača"

#: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7337,6 +7340,7 @@ msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Môžete vymazať všetky vaše nastavenia a vrátiť sa k východziím hodnotám."

#: querywindow.php:93 msgid "Import files"

hooks/post-receive