Merge branch 'master' of git+ssh://git.taler.net/www

1 files changed, 101 insertions, 59 deletions

diff --git a/locale/ja/LC_MESSAGES/messages.po b/locale/ja/LC_MESSAGES/messages.po
index f28c661e..dadcbccd 100644
--- a/locale/ja/LC_MESSAGES/messages.po
+++ b/locale/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-24 18:55+0100\n"
+"POT-Creation-Date: 2022-09-11 12:19+0200\n"
 "PO-Revision-Date: 2022-02-22 10:35+0000\n"
 "Last-Translator: Mizuhashi Lexee <nekohamushi@outlook.jp>\n"
 "Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/main-"
@@ -118,7 +118,7 @@ msgstr ""
 "ます。"
 
 #: template/cashier.html.j2:61 template/pos.html.j2:61
-#: template/wallet.html.j2:239
+#: template/wallet.html.j2:247
 msgid "Install Android App from Google App Store, or"
 msgstr "アンドロイドアプリをグーグルアプストアでインストールするか、"
 
@@ -508,19 +508,26 @@ msgid "What if my computer is hacked?"
 msgstr "コンピューターがハッキングされた場合はどうなりますか？"
 
 #: template/faq.html.j2:54
+#, fuzzy
+#| msgid ""
+#| "In case of a compromise of one of your devices, an attacker can spend "
+#| "coins from your wallet. Checking your balance might reveal to you that "
+#| "your device has been compromised."
 msgid ""
 "In case of a compromise of one of your devices, an attacker can spend coins "
-"from your wallet. Checking your balance might reveal to you that your device "
-"has been compromised."
+"from your wallet. Checking your balance might reveal to you whether your "
+"device has eventually been compromised. If a coin has been spent, this coin "
+"cannot be spent a second time. The Exchange examines every coin whether it "
+"has been spent and thus makes double spending impossible."
 msgstr ""
 "ハッカーがあなたのデバイスに侵入した場合、ウォレットからコインを使うことがで"
 "きます。残高を確認することでデバイスに侵入されたことがわかります。"
 
-#: template/faq.html.j2:61
+#: template/faq.html.j2:59
 msgid "Can I send money to my friends with Taler?"
 msgstr "GNU Talerで友人に送金できますか？"
 
-#: template/faq.html.j2:63
+#: template/faq.html.j2:61
 msgid ""
 "If your friends provide goods or services for you in exchange for a payment, "
 "they can easily set up a Taler merchant and receive the payment in their "
@@ -530,7 +537,7 @@ msgstr ""
 "チャントを簡単に設定することでそのご友人の銀行口座で支払いを受け取ることがで"
 "きるようになります。"
 
-#: template/faq.html.j2:70
+#: template/faq.html.j2:68
 msgid ""
 "Future versions of the Taler wallet may allow exchanging coins among friends "
 "directly as well."
@@ -538,11 +545,11 @@ msgstr ""
 "GNU Talerウォレットの将来的な形として、友人間で直にコインを交換することができ"
 "るようになるでしょう。"
 
-#: template/faq.html.j2:76
+#: template/faq.html.j2:74
 msgid "How does Taler handle payments in different currencies?"
 msgstr "GNU Talerは異なる通貨での支払いをどのように処理しますか？"
 
-#: template/faq.html.j2:78
+#: template/faq.html.j2:76
 msgid ""
 "Taler wallets can store digital coins corresponding to multiple different "
 "currencies such as the Euro, US Dollars or Bitcoins."
@@ -550,15 +557,15 @@ msgstr ""
 "GNUTalerウォレットはユーロ、米ドル、ビットコインといった複数の異なる通貨に対"
 "応するデジタルコインを持っています。"
 
-#: template/faq.html.j2:84
+#: template/faq.html.j2:82
 msgid "Taler currently does not offer conversion between currencies."
 msgstr "GNU Talerは通貨間の変換には対応していません。"
 
-#: template/faq.html.j2:89
+#: template/faq.html.j2:87
 msgid "How does Taler protect my privacy?"
 msgstr "Talerはどのように私のプライバシーを保護しますか？"
 
-#: template/faq.html.j2:91
+#: template/faq.html.j2:89
 msgid ""
 "Your wallet stores digital coins that are <a href=\"https://en.wikipedia.org/"
 "wiki/Blind_signature\">blindly signed</a> by an exchange. The use of a blind "
@@ -570,11 +577,11 @@ msgstr ""
 "とでプライバシーが保護され、取引所は署名したコインのどれがどの顧客のものかは"
 "わからない仕組みになっています。"
 
-#: template/faq.html.j2:101
+#: template/faq.html.j2:99
 msgid "How much does it cost?"
 msgstr "どのくらいの費用がかかりますか？"
 
-#: template/faq.html.j2:103
+#: template/faq.html.j2:101
 msgid ""
 "The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -595,11 +602,11 @@ msgstr ""
 "期段階での見積もりのため、詳細は監督当局による運用やバックアップに関する規則"
 "に因ります。取引コストが十倍となっていることも容易に起こり得ます。"
 
-#: template/faq.html.j2:117
+#: template/faq.html.j2:115
 msgid "Does Taler work with international payments?"
 msgstr "Talerは国際決済可能ですか？"
 
-#: template/faq.html.j2:119
+#: template/faq.html.j2:117
 msgid ""
 "Taler&#39;s wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -615,11 +622,11 @@ msgstr ""
 "に複雑な傾向です。GNU Talerとしては日々の支払いに注力しており、当面は通貨間の"
 "変換には対応しない予定です。"
 
-#: template/faq.html.j2:130
+#: template/faq.html.j2:128
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr "GNU Talerは（欧州）電子マネー指令にどのように対応していますか？"
 
-#: template/faq.html.j2:132
+#: template/faq.html.j2:130
 msgid ""
 "We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
@@ -628,7 +635,7 @@ msgstr ""
 "欧州電子マネー指令はユーロ建てコインを取り扱うGNU Taler取引所が則るべき規制枠"
 "組みの一部を規定していると思われます。"
 
-#: template/faq.html.j2:139
+#: template/faq.html.j2:137
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
@@ -636,7 +643,7 @@ msgstr ""
 "GNUコインと通常の銀行口座にある資金間の変換を銀行はどうやって保証しているので"
 "しょうか?"
 
-#: template/faq.html.j2:141
+#: template/faq.html.j2:139
 msgid ""
 "The exchange would be operated by a bank or in cooperation with a bank, and "
 "that bank would hold the funds in escrow. Note that this bank could be a "
@@ -651,30 +658,36 @@ msgstr ""
 "通常の銀行資金へ変換する場合、その理由を確認することが各銀行の規定となってい"
 "ます。"
 
-#: template/faq.html.j2:150
+#: template/faq.html.j2:148
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr "変換が行われないときや不履行の場合の問い合わせ先はどこですか？"
 
-#: template/faq.html.j2:152
+#: template/faq.html.j2:150
 msgid ""
-"Any exchange should be audited by one or more independent auditors. "
-"Merchants and consumer wallets will report certain issues automatically to "
-"the auditors, but auditors may also provide a method for manual submission "
-"of issues. The auditors are expected to make their reports available to the "
-"respective regulatory authorities, or even the general public."
-msgstr ""
-"各取引所は一つ以上の独立した監査団体により監査を受ける必要があります。マー"
-"チャントと顧客のウォレットは自動的に監査側に問題を報告することになりますが、"
-"監査側は手動による問題報告の提出方法を示してもよいです。監査側は同報告書をそ"
-"れぞれの監督当局もしくは公衆の閲覧に供することになっています。"
-
-#: template/faq.html.j2:161
+"From a technical point of view, any exchange is audited by one or more "
+"independent auditors. Merchants and consumer wallets will report certain "
+"issues automatically to the auditors, but auditors may also provide a method "
+"for manual submission of issues. The auditors are expected to make their "
+"reports available to the respective regulatory authorities, or even the "
+"general public. </p> <p> From a legal point of view, users can always turn "
+"to their national authority responsible for settling disputes concerning the "
+"management of exchange services. For exchange services conducting business "
+"in Germany, this would be the general authority in charge of disputes (<a "
+"href=\"https://www.verbraucher-schlichter.de\">Universalschlichtungsstelle "
+"des Bundes</a>). In addition to this, the European Online Dispute Resolution "
+"(see <a href=\"http://ec.europa.eu/odr\">ODR</a>) as a platform provided by "
+"the European Commission can be called for the settlement of disputes "
+"concerning exchange services headquartered in member states of the European "
+"Union."
+msgstr ""
+
+#: template/faq.html.j2:158
 msgid "Are there any projects already using Taler?"
 msgstr "すでにTalerを使用しているプロジェクトはありますか？"
 
-#: template/faq.html.j2:163
+#: template/faq.html.j2:160
 msgid ""
 "We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -689,11 +702,11 @@ msgstr ""
 "しょう（未決課題リストに関しては<a href=\"https://gnunet.org/bugs/\">バグ管理"
 "システム</a> も併せて参照ください）。"
 
-#: template/faq.html.j2:174
+#: template/faq.html.j2:171
 msgid "Does Taler support recurring payments?"
 msgstr "GNU Talerは自動引き落としに対応していますか？"
 
-#: template/faq.html.j2:176
+#: template/faq.html.j2:173
 msgid ""
 "Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -1271,31 +1284,35 @@ msgstr ""
 msgid "GNU Taler in the Press"
 msgstr "GNU Taler関連の記事"
 
-#: template/press.html.j2:6
+#: template/press.html.j2:5
+msgid "2022"
+msgstr ""
+
+#: template/press.html.j2:10
 msgid "2021"
 msgstr "2021年"
 
-#: template/press.html.j2:37
+#: template/press.html.j2:42
 msgid "2020"
 msgstr "2020年"
 
-#: template/press.html.j2:51
+#: template/press.html.j2:56
 msgid "2019"
 msgstr "2019年"
 
-#: template/press.html.j2:57
+#: template/press.html.j2:62
 msgid "2018"
 msgstr "2018年"
 
-#: template/press.html.j2:67
+#: template/press.html.j2:72
 msgid "2017"
 msgstr "2017年"
 
-#: template/press.html.j2:77
+#: template/press.html.j2:82
 msgid "2016"
 msgstr "2016年"
 
-#: template/press.html.j2:95
+#: template/press.html.j2:100
 msgid "2015"
 msgstr "2015年"
 
@@ -1603,69 +1620,94 @@ msgstr "下のリンクからブラウザ用のウォレットをインストー
 msgid "demonstration"
 msgstr "デモンストレーション"
 
-#: template/wallet.html.j2:143 template/wallet.html.j2:153
+#: template/wallet.html.j2:134
+msgid "For source, see this"
+msgstr ""
+
+#: template/wallet.html.j2:138
+msgid "directory"
+msgstr ""
+
+#: template/wallet.html.j2:151 template/wallet.html.j2:161
 msgid "or"
 msgstr "または"
 
-#: template/wallet.html.j2:147
+#: template/wallet.html.j2:155
 msgid "is required, but it appears you don&#39;t have it installed."
 msgstr "必要なツールがインストールされていないようです。"
 
-#: template/wallet.html.j2:157
+#: template/wallet.html.j2:165
 msgid "version"
 msgstr "バージョン"
 
-#: template/wallet.html.j2:161
+#: template/wallet.html.j2:169
 msgid "or newer is required, but it appears you have an older version."
 msgstr ""
 "以降のバージョンが必要ですが、古いバージョンがインストールされているようで"
 "す。"
 
-#: template/wallet.html.j2:168
+#: template/wallet.html.j2:176
 msgid "Install wallet"
 msgstr "ウォレットのインストール"
 
-#: template/wallet.html.j2:175
+#: template/wallet.html.j2:183
 msgid "JavaScript is disabled, installation won&#39;t work."
 msgstr "JavaScriptが無効になっているため、インストールができません。"
 
-#: template/wallet.html.j2:214
+#: template/wallet.html.j2:222
 msgid "Install Download Chrome Extension"
 msgstr "Chrome拡張機能のダウンロードをインストール"
 
-#: template/wallet.html.j2:221
+#: template/wallet.html.j2:229
 msgid "Install GNU Taler"
 msgstr "GNU Talerのインストール"
 
-#: template/wallet.html.j2:225
+#: template/wallet.html.j2:233
 msgid "from the Chrome Web Store"
 msgstr "Chromeウェブストアから"
 
-#: template/wallet.html.j2:246
+#: template/wallet.html.j2:254
 msgid "Download Android App from F-Droid (bypassing Google registration)."
 msgstr "F-Droid （グーグル登録を回避）でアンドロイドアプリをダウンロードする。"
 
-#: template/wallet.html.j2:259
+#: template/wallet.html.j2:267
 msgid "Other browsers"
 msgstr "他のブラウザ"
 
-#: template/wallet.html.j2:261
+#: template/wallet.html.j2:269
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "他のブラウザ用ウォレットは開発中です。"
 
 #: template/news/index.html.j2:11
-msgid "News posts about changes related to GNUnet such as releases and events"
+#, fuzzy
+#| msgid ""
+#| "News posts about changes related to GNUnet such as releases and events"
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
 msgstr "GNUnetのリリースやイベントなどに関連する変更のお知らせ"
 
-#: template/news/index.html.j2:16
+#: template/news/index.html.j2:13
 msgid "subscribe to our RSS feed"
 msgstr "RSSフィードを購読する"
 
-#: template/news/index.html.j2:36
+#: template/news/index.html.j2:33
 msgid "read more"
 msgstr "続きを読む"
 
 #~ msgid ""
+#~ "Any exchange should be audited by one or more independent auditors. "
+#~ "Merchants and consumer wallets will report certain issues automatically "
+#~ "to the auditors, but auditors may also provide a method for manual "
+#~ "submission of issues. The auditors are expected to make their reports "
+#~ "available to the respective regulatory authorities, or even the general "
+#~ "public."
+#~ msgstr ""
+#~ "各取引所は一つ以上の独立した監査団体により監査を受ける必要があります。マー"
+#~ "チャントと顧客のウォレットは自動的に監査側に問題を報告することになります"
+#~ "が、監査側は手動による問題報告の提出方法を示してもよいです。監査側は同報告"
+#~ "書をそれぞれの監督当局もしくは公衆の閲覧に供することになっています。"
+
+#~ msgid ""
 #~ "You can find some team members in the IRC channel <tt>#taler</tt> on "
 #~ "<tt>irc.freenode.net</tt>."
 #~ msgstr ""