The branch, QA_3_4 has been updated via 05e7ce152d5c634bd5909f5f89279a6443605e9b (commit) via e043bfe2afa2617b3983ff27e248be18b4b2c6a9 (commit) from 81f939f5df5f710f2c8b3c1d9870af7bc532b306 (commit)

- Log ----------------------------------------------------------------- commit 05e7ce152d5c634bd5909f5f89279a6443605e9b Merge: 81f939f5df5f710f2c8b3c1d9870af7bc532b306 e043bfe2afa2617b3983ff27e248be18b4b2c6a9 Author: Michal Čihař mcihar@novell.com Date: Thu May 19 09:44:04 2011 +0200

Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4

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

Summary of changes: po/bg.po | 34 +++++++++++++++++++++---------- po/sk.po | 65 +++++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/po/bg.po b/po/bg.po index 38e53ad..778ce57 100644 --- a/po/bg.po +++ b/po/bg.po @@ -96,15 +96,15 @@ msgstr "Използване тази стойност" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Няма зададен BLOB поточен сървър!"

#: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "" +msgstr "Зареждането на заглавките се провали"

#: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Отваряенто на отдалечения адрес се провали"

#: changelog.php:32 license.php:28 #, php-format @@ -345,6 +345,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" +"Хранилището за конфигурацията на phpMyAdmin е деактивирано. За да разберете " +"защо натиснете %sтук%s."

#: db_operations.php:600 msgid "Edit or export relational schema" @@ -612,7 +614,7 @@ msgstr "Проследяването е неактивно." msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "" +msgstr "Този изглед има поне толкова реда. Погледнете %sдокументацията%s"

#: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 @@ -795,7 +797,7 @@ msgstr "Въведете всяка стойност в отделно поле.

#: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Рестартиране на вмъкването и добавяне нова стойност"

#: enum_editor.php:67 msgid "Output" @@ -804,6 +806,7 @@ msgstr "Изход" #: enum_editor.php:68 msgid "Copy and paste the joined values into the "Length/Values" field" msgstr "" +"Копиране и поставяне на слепените стойности в полето "Дължина/Стойности""

#: export.php:73 msgid "Selected export type has to be saved in file!" @@ -854,6 +857,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"Опитвате да заредите файл с неподдържана компресия (%s). Или поддръжката ѝ " +"не е реализирана, или е изключена от конфигурацията."

#: import.php:336 msgid "" @@ -861,6 +866,9 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"Не бяха получени данни за импорт. Или не е изпратен файл, или файлът е бил " +"по-голям от разрешеното в конфигурацията на PHP. Вижте [a@./Documentation." +"html#faq1_16@Documentation]ЧЗВ 1.16[/a]."

#: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -891,6 +899,8 @@ msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" +"Времето за изчакване на скрипта изтече. Ако искате да завършите импорта го " +"пуснете отново и той ще си продължи."

#: import.php:425 msgid "" @@ -961,7 +971,7 @@ msgstr "Операцията може да продължи дълго. Да п

#: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "На път сте да ИЗКЛЮЧИТЕ BLOB хранилището!"

#: js/messages.php:41 #, php-format @@ -1432,7 +1442,7 @@ msgstr "Липсва временна папка."

#: libraries/File.class.php:322 msgid "Failed to write file to disk." -msgstr "" +msgstr "Запазването на файл на диска се провали."

#: libraries/File.class.php:325 msgid "File upload stopped by extension." @@ -1447,6 +1457,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" +"Грешка при преместване на качения файл, вж. [a@./Documentation." +"html#faq1_11@Documentation]ЧЗВ 1.11[/a]"

#: libraries/Index.class.php:427 tbl_relation.php:526 msgid "No index defined!" @@ -2049,7 +2061,7 @@ msgstr "Скочи към база от данни "%s"." #: libraries/common.lib.php:2466 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "" +msgstr "Функционалността %s се влияе от известен дефект, вж. %s"

#: libraries/common.lib.php:2826 libraries/common.lib.php:2833 #: libraries/common.lib.php:3018 libraries/config/setup.forms.php:291 @@ -9474,7 +9486,7 @@ msgstr ""

#: tbl_tracking.php:637 msgid "Deactivate now" -msgstr "" +msgstr "Деактивиране сега"

#: tbl_tracking.php:648 #, php-format @@ -9483,12 +9495,12 @@ msgstr ""

#: tbl_tracking.php:650 msgid "Activate now" -msgstr "" +msgstr "Активиране сега"

#: tbl_tracking.php:663 #, php-format msgid "Create version %s of %s.%s" -msgstr "" +msgstr "Създаване на версия %s от %s.%s"

#: tbl_tracking.php:667 msgid "Track these data definition statements:" diff --git a/po/sk.po b/po/sk.po index 84fe198..2b0fce3 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3830,6 +3830,8 @@ msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma_column_info[/kbd]" msgstr "" +"Nechajte prázdne pre žiadne komentáre ci mime typy polí, navrhované: [kbd]" +"pma_column_info[/kbd]"

#: libraries/config/messages.inc.php:368 msgid "Column information table" @@ -3914,7 +3916,7 @@ msgstr "rozšírenie PHP"

#: libraries/config/messages.inc.php:384 msgid "Hide databases matching regular expression (PCRE)" -msgstr "" +msgstr "Skryť databázy odpovedajúce regulárnemu výrazu (PCRE)"

#: libraries/config/messages.inc.php:385 #, fuzzy @@ -3926,14 +3928,16 @@ msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" "kbd]" msgstr "" +"Nechať prázdne pre vypnutie histórie SQL dopytov, navrhované: [kbd]" +"pma_history[/kbd]"

#: libraries/config/messages.inc.php:387 msgid "SQL query history table" -msgstr "" +msgstr "Tabuľka histórie SQL dopytov"

#: libraries/config/messages.inc.php:388 msgid "Hostname where MySQL server is running" -msgstr "" +msgstr "Meno počítača, kde beží MySQL server"

#: libraries/config/messages.inc.php:389 #, fuzzy @@ -3942,15 +3946,15 @@ msgstr "meno servera"

#: libraries/config/messages.inc.php:390 msgid "Logout URL" -msgstr "" +msgstr "URL pri odhlásení"

#: libraries/config/messages.inc.php:391 msgid "Try to connect without password" -msgstr "" +msgstr "Pokusiť sa pripojiť bez hesla"

#: libraries/config/messages.inc.php:392 msgid "Connect without password" -msgstr "" +msgstr "Pripojiť sa bez hesla"

#: libraries/config/messages.inc.php:393 msgid "" @@ -3963,24 +3967,26 @@ msgstr ""

#: libraries/config/messages.inc.php:394 msgid "Show only listed databases" -msgstr "" +msgstr "Zobraziť len vybrané databázy"

#: libraries/config/messages.inc.php:395 libraries/config/messages.inc.php:432 msgid "Leave empty if not using config auth" -msgstr "" +msgstr "Nechajte prázdne, pokiaľ nepoužívate prihlasovací config"

#: libraries/config/messages.inc.php:396 msgid "Password for config auth" -msgstr "" +msgstr "Heslo pre prihlasovací config"

#: libraries/config/messages.inc.php:397 msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgstr "" +"Nechajte prázdne pre vypnutie podpory pre PDF schémy, navrhované: [kbd]" +"pma_pdf_pages[/kbd]"

#: libraries/config/messages.inc.php:398 msgid "PDF schema: pages table" -msgstr "" +msgstr "PDF schéma: tabuľka stránok"

#: libraries/config/messages.inc.php:399 msgid "" @@ -3998,6 +4004,7 @@ msgstr "meno databázy" #: libraries/config/messages.inc.php:401 msgid "Port on which MySQL server is listening, leave empty for default" msgstr "" +"Port, na ktorom počúva MySQL server, nechajte prázdne pre východziu hodnotu"

#: libraries/config/messages.inc.php:402 #, fuzzy @@ -4017,29 +4024,32 @@ msgstr "Opraviť tabuľku"

#: libraries/config/messages.inc.php:405 msgid "SQL command to fetch available databases" -msgstr "" +msgstr "SQL príkaz pre načítanie dostupných databáz"

#: libraries/config/messages.inc.php:406 msgid "SHOW DATABASES command" -msgstr "" +msgstr "SHOW DATABASES príkaz"

#: libraries/config/messages.inc.php:407 msgid "" "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon%5Dauthentication types" "[/a] for an example" msgstr "" +"Priklad, viď [a@http://wiki.phpmyadmin.net/pma/auth_types#signon%5Dtypy " +"overovania/a]"

#: libraries/config/messages.inc.php:408 msgid "Signon session name" -msgstr "" +msgstr "Meno prihlasovacej session/sedenia"

#: libraries/config/messages.inc.php:409 msgid "Signon URL" -msgstr "" +msgstr "URL pri prihlásení"

#: libraries/config/messages.inc.php:410 msgid "Socket on which MySQL server is listening, leave empty for default" msgstr "" +"Socket na ktorom počúva MySQL server, nechajte prázdne pre východziu hodnotu"

#: libraries/config/messages.inc.php:411 #, fuzzy @@ -4048,20 +4058,22 @@ msgstr "Voľba serveru"

#: libraries/config/messages.inc.php:412 msgid "Enable SSL for connection to MySQL server" -msgstr "" +msgstr "Povoliť SSL pre pripojenie k MySQL serveru"

#: libraries/config/messages.inc.php:413 msgid "Use SSL" -msgstr "" +msgstr "Použiť SSL"

#: libraries/config/messages.inc.php:414 msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" msgstr "" +"Nechajte prázdne pro vypnutie podpory pre PDF schému, navrhované: [kbd]" +"pma_table_coords[/kbd]"

#: libraries/config/messages.inc.php:415 msgid "PDF schema: table coordinates" -msgstr "" +msgstr "PDF schéma: tabuľka súradníc"

#: libraries/config/messages.inc.php:416 msgid "" @@ -4080,34 +4092,42 @@ msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" +"Či chcete pridať príkaz DROP DATABASE IF EXISTS do logu ako prvý riadok pri " +"vytváraní databázy."

#: libraries/config/messages.inc.php:419 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Pridať DROP DATABASE"

#: libraries/config/messages.inc.php:420 msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" +"Či chcete pridať príkaz DROP TABLE IF EXISTS do logu ako prvý riadok pri " +"vytváraní tabuľky."

#: libraries/config/messages.inc.php:421 msgid "Add DROP TABLE" -msgstr "" +msgstr "Pridať DROP TABLE"

#: libraries/config/messages.inc.php:422 msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" +"Či chcete pridať príkaz DROP VIEW IF EXISTS do logu ako prvý riadok pri " +"vytváraní pohľadu."

#: libraries/config/messages.inc.php:423 msgid "Add DROP VIEW" -msgstr "" +msgstr "Pridať DROP VIEW"

#: libraries/config/messages.inc.php:424 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" +"Určuje zoznam príkazov, ktoré sa automaticky použijú pri vytváraní nových " +"verzií."

#: libraries/config/messages.inc.php:425 #, fuzzy @@ -4123,13 +4143,14 @@ msgstr ""

#: libraries/config/messages.inc.php:427 msgid "SQL query tracking table" -msgstr "" +msgstr "Tabuľka pre sledovanie SQL dopytov"

#: libraries/config/messages.inc.php:428 msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." msgstr "" +"Či má sledovací mechanizmus automaticky vytvárať verzie tabuliek a pohľadov.."

#: libraries/config/messages.inc.php:429 #, fuzzy @@ -4145,7 +4166,7 @@ msgstr ""

#: libraries/config/messages.inc.php:431 msgid "User preferences storage table" -msgstr "" +msgstr "Tabuľka pre užívateľské nastavenia"

#: libraries/config/messages.inc.php:433 msgid "User for config auth"

hooks/post-receive