Merge pull request #2850 from dabura667/addjp

fixed typo in translation + added new translation strings

po/ja.po

@@ -56,8 +56,8 @@ msgid "Advanced options"
 msgstr "詳細設定"
 
 #: public/views/preferencesAlias.html
-msgid "Alias for"
+msgid "Alias for <i>{{index.walletName}}</i>"
-msgstr "ウォレット通称"
+msgstr "<i>{{index.walletName}}</i> の通称設定"
 
 #: public/views/splash.html
 msgid "Already have a wallet?"
@@ -88,6 +88,10 @@ msgstr "本当にこのウォレットを削除しても宜しいですか？"
 msgid "Available Balance"
 msgstr "送金可能残高"
 
+#: public/views/create.html public/views/join.html
+msgid "BIP32 master extended private key"
+msgstr "マスタ拡張秘密鍵"
+
 #: public/views/includes/topbar.html public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
 msgid "Back"
@@ -430,11 +434,7 @@ msgstr "履歴"
 msgid "Home"
 msgstr "ホーム"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-msgid "If not given, a random key will be generated"
-msgstr "空欄の場合、乱数を使って鍵を生成します。"
-
-#: public/views/join.html
 msgid "If not given, a secure key will be generated"
 msgstr "空欄の場合、安全な鍵を生成します。"
 
@@ -498,7 +498,7 @@ msgstr "ウォレット移行について詳しく"
 msgid "Make a payment to"
 msgstr "支払いは次の宛先へ"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
 msgid "Master extended private key"
 msgstr "マスタ拡張秘密鍵"
 
@@ -663,9 +663,9 @@ msgid "Payment to"
 msgstr "支払い先"
 
 #: public/views/preferencesDeleteWallet.html
-msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED"
+msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED"
 msgstr ""
-"永久にこのウォレットを削除。\n"
+"永久にこのウォレットを削除します。\n"
 "二度と取り戻せない行為ですのどご注意下さい。"
 
 #: public/views/create.html
@@ -684,6 +684,10 @@ msgstr "バックアップファイルを選択"
 msgid "Preferences"
 msgstr "設定"
 
+#: public/views/modals/scanner.html
+msgid "QR-Scanner"
+msgstr "QRスキャンナー"
+
 #: src/js/controllers/index.js
 msgid "Receive"
 msgstr "受取"
@@ -870,6 +874,10 @@ msgstr "成功"
 msgid "Tap to retry"
 msgstr "タップしてやり直し"
 
+#: public/views/create.html
+msgid "Testnet"
+msgstr "テスト用ネットワーク"
+
 #: src/js/controllers/walletHome.js
 msgid ""
 "The payment was created but could not be completed. Please try again from "
@@ -1071,6 +1079,10 @@ msgstr "メールによるウォレットのお知らせ"
 msgid "locked by pending payments"
 msgstr "未対応ペイメントによりロック中"
 
+#: src/js/services/profileService.js
+msgid "me"
+msgstr "自分"
+
 #: public/views/copayers.html public/views/walletHome.html
 #: public/views/includes/sidebar.html
 msgid "of"

po/template.pot

@@ -43,7 +43,7 @@ msgid "Advanced options"
 msgstr ""
 
 #: public/views/preferencesAlias.html
-msgid "Alias for"
+msgid "Alias for <i>{{index.walletName}}</i>"
 msgstr ""
 
 #: public/views/splash.html
@@ -77,6 +77,11 @@ msgstr ""
 msgid "Available Balance"
 msgstr ""
 
+#: public/views/create.html
+#: public/views/join.html
+msgid "BIP32 master extended private key"
+msgstr ""
+
 #: public/views/includes/topbar.html
 #: public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
@@ -417,9 +422,6 @@ msgid "Home"
 msgstr ""
 
 #: public/views/create.html
-msgid "If not given, a random key will be generated"
-msgstr ""
-
 #: public/views/join.html
 msgid "If not given, a secure key will be generated"
 msgstr ""
@@ -487,6 +489,7 @@ msgid "Make a payment to"
 msgstr ""
 
 #: public/views/create.html
+#: public/views/join.html
 msgid "Master extended private key"
 msgstr ""
 
@@ -655,7 +658,7 @@ msgid "Payment to"
 msgstr ""
 
 #: public/views/preferencesDeleteWallet.html
-msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED"
+msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED"
 msgstr ""
 
 #: public/views/create.html
@@ -675,6 +678,10 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
+#: public/views/modals/scanner.html
+msgid "QR-Scanner"
+msgstr ""
+
 #: src/js/controllers/index.js
 msgid "Receive"
 msgstr ""
@@ -857,6 +864,10 @@ msgstr ""
 msgid "Tap to retry"
 msgstr ""
 
+#: public/views/create.html
+msgid "Testnet"
+msgstr ""
+
 #: src/js/controllers/walletHome.js
 msgid "The payment was created but could not be completed. Please try again from home screen"
 msgstr ""
@@ -1040,6 +1051,10 @@ msgstr ""
 msgid "locked by pending payments"
 msgstr ""
 
+#: src/js/services/profileService.js
+msgid "me"
+msgstr ""
+
 #: public/views/copayers.html
 #: public/views/walletHome.html
 #: public/views/includes/sidebar.html

public/views/create.html

@@ -91,15 +91,15 @@
         <div ng-hide="hideAdv" class="row">
           <div class="large-12 columns">
             <label for="network-name" class="line-b oh">
-              <span>Testnet</span>
+              <span translate>Testnet</span>
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
             <label for="ext-master" class="m10t">
               <span translate>Master extended private key</span>
-              <small translate>If not given, a random key will be generated</small>
+              <small translate>If not given, a secure key will be generated</small>
               <input id="ext-master"
               type="text"
-              placeholder="BIP32 master extended private key"
+              placeholder="{{'BIP32 master extended private key'|translate}}"
               name="privateKey" ng-model="privateKey">
           </div>
         </div>

public/views/join.html

@@ -74,11 +74,11 @@
           </a>
           <div ng-show="join.hideAdv" class="row">
             <div class="large-12 columns">
-              <label for="ext-master">Master extended private key
+              <label for="ext-master">{{'Master extended private key'|translate}}
               <small translate>If not given, a secure key will be generated</small>
                 <input id="ext-master"
                 type="text"
-                placeholder="BIP32 master extended private key"
+                placeholder="{{'BIP32 master extended private key'|translate}}"
                 name="privateKey" ng-model="privateKey">
               </label>
             </div>

public/views/modals/scanner.html

@@ -5,7 +5,7 @@
     </a>
   </section>
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis">
+    <h1 translate class="title ellipsis">
       QR-Scanner
     </h1>
   </section>

public/views/preferencesAlias.html

@@ -6,7 +6,7 @@
 
 <div class="content preferences p20v" ng-controller="preferencesAliasController as prefAlias">
   <form name="settingsAliasForm" ng-submit="prefAlias.save()" class="columns">
-    <label><span translate>Alias for</span> <i>{{index.walletName}}</i></label>
+    <label><span translate>Alias for <i>{{index.walletName}}</i></span></label>
     <input type="text" id="alias2" type="text" name="alias2" ng-model="prefAlias.alias">
     <input type="submit" class="button expand black round" value="{{'Save'|translate}}"
     ng-style="{'background-color':index.backgroundColor}">