[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1023-g064e875 - Git

9 May 2011

The branch, master has been updated
       via  064e875f10b0244a15da56c4ca590d516c51f6b6 (commit)
       via  a22c528ad40cc20924ec789ace883d29193f4761 (commit)
       via  6bd7d18c5dfc76b64cbe6dd37fcda08652098dd7 (commit)
       via  50bc50ecdf924b441756c440195f9d5d8dcfd643 (commit)
       via  9d42dfc1c4afa1e028df7fa45ec3f82c2d7d5396 (commit)
       via  ca11f54db5e186ecd26b8f04699294412b1e5760 (commit)
       via  92bffeee8f13ce3c76d8ec3a3ede20be42d92749 (commit)
       via  9e99fb3a3ca4c99625a37e5c93963e930431ca1d (commit)
       via  401cb3c1de764c118d1e3672eca3d567f48f1450 (commit)
       via  d52a0476345f40b4e16183e7bd94beb99600cf44 (commit)
       via  de3f7e3f66ed82e1f6f4cdf36784521e00e9f8e6 (commit)
       via  0dd3fe3efff0a5861e5c5af9a96828a8a3b004e9 (commit)
       via  0289f78d2b73f0a394214e1441499bcb421d7bf1 (commit)
       via  eef8ec8e66f185cc9a066f966430b8e18bc49ad0 (commit)
       via  11c8ab302507485172ab9cc25b920182b48ea71e (commit)
       via  8c9af0750bf5b90ce00dfd49306b13f069a12333 (commit)
       via  09e7df2d59f045a0cb44fa7a9bce383f041bd4fb (commit)
       via  b312e74fc4c1857e424f8563a461e973008cab62 (commit)
       via  74918d3ef6bc4c1c66df369b435c6e421fb81cf3 (commit)
       via  2a3009cc7e0eceba4d09523c13d2130a781c649d (commit)
       via  11bef52f9b3df13eb8d089a278d0a1f6624bd9a5 (commit)
       via  5b48bdbdd0a64f87520e645af916ec07c9f1f6b7 (commit)
       via  acf8203be2065ac84c8e314cfdf1975b2ee29695 (commit)
       via  834b7be02f447f460c42e21417c63a4fb3d7cf82 (commit)
       via  0d5a9ff74a7fd2fbd9cd11f612188e7e88a86de9 (commit)
       via  bd32365ab5a8414e626387402800fe3a5964cca7 (commit)
       via  a20cdada3d11eead7c25ba3e66a147f706bf46e6 (commit)
       via  f8304073a6ebf9fa0db393045363c90fbb9e3dda (commit)
       via  5c0475100a1e8d21ab53e47de18dcb61829a4d56 (commit)
       via  f8748fa77faf50e37efe141b592ef87d6bb8fdc1 (commit)
       via  b41df896f40d732440d3f0ee2467abcf6d14632d (commit)
       via  f0efbc1745abf07435a4e462bbae1e262ff60776 (commit)
       via  4225386a9b1ee643a9ac2a66a82875748003a942 (commit)
      from  0e40c042cf32db6a92ab73a8db0803e17c0e3fa7 (commit)
- Log -----------------------------------------------------------------
commit 064e875f10b0244a15da56c4ca590d516c51f6b6
Merge: 50bc50ecdf924b441756c440195f9d5d8dcfd643 a22c528ad40cc20924ec789ace883d29193f4761
Author: Michal Čihař michal@cihar.com
Date:   Mon May 9 07:43:00 2011 +0200
Merge branch 'QA_3_4'
commit 50bc50ecdf924b441756c440195f9d5d8dcfd643
Merge: 92bffeee8f13ce3c76d8ec3a3ede20be42d92749 0e40c042cf32db6a92ab73a8db0803e17c0e3fa7
Author: Pootle server pootle@cihar.com
Date:   Sat May 7 18:40:12 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 92bffeee8f13ce3c76d8ec3a3ede20be42d92749
Merge: 9e99fb3a3ca4c99625a37e5c93963e930431ca1d e2ffec079236176eeb56cbaeeb3e1984612d48bc
Author: Pootle server pootle@cihar.com
Date:   Sat May 7 16:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 9e99fb3a3ca4c99625a37e5c93963e930431ca1d
Merge: 401cb3c1de764c118d1e3672eca3d567f48f1450 fd1ac3cdac0a302ace44c966337822d7589a129c
Author: Pootle server pootle@cihar.com
Date:   Fri May 6 12:40:11 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 401cb3c1de764c118d1e3672eca3d567f48f1450
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 11:29:45 2011 +0200
Translation update done using Pootle.
commit d52a0476345f40b4e16183e7bd94beb99600cf44
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 11:12:46 2011 +0200
Translation update done using Pootle.
commit de3f7e3f66ed82e1f6f4cdf36784521e00e9f8e6
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 11:07:46 2011 +0200
Translation update done using Pootle.
commit 0dd3fe3efff0a5861e5c5af9a96828a8a3b004e9
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 11:06:26 2011 +0200
Translation update done using Pootle.
commit 0289f78d2b73f0a394214e1441499bcb421d7bf1
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 11:03:39 2011 +0200
Translation update done using Pootle.
commit eef8ec8e66f185cc9a066f966430b8e18bc49ad0
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 11:03:02 2011 +0200
Translation update done using Pootle.
commit 11c8ab302507485172ab9cc25b920182b48ea71e
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:58:31 2011 +0200
Translation update done using Pootle.
commit 8c9af0750bf5b90ce00dfd49306b13f069a12333
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:54:37 2011 +0200
Translation update done using Pootle.
commit 09e7df2d59f045a0cb44fa7a9bce383f041bd4fb
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:49:14 2011 +0200
Translation update done using Pootle.
commit b312e74fc4c1857e424f8563a461e973008cab62
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:37:44 2011 +0200
Translation update done using Pootle.
commit 74918d3ef6bc4c1c66df369b435c6e421fb81cf3
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:23:52 2011 +0200
Translation update done using Pootle.
commit 2a3009cc7e0eceba4d09523c13d2130a781c649d
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:23:20 2011 +0200
Translation update done using Pootle.
commit 11bef52f9b3df13eb8d089a278d0a1f6624bd9a5
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:22:29 2011 +0200
Translation update done using Pootle.
commit 5b48bdbdd0a64f87520e645af916ec07c9f1f6b7
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:21:38 2011 +0200
Translation update done using Pootle.
commit acf8203be2065ac84c8e314cfdf1975b2ee29695
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:21:04 2011 +0200
Translation update done using Pootle.
commit 834b7be02f447f460c42e21417c63a4fb3d7cf82
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:20:33 2011 +0200
Translation update done using Pootle.
commit 0d5a9ff74a7fd2fbd9cd11f612188e7e88a86de9
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:20:05 2011 +0200
Translation update done using Pootle.
commit bd32365ab5a8414e626387402800fe3a5964cca7
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:19:41 2011 +0200
Translation update done using Pootle.
commit a20cdada3d11eead7c25ba3e66a147f706bf46e6
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri May 6 10:19:09 2011 +0200
Translation update done using Pootle.
commit f8304073a6ebf9fa0db393045363c90fbb9e3dda
Author: manojonemail manojonemail@gmail.com
Date:   Fri May 6 09:13:06 2011 +0200
Translation update done using Pootle.
commit 5c0475100a1e8d21ab53e47de18dcb61829a4d56
Author: shanyan baishui Siramizu@gmail.com
Date:   Fri May 6 03:13:18 2011 +0200
Translation update done using Pootle.
commit f8748fa77faf50e37efe141b592ef87d6bb8fdc1
Author: shanyan baishui Siramizu@gmail.com
Date:   Fri May 6 03:12:52 2011 +0200
Translation update done using Pootle.
commit b41df896f40d732440d3f0ee2467abcf6d14632d
Author: gergo314 gergo314@gmail.com
Date:   Thu May 5 21:26:41 2011 +0200
Translation update done using Pootle.
commit f0efbc1745abf07435a4e462bbae1e262ff60776
Author: gergo314 gergo314@gmail.com
Date:   Thu May 5 21:26:32 2011 +0200
Translation update done using Pootle.
commit 4225386a9b1ee643a9ac2a66a82875748003a942
Author: gergo314 gergo314@gmail.com
Date:   Thu May 5 21:25:44 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/hi.po    |    6 +++---
 po/hu.po    |   10 ++++------
 po/ja.po    |   55 ++++++++++++++++++++++++++-----------------------------
 po/zh_CN.po |    6 +++---
 4 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/po/hi.po b/po/hi.po
index de4315d..eb36b84 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-05 13:15+0200\n"
-"PO-Revision-Date: 2011-04-24 00:23+0200\n"
-"Last-Translator:  rsedwardian@gmail.com\n"
+"PO-Revision-Date: 2011-05-06 09:13+0200\n"
+"Last-Translator:  manojonemail@gmail.com\n"
 "Language-Team: hindi hi@li.org\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ 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 "ब्लोब स्ट्रीमिंग सर्वर संरचना उपस्थित नहीं है !"
#: bs_disp_as_mime_type.php:35
 msgid "Failed to fetch headers"
diff --git a/po/hu.po b/po/hu.po
index 8f00935..2c45dd9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-05 13:15+0200\n"
-"PO-Revision-Date: 2011-05-05 12:49+0200\n"
+"PO-Revision-Date: 2011-05-05 21:26+0200\n"
 "Last-Translator:  gergo314@gmail.com\n"
 "Language-Team: hungarian hu@li.org\n"
 "Language: hu\n"
@@ -1984,7 +1984,7 @@ msgstr "SQL érvényesítése"
#: libraries/common.lib.php:1265
 msgid "Inline edit of this query"
-msgstr ""
+msgstr "lekérdezés inline szerkesztése"
#: libraries/common.lib.php:1267
 #, fuzzy
@@ -2517,10 +2517,9 @@ msgstr ""
 "esetén"
#: libraries/config/messages.inc.php:65
-#, fuzzy
 #| msgid "Ignore errors"
 msgid "Iconic errors"
-msgstr "A hibák figyelmen kívül hagyása"
+msgstr "Ikonnal kapcsolatos hibák"
#: libraries/config/messages.inc.php:66
 msgid ""
@@ -2599,10 +2598,9 @@ msgid "Lines terminated by"
 msgstr "Sorok vége"
#: libraries/config/messages.inc.php:80
-#, fuzzy
 #| msgid "Excel edition"
 msgid "Excel edition"
-msgstr "Excel szerkesztés"
+msgstr "Excel változat"
#: libraries/config/messages.inc.php:83
 msgid "Database name template"
diff --git a/po/ja.po b/po/ja.po
index 51fe00b..f0c4aed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-05 13:15+0200\n"
-"PO-Revision-Date: 2011-05-05 11:38+0200\n"
+"PO-Revision-Date: 2011-05-06 11:29+0200\n"
 "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n"
 "Language-Team: japanese jp@li.org\n"
 "Language: ja\n"
@@ -111,7 +111,7 @@ msgstr "リモート URL を開けませんでした。"
 msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
-msgstr ""
+msgstr "ファイル %s は、このシステムでは使用できません。詳細については www.phpmyadmin.net をご覧ください。"
#: db_create.php:58
 #, php-format
@@ -532,10 +532,10 @@ msgid "Browse"
 msgstr "表示"
#: db_search.php:259
-#, fuzzy, php-format
+#, php-format
 #| msgid "Dumping data for table"
 msgid "Delete the matches for the %s table?"
-msgstr "テーブルのデータをダンプしています"
+msgstr "テーブル %s に対して条件に一致したものを削除しますか？"
#: db_search.php:259 libraries/display_tbl.lib.php:1223
 #: libraries/display_tbl.lib.php:2153
@@ -3444,7 +3444,7 @@ msgstr ""
#: libraries/config/messages.inc.php:328
 msgid "Missing phpMyAdmin configuration storage tables"
-msgstr "phpMyAdmin の設定保存用テーブルがありません"
+msgstr "phpMyAdmin の設定保存用テーブルが不明"
#: libraries/config/messages.inc.php:330
 msgid "Iconic table operations"
@@ -5094,7 +5094,7 @@ msgstr "ポート"
 msgid ""
 "The port for the PBMS stream-based communications. Setting this value to 0 "
 "will disable HTTP communication with the daemon."
-msgstr ""
+msgstr "PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモンとの HTTP 通信を無効にします。"
#: libraries/engines/pbms.lib.php:40
 msgid "Repository Threshold"
@@ -5165,21 +5165,20 @@ msgstr ""
 msgid ""
 "Documentation and further information about PBMS can be found on %sThe "
 "PrimeBase Media Streaming home page%s."
-msgstr ""
+msgstr "PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オフィシャルサイト%sにあります。"
#: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
-#, fuzzy
 #| msgid "Relations"
 msgid "Related Links"
-msgstr "リレーション"
+msgstr "関連リンク"
#: libraries/engines/pbms.lib.php:98
 msgid "The PrimeBase Media Streaming Blog by Barry Leslie"
-msgstr ""
+msgstr "Barry Leslie 氏による PrimeBase Media Streaming ブログ"
#: libraries/engines/pbms.lib.php:99
 msgid "PrimeBase XT Home Page"
-msgstr ""
+msgstr "PrimeBase XT オフィシャルサイト"
#: libraries/engines/pbxt.lib.php:22
 msgid "Index cache size"
@@ -5333,15 +5332,15 @@ msgstr ""
 msgid ""
 "Documentation and further information about PBXT can be found on the "
 "%sPrimeBase XT Home Page%s."
-msgstr ""
+msgstr "PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイト%sにあります。"
#: libraries/engines/pbxt.lib.php:129
 msgid "The PrimeBase XT Blog by Paul McCullagh"
-msgstr ""
+msgstr "Paul McCullagh 氏による PrimeBase XT ブログ"
#: libraries/engines/pbxt.lib.php:130
 msgid "The PrimeBase Media Streaming (PBMS) home page"
-msgstr ""
+msgstr "PrimeBase Media Streaming (PBMS) オフィシャルサイト"
#: libraries/export/csv.php:21 libraries/import/csv.php:27
 msgid "Columns separated with:"
@@ -6788,9 +6787,7 @@ msgstr "設定を保存しました"
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
 "permanently requires %sphpMyAdmin configuration storage%s."
-msgstr ""
-"環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするに"
-"は、%sphpMyAdminの設定保存場所%sが必要です。"
+msgstr "環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするには、%sphpMyAdmin の設定保存場所%sが必要です。"
#: libraries/user_preferences.lib.php:142
 msgid "Could not save configuration"
@@ -7110,10 +7107,9 @@ msgid "Operator"
 msgstr "演算子"
#: pmd_general.php:810
-#, fuzzy
 #| msgid "Table options"
 msgid "Active options"
-msgstr "テーブルオプション"
+msgstr "アクティブオプション"
#: pmd_help.php:26
 msgid "To select relation, click :"
@@ -9032,7 +9028,7 @@ msgstr "フォームを表示する"
 #: setup/lib/index.lib.php:119
 msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
-msgstr ""
+msgstr "URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。"
#: setup/lib/index.lib.php:126
 msgid ""
@@ -9071,6 +9067,10 @@ msgid ""
 "proxies list%s. However, IP-based protection may not be reliable if your IP "
 "belongs to an ISP where thousands of users, including you, are connected to."
 msgstr ""
+"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL "
+"サーバへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになります。これが必要と思われる場合には、%s信頼されたプロキシリスト%"
+"sを使用します。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP "
+"アドレスを基にした保護は信頼性が高いとはいえません。"
#: setup/lib/index.lib.php:252
 msgid ""
@@ -9153,11 +9153,9 @@ msgid ""
 "protection may not be reliable if your IP belongs to an ISP where thousands "
 "of users, including you, are connected to."
 msgstr ""
-"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定"
-"（%sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してくださ"
-"い。しかしながら、ユーザが数千人もいるような ISP に所属している、使用してい"
-"る、接続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえま"
-"せん。"
+"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定（%sホスト認証%s設定および%s信頼されたプロキシのリスト"
+"%s）を使用してください。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP "
+"アドレスを基にした保護は信頼性が高いとはいえません。"
#: setup/lib/index.lib.php:268
 #, php-format
@@ -9216,7 +9214,7 @@ msgstr "参照されている値を表示する"
 #: sql.php:163
 #, php-format
 msgid "Using bookmark "%s" as default browse query."
-msgstr ""
+msgstr "デフォルトの表示クエリとしてブックマーク "%s" を使用する。"
#: sql.php:600 tbl_replace.php:387
 #, php-format
@@ -9396,7 +9394,7 @@ msgstr ""
 #: tbl_chart.php:166
 msgid ""
 "When drawing a radar chart all values are normalized to a range [0..10]."
-msgstr ""
+msgstr "レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。"
#: tbl_chart.php:173
 msgid ""
@@ -9712,10 +9710,9 @@ msgid "An index has been added on %s"
 msgstr "%s にインデックスを追加しました"
#: tbl_structure.php:471
-#, fuzzy
 #| msgid "Show PHP information"
 msgid "Show more actions"
-msgstr "PHP 情報"
+msgstr "他の操作を表示する"
#: tbl_structure.php:600 tbl_structure.php:602
 msgid "Relation view"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fd6a636..80a2efe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-05 13:15+0200\n"
-"PO-Revision-Date: 2011-03-04 09:47+0200\n"
+"PO-Revision-Date: 2011-05-06 03:13+0200\n"
 "Last-Translator: shanyan baishui Siramizu@gmail.com\n"
 "Language-Team: chinese_simplified zh_CN@li.org\n"
 "Language: zh_CN\n"
@@ -3123,7 +3123,7 @@ msgstr "树状数据库分隔符"
 msgid ""
 "Only light version; display databases in a tree (determined by the separator "
 "defined below)"
-msgstr "只使用轻量级版本，以树形显示数据库 (以下面的树形分隔符来显示)"
+msgstr "只使用简洁版，以树形显示数据库 (以下面的树形分隔符来显示)"
#: libraries/config/messages.inc.php:273
 msgid "Display databases in a tree"
@@ -3135,7 +3135,7 @@ msgstr "如果想一次性浏览所有数据库，则禁用该选项"
#: libraries/config/messages.inc.php:275
 msgid "Use light version"
-msgstr "使用轻量级版本"
+msgstr "使用简洁版"
#: libraries/config/messages.inc.php:276
 msgid "Maximum table tree depth"
hooks/post-receive
-- 
phpMyAdmin


    