Merge branch 'feature/upstream' into develop

1 files changed, 12 insertions, 11 deletions

diff --git a/po/ja.po b/po/ja.po
index ef2a3f1..5b59309 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2020-03-04 04:46+0000\n"
-"PO-Revision-Date: 2020-03-04 18:15+0900\n"
-"Last-Translator: sicklylife <translation@sicklylife.jp>\n"
+"POT-Creation-Date: 2020-04-08 08:27+0000\n"
+"PO-Revision-Date: 2020-04-11 21:03+0900\n"
+"Last-Translator: Ryo Nakano <ryonakaknock3@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -135,7 +135,7 @@ msgstr "ドキュメントスキャナー"
 
 #: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
 msgid "Make a digital copy of your photos and documents"
-msgstr ""
+msgstr "写真と文書のデジタルコピーを作成します"
 
 #: data/simple-scan.appdata.xml.in:9
 msgid ""
@@ -525,6 +525,7 @@ msgstr ""
 "  Kentaro Kazuhama https://launchpad.net/~kazken3\n"
 "  Koichi Akabe https://launchpad.net/~vbkaisetsu\n"
 "  MANABE Akinari https://launchpad.net/~maaanaari\n"
+"  Ryo Nakano https://launchpad.net/~ryonakaknock3\n"
 "  Shinichirou Yamada https://launchpad.net/~yamada-strong-yamada-nice-64bit\n"
 "  Shushi Kurose https://launchpad.net/~kuromabo\n"
 "  Tosiki Iga https://launchpad.net/~tosiki-iga\n"
@@ -962,17 +963,17 @@ msgid "Unable to connect to scanner"
 msgstr "スキャナーに接続できません"
 
 #. Error displayed when no documents at the start of scanning
-#: src/scanner.vala:1300
+#: src/scanner.vala:1294
 msgid "Document feeder empty"
 msgstr "ドキュメントフィーダーが空です"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1307
+#: src/scanner.vala:1301
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1320 src/scanner.vala:1427
+#: src/scanner.vala:1314 src/scanner.vala:1421
 msgid "Error communicating with scanner"
 msgstr "スキャナーとの通信に失敗しました"
 
@@ -991,22 +992,22 @@ msgid "Fix PDF files generated with older versions of this app"
 msgstr "このアプリの古いバージョンによって生成された PDF ファイルを修復する"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:393
+#: src/simple-scan.vala:1474
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:408
+#: src/simple-scan.vala:1489
 msgid "Scan in progress"
 msgstr "スキャン実行中"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:585
+#: src/simple-scan.vala:1666
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[デバイス…] — スキャンユーティリティ"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:596
+#: src/simple-scan.vala:1677
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""