[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4767-g6286494 - Git

22 Jun 2011

The branch, master has been updated
       via  6286494b91e9ef291db697715b6ae4f96146b7a1 (commit)
       via  2c75df36168154268f17836cd1e5731bb0ea256b (commit)
       via  c16bb47bb100b10b1c69c2b68409e6bd5d877148 (commit)
       via  c61fc2be84d093d22bda2e4418b482bcad238c17 (commit)
       via  5c73e476c8b2a0fed9b465544a749b4641fc3f64 (commit)
       via  8896aadb55920cf0833516e11bfc4251b131ebf6 (commit)
       via  4ffb2cc323d4e726ba2ac8985a7c9724ef7f3a42 (commit)
       via  b4a63b224ab46fb7c9ab6ea7e4045b9b5dd8ad71 (commit)
       via  c93594628416432dc3227a06e6850f178ff4464a (commit)
       via  b6a5c99b2b8990b277073e0c0a36e40a695da4f7 (commit)
       via  c0b4d3b983d36fd1b7811310e08931d7d013dedd (commit)
       via  bd8d8487bc18a1661b310806b89e503ed523bdbc (commit)
       via  1044574de9d61dc2a2ae0827da62a860e3325869 (commit)
       via  1c269941e0d456af3ec98a22969b58ad58e84687 (commit)
       via  dc2116ed7fb3d7d90da2087c5e76e0cb2aa1121b (commit)
       via  8189fdc7f6236774ce7613e3ed3f065d23665567 (commit)
       via  97b956e03c13e4f3bbea126636644571b2a89e36 (commit)
       via  9870c3e5e1df34bb5a31f860968ca8afb484c0c3 (commit)
       via  c3c1c746d5debdd89fa852e5e01171d9b6cc5850 (commit)
       via  ba120c7e406a161f1653831d831e1754ee7d5d11 (commit)
       via  e4647c88b435639eb49d42f3dfada4890ff9752c (commit)
       via  07308bf836a2088cd0577f24d926fb25d17459da (commit)
       via  3b39cad6fad00ecf3b844362d862b6745dca6fba (commit)
       via  6c4b57905b492b5dfdf476cdb8b01d2b1b142ca9 (commit)
       via  3f187c88ac558a419ff81ff8faa4fdb1661b9c00 (commit)
       via  07567716f4434c9c0da902e1aae7889214ce5554 (commit)
       via  c889d2eb177410d5df50ad5785bcb2e91cd2f815 (commit)
       via  fb018efebc420598734620de7c006470a8614420 (commit)
       via  2052e19ed840859761cd1266c83a3b8f40e829af (commit)
      from  60dad887b00398be8821196b8c397ec06a21082d (commit)
- Log -----------------------------------------------------------------
commit 6286494b91e9ef291db697715b6ae4f96146b7a1
Merge: 60dad887b00398be8821196b8c397ec06a21082d 2c75df36168154268f17836cd1e5731bb0ea256b
Author: Michal Čihař mcihar@suse.cz
Date:   Wed Jun 22 13:24:13 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit 2c75df36168154268f17836cd1e5731bb0ea256b
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 12:41:30 2011 +0200
Translation update done using Pootle.
commit c16bb47bb100b10b1c69c2b68409e6bd5d877148
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 12:33:43 2011 +0200
Translation update done using Pootle.
commit c61fc2be84d093d22bda2e4418b482bcad238c17
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 12:31:42 2011 +0200
Translation update done using Pootle.
commit 5c73e476c8b2a0fed9b465544a749b4641fc3f64
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 12:13:01 2011 +0200
Translation update done using Pootle.
commit 8896aadb55920cf0833516e11bfc4251b131ebf6
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 12:02:16 2011 +0200
Translation update done using Pootle.
commit 4ffb2cc323d4e726ba2ac8985a7c9724ef7f3a42
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:59:26 2011 +0200
Translation update done using Pootle.
commit b4a63b224ab46fb7c9ab6ea7e4045b9b5dd8ad71
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:57:54 2011 +0200
Translation update done using Pootle.
commit c93594628416432dc3227a06e6850f178ff4464a
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:56:53 2011 +0200
Translation update done using Pootle.
commit b6a5c99b2b8990b277073e0c0a36e40a695da4f7
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:52:20 2011 +0200
Translation update done using Pootle.
commit c0b4d3b983d36fd1b7811310e08931d7d013dedd
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:49:39 2011 +0200
Translation update done using Pootle.
commit bd8d8487bc18a1661b310806b89e503ed523bdbc
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:47:35 2011 +0200
Translation update done using Pootle.
commit 1044574de9d61dc2a2ae0827da62a860e3325869
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:46:27 2011 +0200
Translation update done using Pootle.
commit 1c269941e0d456af3ec98a22969b58ad58e84687
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:42:42 2011 +0200
Translation update done using Pootle.
commit dc2116ed7fb3d7d90da2087c5e76e0cb2aa1121b
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:35:44 2011 +0200
Translation update done using Pootle.
commit 8189fdc7f6236774ce7613e3ed3f065d23665567
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:28:36 2011 +0200
Translation update done using Pootle.
commit 97b956e03c13e4f3bbea126636644571b2a89e36
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:28:27 2011 +0200
Translation update done using Pootle.
commit 9870c3e5e1df34bb5a31f860968ca8afb484c0c3
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:27:54 2011 +0200
Translation update done using Pootle.
commit c3c1c746d5debdd89fa852e5e01171d9b6cc5850
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:26:26 2011 +0200
Translation update done using Pootle.
commit ba120c7e406a161f1653831d831e1754ee7d5d11
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:25:52 2011 +0200
Translation update done using Pootle.
commit e4647c88b435639eb49d42f3dfada4890ff9752c
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:25:03 2011 +0200
Translation update done using Pootle.
commit 07308bf836a2088cd0577f24d926fb25d17459da
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:24:28 2011 +0200
Translation update done using Pootle.
commit 3b39cad6fad00ecf3b844362d862b6745dca6fba
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:23:44 2011 +0200
Translation update done using Pootle.
commit 6c4b57905b492b5dfdf476cdb8b01d2b1b142ca9
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:23:10 2011 +0200
Translation update done using Pootle.
commit 3f187c88ac558a419ff81ff8faa4fdb1661b9c00
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:22:07 2011 +0200
Translation update done using Pootle.
commit 07567716f4434c9c0da902e1aae7889214ce5554
Merge: c889d2eb177410d5df50ad5785bcb2e91cd2f815 8c6e88002232949f539b989b73cb97a6e5ff3eca
Author: Pootle server pootle@cihar.com
Date:   Wed Jun 22 11:21:58 2011 +0200
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit c889d2eb177410d5df50ad5785bcb2e91cd2f815
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:20:43 2011 +0200
Translation update done using Pootle.
commit fb018efebc420598734620de7c006470a8614420
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:19:57 2011 +0200
Translation update done using Pootle.
commit 2052e19ed840859761cd1266c83a3b8f40e829af
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Jun 22 11:18:20 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/ja.po |   67 ++++++++++++++++++++++++++++---------------------------------
 1 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 983e7c6..649cd10 100644
--- a/po/ja.po
+++ b/po/ja.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-06-22 10:16+0200\n"
-"PO-Revision-Date: 2011-06-22 11:17+0200\n"
+"PO-Revision-Date: 2011-06-22 12:41+0200\n"
 "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n"
 "Language-Team: japanese jp@li.org\n"
 "Language: ja\n"
@@ -124,7 +124,7 @@ msgstr "データベース %1$s を作成しました。"
#: db_datadict.php:48 db_operations.php:362
 msgid "Database comment: "
-msgstr "データベースのコメント:"
+msgstr "データベースのコメント"
#: db_datadict.php:157 libraries/schema/Pdf_Relation_Schema.class.php:1210
 #: libraries/tbl_properties.inc.php:714 tbl_operations.php:362
@@ -507,7 +507,7 @@ msgstr "SQL は正常に実行されました"
 #, php-format
 msgid "%d row affected by the last statement inside the procedure"
 msgid_plural "%d rows affected by the last statement inside the procedure"
-msgstr[0] ""
+msgstr[0] "プロシージャ内の最後のステートメントは %d 行の変更を行いました"
#: db_routines.php:165
 #, php-format
@@ -573,7 +573,7 @@ msgstr "ルーチン %1$s を作成しました。"
#: db_routines.php:330
 msgid "<b>One or more errors have occured while processing your request:</b>"
-msgstr ""
+msgstr "<b>リクエストの処理中に 1 つ以上のエラーが発生しました：</b>"
#: db_routines.php:374
 msgid "Create routine"
@@ -589,6 +589,9 @@ msgid ""
 "handling multi queries. <b>The execution of some stored routines may fail!</"
 "b> Please use the improved 'mysqli' extension to avoid any problems."
 msgstr ""
+"「mysql」拡張を使用されていますが、将来的に PHP "
+"で廃止予定になっています。この拡張はマルチクエリに対応できていません。<b>ストアドルーチンの実行が失敗する可能性があります！</b> "
+"問題を回避するためには、改良された「mysqli」拡張を使用するようにしてください。"
#: db_search.php:54 libraries/auth/config.auth.lib.php:83
 #: libraries/auth/config.auth.lib.php:102
@@ -658,7 +661,6 @@ msgid "Search in database"
 msgstr "データベース内検索"
#: db_search.php:300
-#, fuzzy
 #| msgid "Word(s) or value(s) to search for (wildcard: "%"):"
 msgid "Words or values to search for (wildcard: "%"):"
 msgstr "検索する単語や値 (ワイルドカード: "%"):"
@@ -672,7 +674,6 @@ msgid "Words are separated by a space character (" ")."
 msgstr "各単語は空白文字(" ")で区切ってください"
#: db_search.php:323
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
 msgstr "検索するテーブル:"
@@ -1169,7 +1170,7 @@ msgstr "合計"
 #. l10n: Other, small valued, queries
 #: js/messages.php:72 server_status.php:602
 msgid "Other"
-msgstr ""
+msgstr "その他"
#. l10n: Thousands separator
 #: js/messages.php:74 libraries/common.lib.php:1374
@@ -1722,7 +1723,7 @@ msgstr "インデックスが定義されていません!"
 #: libraries/Index.class.php:435 libraries/build_html_for_db.lib.php:40
 #: tbl_tracking.php:309
 msgid "Indexes"
-msgstr "インデックスサイズ"
+msgstr "インデックス"
#: libraries/Index.class.php:446 libraries/tbl_properties.inc.php:503
 #: tbl_structure.php:157 tbl_structure.php:162 tbl_structure.php:606
@@ -2329,7 +2330,7 @@ msgstr "アップロードファイルがありません"
#: libraries/common.lib.php:2964 libraries/common.lib.php:2965
 msgid "Execute"
-msgstr ""
+msgstr "実行"
#: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@@ -4682,22 +4683,22 @@ msgid "The %s extension is missing. Please check your PHP configuration."
 msgstr "%s 拡張がありません。PHP の設定をチェックしてみてください。"
#: libraries/db_events.inc.php:30
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of event %s"
-msgstr "内容をエクスポートする"
+msgstr "イベント %s をエクスポートする"
#: libraries/db_events.inc.php:34
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of event "%s""
-msgstr "内容をエクスポートする"
+msgstr "イベント "%s" をエクスポートする"
#: libraries/db_events.inc.php:40
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No event with name %s found in database %s"
-msgstr "このデータベースにはテーブルがありません"
+msgstr "データベース %2$s に %1$s という名前のイベントはありません"
#: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101
 #: libraries/export/sql.php:609
@@ -4705,10 +4706,9 @@ msgid "Events"
 msgstr "イベント"
#: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no events to display."
-msgstr "アップロードファイルがありません"
+msgstr "表示できるイベントがありません"
#: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:690
 #: libraries/db_routines.lib.php:846 libraries/db_routines.lib.php:1214
@@ -4735,10 +4735,9 @@ msgid "Turn it off"
 msgstr ""
#: libraries/db_events.inc.php:141
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add a new Event"
-msgstr "新しいサーバの追加"
+msgstr "新しいイベントを追加する"
#: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
 #: libraries/db_links.inc.php:44
@@ -4792,10 +4791,9 @@ msgid "Parameters"
 msgstr "パラメータ"
#: libraries/db_routines.lib.php:689
-#, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
-msgstr "直リンク"
+msgstr "入出力"
#: libraries/db_routines.lib.php:692 libraries/tbl_properties.inc.php:105
 msgid "Length/Values"
@@ -4846,10 +4844,9 @@ msgid "Return options"
 msgstr "テーブルオプション"
#: libraries/db_routines.lib.php:745
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
-msgstr "説明"
+msgstr "定義"
#: libraries/db_routines.lib.php:749
 msgid "Is deterministic"
@@ -4886,26 +4883,26 @@ msgstr "値"
#: libraries/db_routines.lib.php:965
 msgid "You must provide a routine name"
-msgstr "ルーチン名を入力する必要があります"
+msgstr "ルーチン名は必須です"
#: libraries/db_routines.lib.php:984
 #, php-format
 msgid "Invalid direction "%s" given for parameter."
-msgstr ""
+msgstr "パラメータに対して不正な入出力「%s」が与えられています。"
#: libraries/db_routines.lib.php:995 libraries/db_routines.lib.php:1036
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
-msgstr ""
+msgstr "ルーチンパラメータが ENUM、SET、VARCHAR、VARBINARY の場合、長さ/値は必須です。"
#: libraries/db_routines.lib.php:1020
 msgid "You must provide a name and a type for each routine parameter."
-msgstr ""
+msgstr "ルーチンの各パラメータに対して、名前と種別は必須です"
#: libraries/db_routines.lib.php:1077
 msgid "You must provide a routine definition."
-msgstr ""
+msgstr "ルーチンの定義は必須です"
#: libraries/db_routines.lib.php:1209
 msgid "There are no routines to display."
@@ -5239,20 +5236,18 @@ msgid "Language"
 msgstr "言語"
#: libraries/display_tbl.lib.php:397
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Restore column order"
-msgstr "textarea の 1 行の文字数"
+msgstr "カラムの順番を元に戻す"
#: libraries/display_tbl.lib.php:411
 msgid "Drag to reorder"
-msgstr ""
+msgstr "ドラッグでカラムの入れ替え"
#: libraries/display_tbl.lib.php:412
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to sort"
-msgstr "クリックで選択"
+msgstr "クリックでソート"
#: libraries/display_tbl.lib.php:413
 msgid "Click to mark/unmark"
@@ -10238,11 +10233,11 @@ msgstr ""query by example"を実行 (ワイルドカード: "%")"
#: tbl_select.php:234
 msgid "Select columns (at least one):"
-msgstr "カラムを選択してください(最低 1 つ):"
+msgstr "カラムを選択してください (最低 1 つ)"
#: tbl_select.php:252
 msgid "Add search conditions (body of the "where" clause):"
-msgstr "検索条件("where"節の内容)を追加してください:"
+msgstr "または 検索条件 (WHERE 節の内容) を追加してください"
#: tbl_select.php:259
 msgid "Number of rows per page"
@@ -10250,7 +10245,7 @@ msgstr "ページあたりの行数"
#: tbl_select.php:265
 msgid "Display order:"
-msgstr "表示順:"
+msgstr "表示順"
#: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611
 msgid "Spatial"
hooks/post-receive
-- 
phpMyAdmin


    