The branch, master has been updated via dea23c88fd048bc2f92ef53232222ddbaa505002 (commit) via 17f4590c955e32ea972741fb02dd9922521a11cd (commit) via 2b736fa66d22d8d68fd2956f58b623adcf7be9b6 (commit) via dfd362f1cf59832fd4cf201bf2fdff4b63e900ae (commit) via 88951787547f1907246a3025745eb4aca8fb3b36 (commit) via 261b28dee072d8e7e957144e23e8d8f335987b62 (commit) via 5873fb04e4e1f84e97271988596d0c0604a7ff7b (commit) via 0f9a277fff0a72775393002dc65b7f60a8b10ff2 (commit) via d2f57ef837478403a741accb33121acb539d359b (commit) via fc925b4c5ffae6eb58e0c3a15d63d59e4e85bb36 (commit) via f728d3911f8f91b68e9191657658135ef6d6e3b1 (commit) via adcf7253b0b75d77b242735abd67bcd4af3f3809 (commit) via 9bdecb6a818bf02bcdefce2e9d91fb9a91958b5c (commit) via 3ae2fa14a342adcbe8cceddfc277abbbf21904e3 (commit) via 2c786a16486db36dd7bb8cd561c9a2713b602143 (commit) via 14001295a1a2e2c0b751c48890ccfd710467be94 (commit) via baad03b9985a87b05e6823ffc24616f70c939b64 (commit) via c9ca75f0d1418a1080927131bdeebd931ed0a638 (commit) via 9d5f3e63f974a84a6c0894d2d2ae580a2d9b0a3c (commit) via 9dd911fb1c98bc3105444bb460cccf065bfda300 (commit) from f9584261dc6ea5000be85561164c6b3a5caac082 (commit)
- Log ----------------------------------------------------------------- commit dea23c88fd048bc2f92ef53232222ddbaa505002 Merge: f958426 17f4590 Author: Michal Čihař michal@cihar.com Date: Fri Feb 3 12:18:44 2012 +0100
Merge branch 'QA_3_5'
-----------------------------------------------------------------------
Summary of changes: po/cs.po | 10 +++++++--- po/de.po | 14 +++++++------- po/el.po | 5 ++--- po/ja.po | 17 ++++++----------- po/ru.po | 10 +++++----- po/sl.po | 7 +++---- po/tr.po | 6 +++--- 7 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/po/cs.po b/po/cs.po index 5069f0b..ff3fd36 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-01-31 23:33+0200\n" +"PO-Revision-Date: 2012-02-02 15:07+0200\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" "Language: cs\n" @@ -12615,15 +12615,19 @@ msgstr "Procento využití vyrovnávací paměti MyISAM pro klíče" #, php-format msgid "%% MyISAM key buffer used: %s%%, this value should be above 95%%" msgstr "" +"Využití vyrovnávací paměti klíčů MyISAM: %s%%, tato hodnota by měla být nad " +"95%%"
#: po/advisory_rules.php:175 msgid "Percentage of index reads from memory" -msgstr "" +msgstr "Procento čtení klíčů z paměti"
#: po/advisory_rules.php:176 #, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." msgstr "" +"Procento klíčů, které používají vyrovnávací paměť klíčů MyISAM, je příliš " +"nízké."
#: po/advisory_rules.php:177 msgid "You may need to increase {key_buffer_size}." @@ -12632,7 +12636,7 @@ msgstr "Mohlo by být potřeba zvýšit {key_buffer_size}." #: po/advisory_rules.php:178 #, php-format msgid "Index reads from memory: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Čtení klíčů z paměti: %s%%, tato hodnota by měla být pod 95%%"
#: po/advisory_rules.php:180 msgid "Rate of table open" diff --git a/po/de.po b/po/de.po index a99eabd..bf09702 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2011-12-17 15:45+0200\n" -"Last-Translator: Rouslan Placella rouslan@placella.com\n" +"PO-Revision-Date: 2012-02-02 14:27+0200\n" +"Last-Translator: cybot pma@sebastianmendel.de\n" "Language-Team: german de@li.org\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -849,7 +849,7 @@ msgstr "Der gewählte Export-Typ kann nur als Datei exportiert werden!"
#: export.php:106 msgid "Bad parameters!" -msgstr "Ungültiger Parameter!" +msgstr "Ungültige Parameter!"
#: export.php:166 export.php:191 export.php:652 #, php-format @@ -869,16 +869,16 @@ msgstr "" msgid "The web server does not have permission to save the file %s." msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern."
-# Schema is not the right word for it, because a dump contains also data, and +# Schema is not the right word for it, because a dump contains also data, and
# NOT just the scheme. #: export.php:654 #, php-format msgid "Dump has been saved to file %s." -msgstr "Dump wurde in Datei %s gespeichert." +msgstr "Auflistung wurde in Datei %s gespeichert."
#: file_echo.php:21 msgid "Invalid export type" -msgstr "Ungültiger Exporttyp" +msgstr "Ungültiger Typ für Export."
#: gis_data_editor.php:84 #, php-format @@ -887,7 +887,7 @@ msgstr "Wert für die Spalte "%s""
#: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" -msgstr "Verwende OpenStreetMaps als Basis-Layer" +msgstr "Verwende OpenStreetMaps als Basis-Satz"
#: gis_data_editor.php:134 msgid "SRID" diff --git a/po/el.po b/po/el.po index fb741f6..e2902e9 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-01-12 09:01+0200\n" +"PO-Revision-Date: 2012-02-02 14:30+0200\n" "Last-Translator: Panagiotis Papazoglou papaz_p@yahoo.com\n" "Language-Team: greek el@li.org\n" "Language: el\n" @@ -6022,10 +6022,9 @@ msgid "Show BLOB contents" msgstr "Εμφάνιση περιεχομένων BLOB"
#: libraries/display_tbl.lib.php:686 -#, fuzzy #| msgid "Browser transformation" msgid "Hide browser transformation" -msgstr "Μετατροπή περιηγητή" +msgstr "Απόκρυψη μετατροπής περιηγητή"
#: libraries/display_tbl.lib.php:693 msgid "Well Known Text" diff --git a/po/ja.po b/po/ja.po index 1c7032b..86ba13f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-01-26 12:03+0200\n" +"PO-Revision-Date: 2012-02-01 12:01+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -3276,8 +3276,7 @@ msgstr "一般ユーザに「データベースを削除する」リンクを表 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" -msgstr "" -"[kbd]cookie[/kbd] 認証においてクッキーの暗号化に使用される秘密のパスフレーズ" +msgstr "[kbd]cookie[/kbd] 認証においてクッキーの暗号化に使用される非公開パスフレーズ"
#: libraries/config/messages.inc.php:25 msgid "Blowfish secret" @@ -8518,9 +8517,7 @@ msgstr ""
#: main.php:308 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." -msgstr "" -"設定ファイルに、暗号化 (blowfish_secret) 用のパスフレーズの設定を必要とするよ" -"うになりました。" +msgstr "設定ファイルに、暗号化 (blowfish_secret) 用の非公開パスフレーズの設定を必要とするようになりました。"
#: main.php:316 msgid "" @@ -10980,9 +10977,8 @@ msgid "" "so a key was automatically generated for you. It is used to encrypt cookies; " "you don't need to remember it." msgstr "" -"blowfish 暗号のパスフレーズなしで cookie 認証が有効にされましたので、パスフ" -"レーズを自動的に生成しました。パスフレーズはクッキーを暗号化するために使用さ" -"れますが、管理者がそれを覚えておく必要はありません。" +"blowfish 暗号のパスフレーズなしで cookie 認証が有効にされましたので、パスフレーズを自動的に生成しました。パスフレーズはクッキーを暗号化" +"するために内部で使用されるもので、外部に知られないようにしておく必要はありますが、管理者がそれを覚えておく必要はありません。"
#: setup/lib/index.lib.php:277 #, php-format @@ -11091,10 +11087,9 @@ msgid "" msgstr "%sZip 解凍%sには関数 (%s) が必要ですが、このシステムで使用できません。"
#: setup/lib/index.lib.php:323 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it." msgid "You should use SSL connections if your database server supports it." -msgstr "ウェブサーバがサポートしているならば、SSL 接続を使用するべきです。" +msgstr "データベースサーバがサポートしているならば、SSL 接続を使用するべきです。"
#: setup/lib/index.lib.php:336 msgid "You should use mysqli for performance reasons." diff --git a/po/ru.po b/po/ru.po index 0a4ed50..d5e23c9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-01-18 19:56+0200\n" +"PO-Revision-Date: 2012-02-01 23:03+0200\n" "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n" "Language-Team: russian ru@li.org\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.1.6\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350 @@ -11273,11 +11273,11 @@ msgstr "" "на данной системе."
#: setup/lib/index.lib.php:323 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it." msgid "You should use SSL connections if your database server supports it." msgstr "" -"Вы должны использовать SSL соединение, если ваш веб-сервер его поддерживает." +"Вы должны использовать SSL соединение, если ваш сервер баз данных его " +"поддерживает."
#: setup/lib/index.lib.php:336 msgid "You should use mysqli for performance reasons." diff --git a/po/sl.po b/po/sl.po index f663f1e..0bd1f4d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11,8 +11,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.1.6\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350 @@ -11178,10 +11178,9 @@ msgstr "" "%sRazširjanje Zip%s zahteva funkcije (%s), ki na tem sistemu niso na voljo."
#: setup/lib/index.lib.php:323 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it." msgid "You should use SSL connections if your database server supports it." -msgstr "Uporabite povezave SSL, če jih vaš spletni strežnik podpira." +msgstr "Uporabite povezave SSL, če jih vaš strežnik zbirke podatkov podpira."
#: setup/lib/index.lib.php:336 msgid "You should use mysqli for performance reasons." diff --git a/po/tr.po b/po/tr.po index 4cd4292..7d866a0 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-01-28 22:21+0200\n" +"PO-Revision-Date: 2012-01-28 22:23+0200\n" "Last-Translator: Burak Yavuz hitowerdigit@hotmail.com\n" "Language-Team: turkish tr@li.org\n" "Language: tr\n" @@ -11192,10 +11192,10 @@ msgid "" msgstr "%sZip açması%s bu sistemde mevcut olmayan işlevleri (%s) gerektirir."
#: setup/lib/index.lib.php:323 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it." msgid "You should use SSL connections if your database server supports it." -msgstr "Eğer web sunucunuz destekliyorsa, SSL bağlantı kullanmalısınız." +msgstr "" +"Eğer veritabanı sunucunuz destekliyorsa SSL bağlantıları kullanmalısınız."
#: setup/lib/index.lib.php:336 msgid "You should use mysqli for performance reasons."
hooks/post-receive