Updating translations from Pootle (and also resolving a GIT conflict)

1 files changed, 45 insertions, 32 deletions

diff --git a/po/ja.po b/po/ja.po
index ea49ae7..adf2a34 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,68 +2,81 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-05 03:28-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2007-12-14 20:37-0500\n"
+"PO-Revision-Date: 2008-01-04 08:31+0000\n"
+"Last-Translator: Taizo Shiozaki <taizo@shiozaki.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
-
-#: activity.py:26
-#, python-format
-msgid "%s Source"
-msgstr ""
+"X-Generator: Pootle 1.0.2\n"
 
 #: library/pippy/game.py:19
+#, fuzzy
 msgid "PAUSED"
-msgstr ""
+msgstr "一時停止中"
 
-#: pippy_app.py:57
+#: pippy_app.py:56
+#, fuzzy
 msgid "As Pippy Document"
-msgstr ""
+msgstr "Pippyドキュメント"
 
-#: pippy_app.py:62
+#: pippy_app.py:61
+#, fuzzy
 msgid "As Activity Bundle"
-msgstr ""
+msgstr "アクティビティバンドルとして"
 
-#: pippy_app.py:79
+#: pippy_app.py:78
+#, fuzzy
 msgid "Examples"
-msgstr ""
+msgstr "例"
 
-#: pippy_app.py:147
-msgid "_Run!"
-msgstr ""
+#: pippy_app.py:146
+#, fuzzy
+msgid "Run!"
+msgstr "走れ！"
 
-#: pippy_app.py:235
+#: pippy_app.py:234
 #, python-format
+#, fuzzy
 msgid "%s Activity"
-msgstr ""
+msgstr "%sアクティビティ"
 
-#: pippy_app.py:290
+#: pippy_app.py:285
+#, fuzzy
 msgid "Save as Activity Error"
-msgstr ""
+msgstr "「アクティビティへ保存」エラー"
 
-#: pippy_app.py:291
+#: pippy_app.py:286
+#, fuzzy
 msgid ""
 "Please give your activity a meaningful name before attempting to save it as "
 "an activity."
-msgstr ""
+msgstr "わかりやすい名前を付けてから、アクティビティとして保存してください。"
 
-#: pippy_app.py:293
+#: pippy_app.py:288
+#, fuzzy
 msgid "Ok"
-msgstr ""
+msgstr "はい"
 
-#: pippy_app.py:299
+#: pippy_app.py:294
+#, fuzzy
 msgid "Creating activity bundle..."
-msgstr ""
+msgstr "アクティビティバンドルを生成中..."
 
-#: pippy_app.py:358
+#: pippy_app.py:352
+#, fuzzy
 msgid "Activity saved to journal."
-msgstr ""
+msgstr "ジャーナルにアクティビティを保存しました。"
+
+#, fuzzy
+#~ msgid "Pippy"
+#~ msgstr "ピッピー"
+
+#, fuzzy
+#~ msgid "Stop!"
+#~ msgstr "止まれ！"