The branch, master has been updated via e22dc91f5adce9bb6616450d677926ee7a95baa6 (commit) via f242392df9cc48d37f6be10da53bacb88c01421d (commit) via cd61935a55326cc8aee28e17d49a444fa115f4e0 (commit) via 699214405c9e8aef5fec8bf301622b9a1875aa1f (commit) via 5aa22db0693dcb3c6d40716d3c91237ef9f1e258 (commit) via 0b8a9b510be6eef73e9fb879bde8f83c972ea418 (commit) via 31f85c847763ebf41910484d7013480b8fbe9246 (commit) via 4825b56f553c80879926c344aed770b2dc32d4e0 (commit) via 726fc9e7e8a2265e1839e74543530776e4a93780 (commit) via 882ece32b62af3ee925e8e087bb45796d19bde10 (commit) via c2360fdaf4b9a87a518cf8eba98271f75e1babea (commit) via a250232529ee9ef75e0f1843d5aedf2a624c5d32 (commit) via 7a78a3480fbe605a0d459a02370feb0d24acf230 (commit) via f9ac783cae3843d9e9dfda3a2582162d07ca4a5c (commit) via 26687ef87a3d61de995b36eae0d30edce6eb66c6 (commit) via 86516586d87eb9f9757f8d3ba714bb9749d4b2f8 (commit) via 0dd3a50de0ef7f7c534b1b05947968d39540ec9c (commit) via ca76fc0fddb6685986638ec0aeca686c82279015 (commit) via 8bc2fb216848d6697084adbc0ffe20be9889b10f (commit) via 2f3397c6043d5ccdf3ac9108c416a1f5554f60db (commit) via f683d50f82b1a14650a64ff81baec5401f5ba17f (commit) via 59b51eb71af3f8514aba06e55606f4e083346426 (commit) via 0d3abdee41742f8842288dbb68c0a5a5eacc1362 (commit) via eab3b73e6e423c6426b9078239fe56bb90ab3e6a (commit) from f4d9b34b9d255d5edd2bb10fd78c4ed9ea1a6e78 (commit)
- Log ----------------------------------------------------------------- commit e22dc91f5adce9bb6616450d677926ee7a95baa6 Merge: f4d9b34b9d255d5edd2bb10fd78c4ed9ea1a6e78 f242392df9cc48d37f6be10da53bacb88c01421d Author: Michal Čihař mcihar@novell.com Date: Tue May 17 13:58:08 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit f242392df9cc48d37f6be10da53bacb88c01421d Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:56:45 2011 +0200
Translation update done using Pootle.
commit cd61935a55326cc8aee28e17d49a444fa115f4e0 Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:56:24 2011 +0200
Translation update done using Pootle.
commit 699214405c9e8aef5fec8bf301622b9a1875aa1f Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:56:22 2011 +0200
Translation update done using Pootle.
commit 5aa22db0693dcb3c6d40716d3c91237ef9f1e258 Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:55:14 2011 +0200
Translation update done using Pootle.
commit 0b8a9b510be6eef73e9fb879bde8f83c972ea418 Author: martin martin@whistler.sk Date: Tue May 17 13:55:08 2011 +0200
Translation update done using Pootle.
commit 31f85c847763ebf41910484d7013480b8fbe9246 Author: martin martin@whistler.sk Date: Tue May 17 13:55:00 2011 +0200
Translation update done using Pootle.
commit 4825b56f553c80879926c344aed770b2dc32d4e0 Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:54:58 2011 +0200
Translation update done using Pootle.
commit 726fc9e7e8a2265e1839e74543530776e4a93780 Author: martin martin@whistler.sk Date: Tue May 17 13:54:37 2011 +0200
Translation update done using Pootle.
commit 882ece32b62af3ee925e8e087bb45796d19bde10 Author: martin martin@whistler.sk Date: Tue May 17 13:54:15 2011 +0200
Translation update done using Pootle.
commit c2360fdaf4b9a87a518cf8eba98271f75e1babea Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:54:08 2011 +0200
Translation update done using Pootle.
commit a250232529ee9ef75e0f1843d5aedf2a624c5d32 Author: martin martin@whistler.sk Date: Tue May 17 13:53:46 2011 +0200
Translation update done using Pootle.
commit 7a78a3480fbe605a0d459a02370feb0d24acf230 Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:53:39 2011 +0200
Translation update done using Pootle.
commit f9ac783cae3843d9e9dfda3a2582162d07ca4a5c Author: martin martin@whistler.sk Date: Tue May 17 13:53:31 2011 +0200
Translation update done using Pootle.
commit 26687ef87a3d61de995b36eae0d30edce6eb66c6 Author: martin martin@whistler.sk Date: Tue May 17 13:53:13 2011 +0200
Translation update done using Pootle.
commit 86516586d87eb9f9757f8d3ba714bb9749d4b2f8 Author: Michal Čihař michal@cihar.com Date: Tue May 17 13:52:57 2011 +0200
Translation update done using Pootle.
commit 0dd3a50de0ef7f7c534b1b05947968d39540ec9c Author: martin martin@whistler.sk Date: Tue May 17 13:52:39 2011 +0200
Translation update done using Pootle.
commit ca76fc0fddb6685986638ec0aeca686c82279015 Author: martin martin@whistler.sk Date: Tue May 17 13:52:29 2011 +0200
Translation update done using Pootle.
commit 8bc2fb216848d6697084adbc0ffe20be9889b10f Author: martin martin@whistler.sk Date: Tue May 17 13:52:14 2011 +0200
Translation update done using Pootle.
commit 2f3397c6043d5ccdf3ac9108c416a1f5554f60db Author: martin martin@whistler.sk Date: Tue May 17 13:52:00 2011 +0200
Translation update done using Pootle.
commit f683d50f82b1a14650a64ff81baec5401f5ba17f Author: martin martin@whistler.sk Date: Tue May 17 13:51:39 2011 +0200
Translation update done using Pootle.
commit 59b51eb71af3f8514aba06e55606f4e083346426 Author: martin martin@whistler.sk Date: Tue May 17 13:51:17 2011 +0200
Translation update done using Pootle.
commit 0d3abdee41742f8842288dbb68c0a5a5eacc1362 Author: martin martin@whistler.sk Date: Tue May 17 13:50:59 2011 +0200
Translation update done using Pootle.
commit eab3b73e6e423c6426b9078239fe56bb90ab3e6a Author: martin martin@whistler.sk Date: Tue May 17 13:50:26 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/cs.po | 20 +++++++++++--------- po/en_GB.po | 8 ++++---- po/sk.po | 45 +++++++++++++++------------------------------ 3 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/po/cs.po b/po/cs.po index e4e6866..e743eed 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,13 +7,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-05-16 10:31-0400\n" -"PO-Revision-Date: 2011-05-17 00:17+0200\n" +"PO-Revision-Date: 2011-05-17 13:56+0200\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n"
@@ -1128,7 +1128,7 @@ msgstr "Zobrazit výsledky vyhledávání" #: js/messages.php:90 msgid "" "Note: If the file contains multiple tables, they will be combined into one" -msgstr "" +msgstr "Poznámka: Pokud soubor obsahuje více tabulek, budou sloučeny do jedné."
#: js/messages.php:93 msgid "Hide query box" @@ -1189,6 +1189,8 @@ msgid "" "You haven't saved the changes in the layout. They will be lost if you don't " "save them.Do you want to continue?" msgstr "" +"Neuložili jste změny ve schématu. Pokud je neuložíte, budou ztraceny. " +"Přejete si pokračovat?"
#: js/messages.php:114 msgid "Add an option for column " @@ -9051,6 +9053,9 @@ msgid "" "Configuration saved to file config/config.inc.php in phpMyAdmin top level " "directory, copy it to top level one and delete directory config to use it." msgstr "" +"Konfigurace byla uložena do souboru config/config.inc.php v adresáři " +"phpMyAdmina, přesuňte ji do adresáře phpMyAdmin a smažte adresář config pro " +"její použití."
#: setup/frames/index.inc.php:100 setup/frames/menu.inc.php:15 msgid "Overview" @@ -9908,10 +9913,9 @@ msgid "Version %s snapshot (SQL code)" msgstr "Snímek verze %s (SQL kód)"
#: tbl_tracking.php:382 -#, fuzzy #| msgid "Track these data definition statements:" msgid "Tracking data definition successfully deleted" -msgstr "Sledovat tyto příkazy pro definici dat:" +msgstr "Uložené příkazy pro změnu struktury byly úspěšně smazány"
#: tbl_tracking.php:384 tbl_tracking.php:401 #| msgid "Gather errors" @@ -9919,10 +9923,9 @@ msgid "Query error" msgstr "Chyba dotazu"
#: tbl_tracking.php:399 -#, fuzzy #| msgid "Track these data manipulation statements:" msgid "Tracking data manipulation successfully deleted" -msgstr "Sledovat tyto příkazy pro úpravu dat:" +msgstr "Uložené příkazy pro změnu dat byly úspěšně smazány"
#: tbl_tracking.php:411 msgid "Tracking statements" @@ -9934,10 +9937,9 @@ msgid "Show %s with dates from %s to %s by user %s %s" msgstr "Zobrazit %s s datem od %s do %s od uživatele %s %s"
#: tbl_tracking.php:432 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete tracking data row from report" -msgstr "Odstranit všechny informace o sledování této tabulky" +msgstr "Odstranit tyto informace o sledování této tabulky"
#: tbl_tracking.php:443 #| msgid "No databases" diff --git a/po/en_GB.po b/po/en_GB.po index d3db206..0c5a4c2 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31-0400\n" -"PO-Revision-Date: 2011-05-16 16:28+0200\n" -"Last-Translator: Marc Delisle marc@infomarc.info\n" +"PO-Revision-Date: 2011-05-17 13:52+0200\n" +"Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: english-gb en_GB@li.org\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -7910,10 +7910,10 @@ msgid "Unable to change master" msgstr "Unable to change master"
#: 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 changed succesfully to %s" +msgstr "Master server changed successfully to %s"
#: server_replication.php:180 msgid "This server is configured as master in a replication process." diff --git a/po/sk.po b/po/sk.po index ea4ee68..0b3a192 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 12:56+0200\n" +"PO-Revision-Date: 2011-05-17 13:55+0200\n" "Last-Translator: martin@whistler.sk\n" "Language-Team: slovak sk@li.org\n" "Language: sk\n" @@ -2733,10 +2733,9 @@ msgid "Relations" msgstr "Prepojenia"
#: libraries/config/messages.inc.php:103 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Typ vytvorených dopytov" +msgstr "Metóda exportu"
#: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" @@ -2954,10 +2953,9 @@ msgid "Microsoft Office" msgstr "Microsoft Office"
#: libraries/config/messages.inc.php:185 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "Open Document Text" +msgstr "Open Document"
#: libraries/config/messages.inc.php:187 msgid "Other core settings" @@ -2968,10 +2966,9 @@ msgid "Settings that didn't fit enywhere else" msgstr "Nastavenia, ktoré sa nedajú zaradiť inde"
#: libraries/config/messages.inc.php:189 -#, fuzzy #| msgid "Page number:" msgid "Page titles" -msgstr "Číslo stránky:" +msgstr "Mená stránok"
#: libraries/config/messages.inc.php:190 msgid "" @@ -3501,10 +3498,9 @@ msgid "Use natural order for sorting table and database names" msgstr ""
#: libraries/config/messages.inc.php:318 -#, fuzzy #| msgid "Alter table order by" msgid "Natural order" -msgstr "Zmeniť poradie tabuľky podľa" +msgstr "Prirodzené poradie"
#: libraries/config/messages.inc.php:319 libraries/config/messages.inc.php:329 msgid "Use only icons, only text or both" @@ -3595,10 +3591,9 @@ msgid "Query window height (in pixels)" msgstr ""
#: libraries/config/messages.inc.php:341 -#, fuzzy #| msgid "Query window" msgid "Query window height" -msgstr "SQL okno" +msgstr "Výška okna dopytov"
#: libraries/config/messages.inc.php:342 #| msgid "Query window" @@ -3606,10 +3601,9 @@ msgid "Query window width (in pixels)" msgstr "Šírka okna dopytov (v pixeloch)"
#: libraries/config/messages.inc.php:343 -#, fuzzy #| msgid "Query window" msgid "Query window width" -msgstr "SQL okno" +msgstr "Šírka okna dopytov"
#: libraries/config/messages.inc.php:344 msgid "Select which functions will be used for character set conversion" @@ -3624,10 +3618,9 @@ msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgstr ""
#: libraries/config/messages.inc.php:347 -#, fuzzy #| msgid "Repair threads" msgid "Repeat headers" -msgstr "Opravné vlákna" +msgstr "Opakovať záhlavie"
#: libraries/config/messages.inc.php:348 msgid "Show help button instead of Documentation text" @@ -3866,10 +3859,9 @@ msgid "" msgstr ""
#: libraries/config/messages.inc.php:400 -#, fuzzy #| msgid "database name" msgid "Database name" -msgstr "meno databázy" +msgstr "Meno databázy"
#: libraries/config/messages.inc.php:401 msgid "Port on which MySQL server is listening, leave empty for default" @@ -3986,10 +3978,9 @@ msgid "Defines the list of statements the auto-creation uses for new versions." msgstr ""
#: libraries/config/messages.inc.php:425 -#, fuzzy #| msgid "Statements" msgid "Statements to track" -msgstr "Údaj" +msgstr "Sledované príkazy"
#: libraries/config/messages.inc.php:426 msgid "" @@ -4008,10 +3999,9 @@ msgid "" msgstr ""
#: libraries/config/messages.inc.php:429 -#, fuzzy #| msgid "Automatic recovery mode" msgid "Automatically create versions" -msgstr "Režim automatickej obnovy" +msgstr "Automaticky vytvárať verzie"
#: libraries/config/messages.inc.php:430 msgid "" @@ -4077,10 +4067,9 @@ msgid "" msgstr ""
#: libraries/config/messages.inc.php:444 -#, fuzzy #| msgid "Show open tables" msgid "Show field types" -msgstr "Zobraziť otvorené tabuľky" +msgstr "Zobraziť typy polí"
#: libraries/config/messages.inc.php:445 msgid "Display the function fields in edit/insert mode" @@ -4243,10 +4232,9 @@ msgid "Title of browser window when nothing is selected" msgstr ""
#: libraries/config/messages.inc.php:483 -#, fuzzy #| msgid "Default" msgid "Default title" -msgstr "Predvolené" +msgstr "Východzí popis"
#: libraries/config/messages.inc.php:484 msgid "Title of browser window when a server is selected" @@ -4382,10 +4370,9 @@ msgstr ""
#: libraries/config/setup.forms.php:266 #: libraries/config/user_preferences.forms.php:169 -#, fuzzy #| msgid "Custom color" msgid "Custom" -msgstr "Vlastná farba" +msgstr "Vlastné"
#: libraries/config/setup.forms.php:287 #: libraries/config/user_preferences.forms.php:189 @@ -4539,10 +4526,9 @@ msgid "Password Hashing" msgstr "Hashovanie hesla"
#: libraries/display_change_password.lib.php:65 -#, fuzzy #| msgid "MySQL 4.0 compatible" msgid "MySQL 4.0 compatible" -msgstr "Kompatibilné s MySQL 4.0" +msgstr "Kompatibilné s MySQL 4.0"
#: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 @@ -4564,7 +4550,6 @@ msgid "Create table on database %s" msgstr "Vytvoriť novú tabuľku v databáze %s"
#: libraries/display_create_table.lib.php:55 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" msgstr "Počet polí"
hooks/post-receive