[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-857-gef31fc6 - Git

22 Jan 2012

The branch, master has been updated
       via  ef31fc6fa16594d21da807c7985a2fd4b68dbf70 (commit)
       via  4477af86184e4cda32d50ef4f31cb842c36b4ffb (commit)
       via  fdbb93e351d695bc35f69134c07611a11d3b0515 (commit)
       via  063bb4fc98b54ef0120a26fd702bf36fe8390371 (commit)
       via  befb19f712559f3e510be0a1766770200e6b22dc (commit)
       via  2419d4013b463d0cf81d6f37ee1a0ceb2c108bd9 (commit)
       via  fbeb1aecedc4de5db51f6644fe0c88f2e2b5ad1e (commit)
       via  2efd9d1841e1f4f6fd8fe329801a7ce8d58a06fb (commit)
       via  aad96acb340d1b0fef2809a7872a5ab6dcade799 (commit)
       via  76410b38aaf2e93836f49002f63c52fba2c7d643 (commit)
       via  82985e11b57c7d91276eae3848726010206ec6f2 (commit)
       via  8f818e2b0388cf6df87d7198dae455375ef9017d (commit)
       via  f7ee46e45cee14f8086cab2c59a49db146170f83 (commit)
       via  e41e6a294e04c73970a27dfb33b4717c22721954 (commit)
       via  964676735c34a99c6d14dfee2e46140958cb2386 (commit)
       via  f00e64a4dcf372f1aa1511359beed8d31029ddb7 (commit)
       via  d80516c8604bbfe65ef2d1ae036655f9e14cf0b2 (commit)
       via  ddc8481080921c7f92425b492e937730d4341a27 (commit)
       via  d347eb9d2a94c8edde9a635f5d646001daa02a6c (commit)
       via  0c8bca8b515310398f3504c9ebc1436b1afe36e2 (commit)
       via  a464a86db663b3aa2fba2c76bd5d5e34bec26f93 (commit)
      from  4d69ea080dc6315bdac407f999398e5ea949e0f5 (commit)
- Log -----------------------------------------------------------------
commit ef31fc6fa16594d21da807c7985a2fd4b68dbf70
Merge: 4d69ea0 4477af8
Author: Michal Čihař michal@cihar.com
Date:   Sun Jan 22 11:51:15 2012 +0100
Merge remote-tracking branch 'pootle/master'
Conflicts:
    	po/fr.po
    	po/ja.po
    	po/tr.po
commit 4477af86184e4cda32d50ef4f31cb842c36b4ffb
Merge: fdbb93e f5ffad3
Author: Pootle server pootle@cihar.com
Date:   Sun Jan 22 08:40:19 2012 +0100
Merge remote-tracking branch 'origin/master'
commit fdbb93e351d695bc35f69134c07611a11d3b0515
Merge: 063bb4f 48b9519
Author: Pootle server pootle@cihar.com
Date:   Sat Jan 21 16:40:06 2012 +0100
Merge remote-tracking branch 'origin/master'
commit 063bb4fc98b54ef0120a26fd702bf36fe8390371
Merge: befb19f ac95cf2
Author: Pootle server pootle@cihar.com
Date:   Sat Jan 21 14:40:11 2012 +0100
Merge remote-tracking branch 'origin/master'
commit befb19f712559f3e510be0a1766770200e6b22dc
Author: Marc Delisle marc@infomarc.info
Date:   Sat Jan 21 14:02:02 2012 +0200
Translation update done using Pootle.
commit 2419d4013b463d0cf81d6f37ee1a0ceb2c108bd9
Author: Marc Delisle marc@infomarc.info
Date:   Sat Jan 21 14:01:53 2012 +0200
Translation update done using Pootle.
commit fbeb1aecedc4de5db51f6644fe0c88f2e2b5ad1e
Author: Marc Delisle marc@infomarc.info
Date:   Sat Jan 21 14:01:43 2012 +0200
Translation update done using Pootle.
commit 2efd9d1841e1f4f6fd8fe329801a7ce8d58a06fb
Author: Marc Delisle marc@infomarc.info
Date:   Sat Jan 21 14:01:29 2012 +0200
Translation update done using Pootle.
commit aad96acb340d1b0fef2809a7872a5ab6dcade799
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Sat Jan 21 12:22:05 2012 +0200
Translation update done using Pootle.
commit 76410b38aaf2e93836f49002f63c52fba2c7d643
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Sat Jan 21 12:19:28 2012 +0200
Translation update done using Pootle.
commit 82985e11b57c7d91276eae3848726010206ec6f2
Merge: 8f818e2 b3143e6
Author: Pootle server pootle@cihar.com
Date:   Fri Jan 20 10:41:32 2012 +0100
Merge remote-tracking branch 'origin/master'
commit 8f818e2b0388cf6df87d7198dae455375ef9017d
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:27:22 2012 +0200
Translation update done using Pootle.
commit f7ee46e45cee14f8086cab2c59a49db146170f83
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:27:07 2012 +0200
Translation update done using Pootle.
commit e41e6a294e04c73970a27dfb33b4717c22721954
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:26:14 2012 +0200
Translation update done using Pootle.
commit 964676735c34a99c6d14dfee2e46140958cb2386
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:25:47 2012 +0200
Translation update done using Pootle.
commit f00e64a4dcf372f1aa1511359beed8d31029ddb7
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:25:36 2012 +0200
Translation update done using Pootle.
commit d80516c8604bbfe65ef2d1ae036655f9e14cf0b2
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:24:54 2012 +0200
Translation update done using Pootle.
commit ddc8481080921c7f92425b492e937730d4341a27
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:24:24 2012 +0200
Translation update done using Pootle.
commit d347eb9d2a94c8edde9a635f5d646001daa02a6c
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:24:15 2012 +0200
Translation update done using Pootle.
commit 0c8bca8b515310398f3504c9ebc1436b1afe36e2
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:24:04 2012 +0200
Translation update done using Pootle.
commit a464a86db663b3aa2fba2c76bd5d5e34bec26f93
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Fri Jan 20 11:23:49 2012 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/fr.po |   19 +++++++++----------
 po/ja.po |   33 +++++++++++++++------------------
 po/tr.po |    8 ++++----
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 7454d3e..ac9d2f4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-01-22 04:34-0500\n"
-"PO-Revision-Date: 2012-01-15 14:19+0200\n"
+"PO-Revision-Date: 2012-01-21 14:01+0200\n"
 "Last-Translator: Marc Delisle marc@infomarc.info\n"
 "Language-Team: french fr@li.org\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.1.6\n"
@@ -5985,10 +5985,9 @@ msgid "Show BLOB contents"
 msgstr "Montrer le contenu BLOB"
#: libraries/display_tbl.lib.php:686
-#, fuzzy
 #| msgid "Browser transformation"
 msgid "Hide browser transformation"
-msgstr "Transformation"
+msgstr "Masquer les transformations"
#: libraries/display_tbl.lib.php:693
 msgid "Well Known Text"
@@ -6862,10 +6861,10 @@ msgid "Edit structure by following the "Structure" link"
 msgstr "Modifier sa structure via le lien «Structure»"
#: libraries/import.lib.php:1106
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to database"
 msgid "Go to database: %s"
-msgstr "Aller à la base de données"
+msgstr "Aller à la base de données : %s"
#: libraries/import.lib.php:1109 libraries/import.lib.php:1132
 #, php-format
@@ -6873,10 +6872,10 @@ msgid "Edit settings for %s"
 msgstr "Paramètres de modification pour %s"
#: libraries/import.lib.php:1127
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to table"
 msgid "Go to table: %s"
-msgstr "Aller à la table"
+msgstr "Aller à la table : %s"
#: libraries/import.lib.php:1130
 #, php-format
@@ -6884,10 +6883,10 @@ msgid "Structure of %s"
 msgstr "Structure de %s"
#: libraries/import.lib.php:1136
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to view"
 msgid "Go to view: %s"
-msgstr "Aller à la vue"
+msgstr "Aller à la vue : %s"
#: libraries/import/csv.php:38 libraries/import/ods.php:33
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index 0011540..ba05eb8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-01-22 04:34-0500\n"
-"PO-Revision-Date: 2012-01-12 12:02+0200\n"
+"PO-Revision-Date: 2012-01-20 11:27+0200\n"
 "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n"
 "Language-Team: japanese jp@li.org\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.1.6\n"
@@ -315,7 +315,7 @@ msgstr "コピーの前に CREATE DATABASE する"
 #: libraries/config/messages.inc.php:137 tbl_operations.php:560
 #, php-format
 msgid "Add %s"
-msgstr "%s を追加"
+msgstr "%s を追加する"
#: db_operations.php:508 libraries/config/messages.inc.php:121
 #: tbl_operations.php:318 tbl_operations.php:562
@@ -5112,7 +5112,7 @@ msgstr "送信後もクエリボックスを画面上に残しておくかどう
#: libraries/config/messages.inc.php:474 libraries/sql_query_form.lib.php:352
 msgid "Retain query box"
-msgstr "クエリボックスの保持"
+msgstr "クエリボックスを保持する"
#: libraries/config/messages.inc.php:475
 msgid "Allow to display database and table statistics (eg. space usage)"
@@ -5924,18 +5924,17 @@ 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"
-msgstr "テキスト形式"
+msgstr "空間データをテキストで表示"
#: libraries/display_tbl.lib.php:694
 msgid "Well Known Binary"
-msgstr "バイナリ形式"
+msgstr "空間データをバイナリで表示"
#: libraries/display_tbl.lib.php:1405 libraries/display_tbl.lib.php:1417
 msgid "The row has been deleted"
@@ -6775,10 +6774,10 @@ msgid "Edit structure by following the "Structure" link"
 msgstr "名前の後ろにある「構造」のリンクより構造の編集が行えます。"
#: libraries/import.lib.php:1106
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to database"
 msgid "Go to database: %s"
-msgstr "データベースに移動"
+msgstr "データベース %s に移動"
#: libraries/import.lib.php:1109 libraries/import.lib.php:1132
 #, php-format
@@ -6786,10 +6785,10 @@ msgid "Edit settings for %s"
 msgstr "%s に対する設定の変更を行います"
#: libraries/import.lib.php:1127
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to table"
 msgid "Go to table: %s"
-msgstr "テーブルに移動"
+msgstr "テーブル %s に移動"
#: libraries/import.lib.php:1130
 #, php-format
@@ -6797,10 +6796,10 @@ msgid "Structure of %s"
 msgstr "%s の構造"
#: libraries/import.lib.php:1136
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to view"
 msgid "Go to view: %s"
-msgstr "ビューに移動"
+msgstr "ビュー %s に移動"
#: libraries/import/csv.php:38 libraries/import/ods.php:33
 msgid ""
@@ -7459,16 +7458,14 @@ msgid "You must provide an event name"
 msgstr "イベント名は必須です"
#: libraries/rte/rte_events.lib.php:537
-#, fuzzy
 #| msgid "You must provide a name and a type for each routine parameter."
 msgid "You must provide a valid interval value for the event."
-msgstr "ルーチンの各パラメータに対して、名前と種別は必須です"
+msgstr "有効な実行間隔を指定してください。"
#: libraries/rte/rte_events.lib.php:549
-#, fuzzy
 #| msgid "You must provide a routine definition."
 msgid "You must provide a valid execution time for the event."
-msgstr "ルーチンの定義は必須です"
+msgstr "有効な実行日時を指定してください。"
#: libraries/rte/rte_events.lib.php:553
 msgid "You must provide a valid type for the event."
diff --git a/po/tr.po b/po/tr.po
index 0398345..248a6b9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-01-22 04:34-0500\n"
-"PO-Revision-Date: 2012-01-17 01:50+0200\n"
+"PO-Revision-Date: 2012-01-21 12:19+0200\n"
 "Last-Translator: Burak Yavuz hitowerdigit@hotmail.com\n"
 "Language-Team: turkish tr@li.org\n"
 "MIME-Version: 1.0\n"
@@ -990,8 +990,8 @@ msgid ""
 "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
 msgstr ""
 "İçe aktarmak için veri alınmadı. Ya dosya adı gönderilmedi ya da PHP "
-"yapılandırmanız tarafından izin verilen en fazla boyut aşıldı. [a@./"
-"Documentation.html#faq1_16@Documentation]SSS 1.16[/a]'ya bakın."
+"yapılandırmanız tarafından izin verilen en fazla dosya boyutu aşıldı. "
+"[a@./Documentation.html#faq1_16@Documentation]SSS 1.16[/a]'ya bakın."
#: import.php:366
 msgid ""
@@ -7254,7 +7254,7 @@ msgstr "Tarayıcı dönüşümü"
 msgid ""
 "Please see the documentation on how to update your column_comments table"
 msgstr ""
-"Sütun_Yorumları tablonuzun nasıl güncelleneceğini öğrenmek için lütfen "
+"Lütfen column_comments tablonuzun nasıl güncelleneceğini öğrenmek için "
 "belgeye bakın"
#: libraries/relation.lib.php:124 libraries/sql_query_form.lib.php:376
hooks/post-receive
-- 
phpMyAdmin


    