Merge branch 'feature/upstream' into develop

1 files changed, 59 insertions, 59 deletions

diff --git a/help/ja/ja.po b/help/ja/ja.po
index 7efa75d..452d4ed 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2012-10-08 08:05+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:31+0000\n"
+"Last-Translator: Kenichi Ito <ken.i54k@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Kenichi Ito https://launchpad.net/~ken-i54k"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -252,7 +206,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "スキャン解像度を設定する"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
@@ -335,7 +289,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/email.page:9
 msgid "Sending via Email"
-msgstr ""
+msgstr "電子メールで送信する"
 
 #. (itstool) path: page/p
 #: C/email.page:11
@@ -359,10 +313,56 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "ページのスキャン"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "ドキュメントの修正"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "ドキュメントの使用"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr ""
+msgstr "Creative Commons 表示-継承 3.0 非移植"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
@@ -550,7 +550,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/save.page:9
 msgid "Saving to a File"
-msgstr ""
+msgstr "ファイルの保存"
 
 #. (itstool) path: item/p
 #: C/save.page:13
@@ -654,7 +654,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/scanner.page:9
 msgid "Selecting a Scanner"
-msgstr ""
+msgstr "スキャナーの選択"
 
 #. (itstool) path: page/p
 #: C/scanner.page:11
@@ -681,12 +681,12 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/scanning.page:10
 msgid "Scanning a Page"
-msgstr ""
+msgstr "ページのスキャン"
 
 #. (itstool) path: page/p
 #: C/scanning.page:12
 msgid "To scan a document from your scanner:"
-msgstr ""
+msgstr "スキャナーからドキュメントを読み込むためには:"
 
 #. (itstool) path: item/p
 #: C/scanning.page:16
@@ -696,7 +696,7 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr ""
+msgstr "<app>Simple Scan</app> を開く。"
 
 #. (itstool) path: item/p
 #: C/scanning.page:18