The branch, master has been updated via 310466c489603511a1a615db8e36f1714e249bcd (commit) via 60411dd4c6ebc898cedfbab14186e2c3037246db (commit) via 1af6d2e6ed6040b625c1c387c91c54a0cdf5c9c6 (commit) via 61c6ae73b0da27d4c057a55bf27db139d5168e71 (commit) via eaf3734ffd8ad7841c39c8627dea33c8dac5a96d (commit) via fdc105e0527ec41d2c2d016b5650bcc7eaba42d0 (commit) via e2f35b29465e5ea6a04992eed78187a1079faf4f (commit) from fd2712dfde5f41e626c4f19505b1b12b538d5f23 (commit)

- Log ----------------------------------------------------------------- commit 310466c489603511a1a615db8e36f1714e249bcd Merge: 1af6d2e6ed6040b625c1c387c91c54a0cdf5c9c6 60411dd4c6ebc898cedfbab14186e2c3037246db Author: Michal Čihař mcihar@novell.com Date: Mon May 30 11:20:31 2011 +0200

Merge remote-tracking branch 'origin/QA_3_4'

commit 1af6d2e6ed6040b625c1c387c91c54a0cdf5c9c6 Author: Martin Lacina martin@whistler.sk Date: Mon May 30 10:55:01 2011 +0200

Translation update done using Pootle.

commit 61c6ae73b0da27d4c057a55bf27db139d5168e71 Author: Martin Lacina martin@whistler.sk Date: Mon May 30 10:52:58 2011 +0200

Translation update done using Pootle.

commit eaf3734ffd8ad7841c39c8627dea33c8dac5a96d Author: Martin Lacina martin@whistler.sk Date: Mon May 30 10:51:28 2011 +0200

Translation update done using Pootle.

commit fdc105e0527ec41d2c2d016b5650bcc7eaba42d0 Author: Martin Lacina martin@whistler.sk Date: Mon May 30 10:49:45 2011 +0200

Translation update done using Pootle.

commit e2f35b29465e5ea6a04992eed78187a1079faf4f Author: Martin Lacina martin@whistler.sk Date: Mon May 30 10:43:10 2011 +0200

Translation update done using Pootle.

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

Summary of changes: po/sk.po | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/po/sk.po b/po/sk.po index 68daedb..ec3c474 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-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-22 20:33+0200\n" +"PO-Revision-Date: 2011-05-30 10:55+0200\n" "Last-Translator: Martin Lacina martin@whistler.sk\n" "Language-Team: slovak sk@li.org\n" "Language: sk\n" @@ -3810,6 +3810,11 @@ msgid "" "their names in order and use [kbd]*[/kbd] at the end to show the rest in " "alphabetical order." msgstr "" +"Môžete použiť nahradzujúce znaky (% a _). Pokiaľ ich potrebujete použiť v " +"ich pôvodnom význame, vložte spätné lomítko \ pred, napríklad " +"[kbd]'moja\_db'[/kbd] namiesto [kbd]'moja_db'[/kbd]. Použitím tejto voľby " +"môžete ovplyvniť triedenie databáz v zozname. Stačí na konci zoznamu uviesť " +"[kbd]*[/kbd] na konci pre zobrazenie ostatných v abecednom poradí."

#: libraries/config/messages.inc.php:394 msgid "Show only listed databases" @@ -3840,6 +3845,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"Databáza použitá pre ralácie, záložky a PDF možností. Pre kompletný popis " +"viď [a@http://wiki.phpmyadmin.net/pma/pmadb%5Dpmadb%5B/a]. Ak ponecháte prázdne, " +"bude táto možnosť vypnutá. Doporučená hodnota: [kbd]phpmyadmin[/kbd]"

#: libraries/config/messages.inc.php:400 msgid "Database name" @@ -3923,6 +3931,8 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" +"Tabuľka obsahujúca popisy polí. Nechajte prázdnu pre vypnutie tejto funkcie. " +"Odporúčaná hodnota: [kbd]pma_table_info[/kbd]"

#: libraries/config/messages.inc.php:417 msgid "Display columns table" @@ -4003,6 +4013,8 @@ msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/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]"

#: libraries/config/messages.inc.php:431 msgid "User preferences storage table" @@ -4017,6 +4029,8 @@ msgid "" "Disable if you know that your pma_* tables are up to date. This prevents " "compatibility checks and thereby increases performance" msgstr "" +"Vypnite, pokiaľ viete, že vaše pma_* tabuľky sú aktuálne. Tým zabránite " +"kontrolám kompatibility a urýchlite zabrazovanie stránok."

#: libraries/config/messages.inc.php:435 msgid "Verbose check"

hooks/post-receive