The branch, master has been updated via 27b5898068a707c76bfdd07462b72a5bd96df573 (commit) via cd9dc695081bfc784dd3e8367727db04f00ce260 (commit) via 87c872f2777bff619d364f7b129b07fced64b3ac (commit) via 5d431d86b525bf5665fadb5ab9d55e1f43fa940d (commit) via 3c955b0bce905567d2e2708eb08334445ce07204 (commit) via d4e0760cbf2105aaf698bc978e894a3da6b4b660 (commit) via 8c67ed747810ad4f24bf7ed414055471d8921a6d (commit) via d47acdc77afdbe5f46a1e3fad04ce6d6ab236a81 (commit) via d8bd77b205499ac4115ed4c6e86bdb2a478ee732 (commit) via ea6652daab3e3f52a5e66f5bcdc87bac9b99bf4c (commit) via 94fb97be2283b4b403fb36d1f1c74c391ec0503d (commit) from e93a16f5a3b369c3d7171271f822a527bc496725 (commit)
- Log ----------------------------------------------------------------- commit 27b5898068a707c76bfdd07462b72a5bd96df573 Author: Michal Čihař mcihar@novell.com Date: Thu Nov 4 14:36:49 2010 +0100
Fix format string.
commit cd9dc695081bfc784dd3e8367727db04f00ce260 Author: Michal Čihař mcihar@novell.com Date: Thu Nov 4 14:36:01 2010 +0100
Update Czech translation.
commit 87c872f2777bff619d364f7b129b07fced64b3ac Merge: e93a16f5a3b369c3d7171271f822a527bc496725 5d431d86b525bf5665fadb5ab9d55e1f43fa940d Author: Michal Čihař mcihar@novell.com Date: Thu Nov 4 14:35:24 2010 +0100
Merge remote branch 'pootle/master'
Conflicts: po/fr.po po/zh_CN.po
commit 5d431d86b525bf5665fadb5ab9d55e1f43fa940d Author: shanyan baishui Siramizu@gmail.com Date: Thu Nov 4 05:16:30 2010 +0200
Translation update done using Pootle.
commit 3c955b0bce905567d2e2708eb08334445ce07204 Author: shanyan baishui Siramizu@gmail.com Date: Thu Nov 4 05:06:44 2010 +0200
Translation update done using Pootle.
commit d4e0760cbf2105aaf698bc978e894a3da6b4b660 Author: shanyan baishui Siramizu@gmail.com Date: Thu Nov 4 05:05:45 2010 +0200
Translation update done using Pootle.
commit 8c67ed747810ad4f24bf7ed414055471d8921a6d Merge: d47acdc77afdbe5f46a1e3fad04ce6d6ab236a81 6ffa3e7f9c0610e40056f92f6bc7f496d7f70a93 Author: Pootle server pootle@cihar.com Date: Wed Nov 3 14:40:09 2010 +0100
Merge remote branch 'origin/master'
commit d47acdc77afdbe5f46a1e3fad04ce6d6ab236a81 Author: Marc Delisle marc@infomarc.info Date: Wed Nov 3 14:05:23 2010 +0200
Translation update done using Pootle.
commit d8bd77b205499ac4115ed4c6e86bdb2a478ee732 Author: Marc Delisle marc@infomarc.info Date: Wed Nov 3 14:00:49 2010 +0200
Translation update done using Pootle.
commit ea6652daab3e3f52a5e66f5bcdc87bac9b99bf4c Author: Marc Delisle marc@infomarc.info Date: Wed Nov 3 13:58:43 2010 +0200
Translation update done using Pootle.
commit 94fb97be2283b4b403fb36d1f1c74c391ec0503d Author: Marc Delisle marc@infomarc.info Date: Wed Nov 3 13:58:23 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/cs.po | 40 +++++++++++++++++++--------------------- po/fr.po | 21 +++++++++------------ po/zh_CN.po | 12 +++++------- 3 files changed, 33 insertions(+), 40 deletions(-)
diff --git a/po/cs.po b/po/cs.po index 93b1c08..b1225e9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-03 12:13-0400\n" -"PO-Revision-Date: 2010-11-01 15:00+0100\n" +"PO-Revision-Date: 2010-11-04 14:35+0100\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" "MIME-Version: 1.0\n" @@ -604,8 +604,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1936 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s."
@@ -828,8 +828,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1616,8 +1616,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -4527,8 +4527,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -4716,13 +4716,11 @@ msgid "Options" msgstr "Nastavení"
#: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" msgstr "Zkrácené texty"
#: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" msgstr "Celé texty" @@ -6445,8 +6443,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s"
#: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6487,8 +6485,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co " +"%s dělá."
#: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -7022,8 +7020,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s."
#: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7475,8 +7473,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -8953,8 +8951,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli."
diff --git a/po/fr.po b/po/fr.po index e29b843..7184364 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-03 12:13-0400\n" -"PO-Revision-Date: 2010-10-13 18:50+0200\n" +"PO-Revision-Date: 2010-11-03 14:05+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "MIME-Version: 1.0\n" @@ -569,7 +569,6 @@ msgid "Inside column:" msgstr "Dans la colonne: "
#: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" msgstr "Aucune table n'a été trouvée dans cette base." @@ -6158,10 +6157,9 @@ msgid "Schema of the %s database - Page %s" msgstr "Schéma de la base %s - Page %s"
#: libraries/schema/Export_Relation_Schema.class.php:174 -#, fuzzy #| msgid "File %s does not contain any key id" msgid "This page does not contain any tables!" -msgstr "Le fichier %s ne contient pas d'identifiant de clé" +msgstr "Cette page ne contient aucune table!"
#: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " @@ -6861,7 +6859,6 @@ msgstr "" "travail expirera plus tôt."
#: main.php:279 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that " @@ -6871,10 +6868,9 @@ msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" -"La valeur du paramètre PHP [a@http://php.net/manual/fr/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] est plus petite " -"que la durée du cookie configurée dans phpMyAdmin; donc, votre session de " -"travail expirera plus tôt." +"La durée du stockage du cookie sur le serveur est plus petite que la durée " +"du cookie configurée dans phpMyAdmin; donc, votre session de travail " +"expirera plus tôt."
#: main.php:287 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." @@ -9073,7 +9069,7 @@ msgstr "" "risque."
#: setup/lib/index.lib.php:264 -#, fuzzy, php-format +#, php-format #| msgid "" #| "%sLogin cookie validity%s must be set to a value less or equal to %sLogin " #| "cookie store%s." @@ -9081,8 +9077,9 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" -"Le paramètre %sLogin cookie validity%s doit avoir une valeur plus petite ou " -"égale au paramètre %sLogin cookie store%s." +"Si vous utilisez l'authentification cookie et que le paramètre %sLogin cookie " +"store%s n'a pas une valeur de 0, le paramètre %sLogin cookie validity%s " +"doit avoir une valeur plus petite ou égale à celui-ci."
#: setup/lib/index.lib.php:266 #, php-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 8da5ed4..772ae07 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-03 12:13-0400\n" -"PO-Revision-Date: 2010-10-08 07:02+0200\n" +"PO-Revision-Date: 2010-11-04 05:16+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: chinese_simplified zh_CN@li.org\n" "MIME-Version: 1.0\n" @@ -563,10 +563,9 @@ msgid "Inside column:" msgstr "包含字段："
#: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" -msgstr "数据库中没有表。" +msgstr "没有在数据库中找到表"
#: db_structure.php:270 tbl_operations.php:658 #, php-format @@ -5904,10 +5903,9 @@ msgid "Schema of the %s database - Page %s" msgstr "数据库 %s 的大纲 - 第 %s 页"
#: libraries/schema/Export_Relation_Schema.class.php:174 -#, fuzzy #| msgid "File %s does not contain any key id" msgid "This page does not contain any tables!" -msgstr "文件 %s 未包含任何密钥" +msgstr "此页没有包含任何表！"
#: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " @@ -8621,14 +8619,14 @@ msgstr "" "会增加安全风险。"
#: setup/lib/index.lib.php:264 -#, fuzzy, php-format +#, php-format #| msgid "" #| "%sLogin cookie validity%s must be set to a value less or equal to %sLogin " #| "cookie store%s." msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." -msgstr "%s登录 cookie 有效期%s不能超过%s登录 cookie 保存时间%s。" +msgstr "如果使用 cookie 认证且%s登录 cookie 保存时间%s不为 0，%s登录 cookie 有效期%s的值不能超过前者。"
#: setup/lib/index.lib.php:266 #, php-format
hooks/post-receive
-
Michal Čihař