Merge pull request #2942 from dabura667/jpfix

Fixed Japanese + Template

po/ja.po

@@ -55,6 +55,10 @@ msgstr "アドレス"
 msgid "Advanced"
 msgstr "上級者向け"
 
+#: public/views/disclaimer.html
+msgid "Agree"
+msgstr "同意します"
+
 #: public/views/preferencesAlias.html
 msgid "Alias for <i>{{index.walletName}}</i>"
 msgstr "<i>{{index.walletName}}</i> の通称設定"
@@ -135,6 +139,18 @@ msgstr "Bitcoin URI が無効です！"
 msgid "Bitcoin address"
 msgstr "ビットコインアドレス"
 
+#: public/views/preferencesFee.html
+msgid ""
+"Bitcoin transactions may include a fee collected by miners on the network. "
+"The higher the fee, the greater the incentive a miner has to include that "
+"transaction in a block. The ‘Emergency’ level should only be used when there "
+"is a network congestion."
+msgstr ""
+"円滑な送金をしていただくために、ビットコインの送金には少量の手数料を付けるこ"
+"とが義務付けられております。この手数料はビットコインのネットワークを運用する"
+"人たちに寄付され、より高い手数料であればより優先的にブロックに含まれ、承認さ"
+"れます。「緊急」の設定はネットワーク全体の混雑時にのみご利用下さい。"
+
 #: public/views/modals/txp-details.html
 msgid "Broadcast Payment"
 msgstr "取引送信"
@@ -373,6 +389,10 @@ msgstr "節約"
 msgid "Email Notifications"
 msgstr "メールのお知らせ"
 
+#: src/js/controllers/preferencesFee.js
+msgid "Emergency"
+msgstr "緊急"
+
 #: public/views/preferences.html
 msgid "Encrypt Private Key"
 msgstr "秘密鍵を暗号化"

po/template.pot

@@ -122,6 +122,10 @@ msgstr ""
 msgid "Bitcoin address"
 msgstr ""
 
+#: public/views/preferencesFee.html
+msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion."
+msgstr ""
+
 #: public/views/modals/txp-details.html
 msgid "Broadcast Payment"
 msgstr ""
@@ -360,6 +364,10 @@ msgstr ""
 msgid "Email Notifications"
 msgstr ""
 
+#: src/js/controllers/preferencesFee.js
+msgid "Emergency"
+msgstr ""
+
 #: public/views/preferences.html
 msgid "Encrypt Private Key"
 msgstr ""