[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ad108de9367f7b3ae6ce312a4c3eb75f3cb54646

20 Jun 2011

The branch, master has been updated
       via  ad108de9367f7b3ae6ce312a4c3eb75f3cb54646 (commit)
       via  1607fbd55417a31fc7a412af221a617be27d0d83 (commit)
       via  e8eb5d90e43537f22968dae9387ee0a7d8005632 (commit)
       via  d4efcadd7ec9506b13eff0b15a38c1af0d464af9 (commit)
       via  5ca8dd73ced3dfa6caecf58fc6efca71d373ef7b (commit)
      from  1f3205b8930a9d74b2ac0cef5002195c0489ad9e (commit)


- Log -----------------------------------------------------------------
commit ad108de9367f7b3ae6ce312a4c3eb75f3cb54646
Merge: 1f3205b8930a9d74b2ac0cef5002195c0489ad9e 1607fbd55417a31fc7a412af221a617be27d0d83
Author: Michal Čihař <mcihar@suse.cz>
Date:   Mon Jun 20 16:06:58 2011 +0200

    Merge remote-tracking branch 'pootle/master'
    
    Conflicts:
    	po/ja.po

commit 1607fbd55417a31fc7a412af221a617be27d0d83
Author: Yuichiro <yuichiro@pop07.odn.ne.jp>
Date:   Mon Jun 20 12:52:28 2011 +0200

    Translation update done using Pootle.

commit e8eb5d90e43537f22968dae9387ee0a7d8005632
Author: Yuichiro <yuichiro@pop07.odn.ne.jp>
Date:   Mon Jun 20 12:14:11 2011 +0200

    Translation update done using Pootle.

commit d4efcadd7ec9506b13eff0b15a38c1af0d464af9
Author: Yuichiro <yuichiro@pop07.odn.ne.jp>
Date:   Mon Jun 20 12:14:02 2011 +0200

    Translation update done using Pootle.

commit 5ca8dd73ced3dfa6caecf58fc6efca71d373ef7b
Author: Yuichiro <yuichiro@pop07.odn.ne.jp>
Date:   Mon Jun 20 12:13:52 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/ja.po |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 2c69336..7fdce31 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-06-17 09:12+0300\n"
-"PO-Revision-Date: 2011-06-15 11:54+0200\n"
+"PO-Revision-Date: 2011-06-20 12:52+0200\n"
 "Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: Japan <jp@li.org>\n"
 "Language: ja\n"
@@ -7256,17 +7256,18 @@ msgid ""
 "suffix. This function accepts no parameters and returns array with "
 "information about the transformation. Currently following keys can be used:"
 msgstr ""
+"更に、変換に対しての情報を提供している追加関数を、ユーザへ提供する必要があります。この関数は、<code>_info</code>の接尾辞を持つ変換関数"
+"と同じ名前を持つ必要があります。この関数は引数なしで、変換に関する情報配列を返します。戻り値の配列キーは以下の通りです。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:2625
-#, fuzzy
 msgid "<code>info</code>"
-msgstr "<code>, 変数 as myname</code>"
+msgstr "<code>info</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:2626
 msgid "Long description of the transformation."
-msgstr ""
+msgstr "変換に関する長めの説明。"
 
 #. type: Content of: <html><body><div><h2>
 #: orig-docs/Documentation.html:2630
@@ -14170,6 +14171,8 @@ msgid ""
 "\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>. They "
 "should have written their names here."
 msgstr ""
+"翻訳は、<a href=\"https://l10n.cihar.com/projects/pmadoc/\">翻訳サーバ</a>を通じて多くの人達によって"
+"行われてきました。日本語版の主な翻訳者：石垣 憲一、高橋 裕一郎。"
 
 #. type: Plain text
 #: addendum/comment.html:2


hooks/post-receive
-- 
phpMyAdmin localized documentation

    

Michal Čihař

tags

participants (1)