[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-247-gc44b2fa

Michal Čihař nijel at users.sourceforge.net
Fri Apr 29 10:41:30 CEST 2011


The branch, master has been updated
       via  c44b2faaf42f0281b3fde0a813cc4c37ea945192 (commit)
       via  06698e02ec4e245d3929f97370bb3cb8cbf4a3c2 (commit)
       via  bea96cd9161e6d6c9e1976be0dc3b3af76add913 (commit)
       via  48bd6c7de652bab5c9af4a5a100e0ecbbaa5aea7 (commit)
       via  5d69b9d735cd1e0a1689b7e799bcd6c5b19f3386 (commit)
       via  4226ff41c03411fe2eb174b65ca1c0620274879f (commit)
       via  ef529718fd6bece8cc97c3ed6c4005596def9d9e (commit)
       via  3f7f261eeedd104c5d61b4992f4f9418f07e8cbf (commit)
       via  bfc9911e0b20f174755d013d6e7eb6e1efc2c579 (commit)
       via  bc4029b84fea3da7bbf888b5bc20a8bbb21b4bbb (commit)
       via  20891da8e51b51c85339fc698e7e695e766112a4 (commit)
       via  7de94e3099188ca9482222e0fde34e6da7c88e61 (commit)
       via  da014f5bd84164ffeb05b6d318dfdb008764e299 (commit)
       via  676124662ddf668bc8b2c6be5511021e90055500 (commit)
       via  f024404e0b9d0b47633e949d76638963d417f84f (commit)
       via  2c6728cb6bd2de730c0aa87a7e1335a19d32d3a9 (commit)
       via  825f45111213fd5286c3c9643f145a2dc3aad4a2 (commit)
       via  80210b4228268544c1cc85c869571cd16e84a877 (commit)
       via  da81027f012bee3e220d7725259956a008926764 (commit)
       via  bb6095d1155b92b521f7744d81b48f141bb8f3a7 (commit)
       via  2e0c391c245dc1a81b0fcd84ae3d0a55308a77f3 (commit)
      from  79934bb075aada44a1c976db479be613a6240803 (commit)


- Log -----------------------------------------------------------------
commit c44b2faaf42f0281b3fde0a813cc4c37ea945192
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:36:30 2011 +0200

    Translation update done using Pootle.

commit 06698e02ec4e245d3929f97370bb3cb8cbf4a3c2
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:34:34 2011 +0200

    Translation update done using Pootle.

commit bea96cd9161e6d6c9e1976be0dc3b3af76add913
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:34:18 2011 +0200

    Translation update done using Pootle.

commit 48bd6c7de652bab5c9af4a5a100e0ecbbaa5aea7
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:33:50 2011 +0200

    Translation update done using Pootle.

commit 5d69b9d735cd1e0a1689b7e799bcd6c5b19f3386
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:33:40 2011 +0200

    Translation update done using Pootle.

commit 4226ff41c03411fe2eb174b65ca1c0620274879f
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:32:44 2011 +0200

    Translation update done using Pootle.

commit ef529718fd6bece8cc97c3ed6c4005596def9d9e
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:32:29 2011 +0200

    Translation update done using Pootle.

commit 3f7f261eeedd104c5d61b4992f4f9418f07e8cbf
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:32:08 2011 +0200

    Translation update done using Pootle.

commit bfc9911e0b20f174755d013d6e7eb6e1efc2c579
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:31:48 2011 +0200

    Translation update done using Pootle.

commit bc4029b84fea3da7bbf888b5bc20a8bbb21b4bbb
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:31:07 2011 +0200

    Translation update done using Pootle.

commit 20891da8e51b51c85339fc698e7e695e766112a4
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:29:16 2011 +0200

    Translation update done using Pootle.

commit 7de94e3099188ca9482222e0fde34e6da7c88e61
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:28:36 2011 +0200

    Translation update done using Pootle.

commit da014f5bd84164ffeb05b6d318dfdb008764e299
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:27:13 2011 +0200

    Translation update done using Pootle.

commit 676124662ddf668bc8b2c6be5511021e90055500
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:26:21 2011 +0200

    Translation update done using Pootle.

commit f024404e0b9d0b47633e949d76638963d417f84f
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:26:08 2011 +0200

    Translation update done using Pootle.

commit 2c6728cb6bd2de730c0aa87a7e1335a19d32d3a9
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:25:10 2011 +0200

    Translation update done using Pootle.

commit 825f45111213fd5286c3c9643f145a2dc3aad4a2
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:24:47 2011 +0200

    Translation update done using Pootle.

commit 80210b4228268544c1cc85c869571cd16e84a877
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:24:19 2011 +0200

    Translation update done using Pootle.

commit da81027f012bee3e220d7725259956a008926764
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:23:53 2011 +0200

    Translation update done using Pootle.

commit bb6095d1155b92b521f7744d81b48f141bb8f3a7
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:23:25 2011 +0200

    Translation update done using Pootle.

commit 2e0c391c245dc1a81b0fcd84ae3d0a55308a77f3
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Fri Apr 29 10:22:52 2011 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/ja.po |   52 ++++++++++++++++++++++++++++------------------------
 1 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 22a8896..765a842 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-04-21 14:27+0200\n"
-"PO-Revision-Date: 2011-04-28 12:14+0200\n"
+"PO-Revision-Date: 2011-04-29 10:36+0200\n"
 "Last-Translator: Yuichiro <yuichiro at pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp at li.org>\n"
 "Language: ja\n"
@@ -660,7 +660,7 @@ msgstr "すべてのチェックを外す"
 
 #: db_structure.php:495
 msgid "Check tables having overhead"
-msgstr "オーバーヘッドのあるテーブルを確認してください"
+msgstr "オーバーヘッドのあるテーブルを確認する"
 
 #: db_structure.php:503 libraries/config/messages.inc.php:161
 #: libraries/db_links.inc.php:56 libraries/display_tbl.lib.php:2153
@@ -3090,7 +3090,7 @@ msgstr "空の行はインポートしない"
 
 #: libraries/config/messages.inc.php:253
 msgid "Import currencies ($5.00 to 5.00)"
-msgstr "金額は単位を取り除く(例えば $5.00 を 5.00)"
+msgstr "金額は単位を取り除く(例えば、$5.00 を 5.00)"
 
 #: libraries/config/messages.inc.php:254
 msgid "Import percentages as proper decimals (12.00% to .12)"
@@ -3107,7 +3107,7 @@ msgstr "部分インポート(クエリのスキップ)"
 
 #: libraries/config/messages.inc.php:258
 msgid "Do not use AUTO_INCREMENT for zero values"
-msgstr "値がゼロのものに対してAUTO_INCREMENTを使用しない"
+msgstr "値がゼロのものに対して AUTO_INCREMENT を使用しない"
 
 #: libraries/config/messages.inc.php:261
 msgid "Initial state for sliders"
@@ -3291,7 +3291,7 @@ msgstr "SQL クエリが表示されているときに使用される文字の
 
 #: libraries/config/messages.inc.php:301
 msgid "Maximum displayed SQL length"
-msgstr "表示できるSQL文の最大の長さ"
+msgstr "表示できる SQL 文の最大の長さ"
 
 #: libraries/config/messages.inc.php:302 libraries/config/messages.inc.php:307
 #: libraries/config/messages.inc.php:335
@@ -5497,8 +5497,8 @@ msgid ""
 "Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and "
 "reloaded between servers in different time zones)</i>"
 msgstr ""
-"TIMESTAMP "
-"のカラムをUTC(協定世界時)でダンプする<i>(ダンプするサーバと読み込ませるサーバのタイムゾーンが異なる場合に有効です。)</i>"
+"TIMESTAMP のカラムを "
+"UTC(協定世界時)でダンプする<i>(ダンプするサーバと読み込ませるサーバのタイムゾーンが異なる場合に有効です。)</i>"
 
 #: libraries/export/sql.php:209 libraries/export/xml.php:34
 msgid "Procedures"
@@ -5672,7 +5672,7 @@ msgstr "パーセントは適切な小数に変換する<i>(例えば、12.00%
 
 #: libraries/import/ods.php:29
 msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
-msgstr "金額は単位を取り除く<i>(例えば $5.00 を 5.00)</i>"
+msgstr "金額は単位を取り除く<i>(例えば、$5.00 を 5.00)</i>"
 
 #: libraries/import/sql.php:32
 msgid "SQL compatibility mode:"
@@ -5680,7 +5680,7 @@ msgstr "SQL互換モード:"
 
 #: libraries/import/sql.php:42
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
-msgstr "値がゼロのものに対して<code>AUTO_INCREMENT</code>を使用しない"
+msgstr "値がゼロのものに対して <code>AUTO_INCREMENT</code> を使用しない"
 
 #: libraries/import/xml.php:74 libraries/import/xml.php:130
 msgid ""
@@ -6296,7 +6296,7 @@ msgstr "リモートサーバ"
 
 #: libraries/server_synchronize.lib.php:1344
 msgid "Difference"
-msgstr ""
+msgstr "差分"
 
 #: libraries/server_synchronize.lib.php:1360 server_synchronize.php:1117
 msgid "Target database"
@@ -8679,11 +8679,11 @@ msgstr "レプリケーションステータス"
 
 #: server_synchronize.php:92
 msgid "Could not connect to the source"
-msgstr ""
+msgstr "元のデータベースに接続できませんでした。"
 
 #: server_synchronize.php:95
 msgid "Could not connect to the target"
-msgstr ""
+msgstr "対象先のデータベースに接続できませんでした。"
 
 #: server_synchronize.php:120 server_synchronize.php:123 tbl_create.php:76
 #: tbl_get_field.php:19
@@ -8705,11 +8705,11 @@ msgstr ""
 
 #: server_synchronize.php:423 server_synchronize.php:866
 msgid "Structure Difference"
-msgstr ""
+msgstr "構造の差分"
 
 #: server_synchronize.php:424 server_synchronize.php:867
 msgid "Data Difference"
-msgstr ""
+msgstr "データの差分"
 
 #: server_synchronize.php:429 server_synchronize.php:872
 msgid "Add column(s)"
@@ -8753,19 +8753,19 @@ msgstr "データベースの同期"
 
 #: server_synchronize.php:463
 msgid "Selected target tables have been synchronized with source tables."
-msgstr ""
+msgstr "選択された対象先のテーブルは、元のテーブルと同期されています。"
 
 #: server_synchronize.php:941
 msgid "Target database has been synchronized with source database"
-msgstr ""
+msgstr "対象先のデータベースが、元のデータベースと同期されています。"
 
 #: server_synchronize.php:1002
 msgid "The following queries have been executed:"
-msgstr ""
+msgstr "次のクエリが実行されます:"
 
 #: server_synchronize.php:1130
 msgid "Enter manually"
-msgstr ""
+msgstr "手動で入力する"
 
 #: server_synchronize.php:1138
 #| msgid "max. concurrent connections"
@@ -8816,10 +8816,9 @@ msgid ""
 "level directory as described in [a at Documentation.html#setup_script]"
 "documentation[/a]. Otherwise you will be only able to download or display it."
 msgstr ""
-"[a at ../Documentation.html#setup_script]ドキュメント[/a]で説明されるように"
-"phpMyAdminのトップレベルディレクトリにウェブサーバで書き込める[em]config[/em]"
-"フォルダを作成してください。そうしない場合は、ダウンロードするか表示するかの"
-"みになります。"
+"[a at ../Documentation.html#setup_script]ドキュメント[/a]で説明されるように phpMyAdmin "
+"のトップレベルディレクトリにウェブサーバで書き込める [em]config[/em] "
+"フォルダを作成してください。そうしない場合は、ダウンロードするか表示するかのみになります。"
 
 #: setup/frames/index.inc.php:57
 msgid ""
@@ -8864,7 +8863,7 @@ msgstr "デフォルト言語"
 
 #: setup/frames/index.inc.php:183
 msgid "let the user choose"
-msgstr ""
+msgstr "ユーザに選択させる"
 
 #: setup/frames/index.inc.php:194
 msgid "- none -"
@@ -8967,6 +8966,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 認証が有効にされましたので、パスフレーズを自動的に生成しました。パスフレーズはクッキーを暗号化"
+"するために使用されますが、管理者がそれを覚えておく必要はありません。"
 
 #: setup/lib/index.lib.php:253
 #, php-format
@@ -9028,6 +9029,9 @@ msgid ""
 "protection may not be reliable if your IP belongs to an ISP where thousands "
 "of users, including you, are connected to."
 msgstr ""
+"これが必要であると思われる場合、追加の保護設定(%sホスト認証%s設定および%s信頼されたプロキシのリスト%"
+"s)を使用してください。しかしながら、ユーザー数千人もいるような ISP に所属している、使用している、接続されている場合には、IP "
+"アドレスを基にした保護は信頼性が高いとはいえません。"
 
 #: setup/lib/index.lib.php:268
 #, php-format
@@ -9063,7 +9067,7 @@ msgstr "パフォーマンス上の理由から mysqli の使用する必要が
 
 #: setup/lib/index.lib.php:331
 msgid "You allow for connecting to the server without a password."
-msgstr ""
+msgstr "パスワードなしでサーバへの接続が許されています。"
 
 #: setup/lib/index.lib.php:351
 msgid "Key is too short, it should have at least 8 characters."


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list