From 7c67e5128c71dc048958a143de96e9c8189decd8 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 5 Jun 2015 01:34:09 +0900 Subject: [PATCH 1/6] fixed typo in translation --- po/ja.po | 4 ++-- po/template.pot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5ed1f23ab..f25c2c9b3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 diff --git a/po/template.pot b/po/template.pot index 0395ff60f..06f39154c 100644 --- a/po/template.pot +++ b/po/template.pot @@ -655,7 +655,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 From 2ebbf1f1c644cf29c94ad0727aa2904e275ac49c Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 5 Jun 2015 02:44:14 +0900 Subject: [PATCH 2/6] Added translations to pot + fixed Japanese --- po/ja.po | 28 ++++++++++++++++++++++------ po/template.pot | 25 ++++++++++++++++++++++--- public/views/create.html | 6 +++--- public/views/importLegacy.html | 4 ++-- public/views/join.html | 4 ++-- public/views/modals/scanner.html | 2 +- 6 files changed, 52 insertions(+), 17 deletions(-) diff --git a/po/ja.po b/po/ja.po index f25c2c9b3..21f2bdc63 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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" @@ -345,6 +349,10 @@ msgstr "バックアップをダウンロード" msgid "ENTER" msgstr "ENTER" +#: public/views/importLegacy.html +msgid "Email" +msgstr "メールアドレス" + #: public/views/preferences.html msgid "Email Notifications" msgstr "メールのお知らせ" @@ -430,11 +438,7 @@ msgstr "履歴" msgid "Home" msgstr "ホーム" -#: public/views/create.html -msgid "If not given, a random key will be generated" -msgstr "空欄の場合、乱数を使って鍵を生成します。" - -#: public/views/join.html +#: public/views/create.html public/views/join.html msgid "If not given, a secure key will be generated" msgstr "空欄の場合、安全な鍵を生成します。" @@ -498,7 +502,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 "マスタ拡張秘密鍵" @@ -684,6 +688,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 +878,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 " @@ -963,6 +975,10 @@ msgstr "信用していない" msgid "Updating Wallet..." msgstr "ウォレット更新中…" +#: public/views/importLegacy.html +msgid "Username" +msgstr "ユーザ名" + #: public/views/preferencesAbout.html msgid "Version" msgstr "バージョン" diff --git a/po/template.pot b/po/template.pot index 06f39154c..8447017b4 100644 --- a/po/template.pot +++ b/po/template.pot @@ -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 @@ -329,6 +334,10 @@ msgstr "" msgid "ENTER" msgstr "" +#: public/views/importLegacy.html +msgid "Email" +msgstr "" + #: public/views/preferences.html msgid "Email Notifications" msgstr "" @@ -417,9 +426,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 +493,7 @@ msgid "Make a payment to" msgstr "" #: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "" @@ -675,6 +682,10 @@ msgstr "" msgid "Preferences" msgstr "" +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "" + #: src/js/controllers/index.js msgid "Receive" msgstr "" @@ -857,6 +868,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 "" @@ -934,6 +949,10 @@ msgstr "" msgid "Updating Wallet..." msgstr "" +#: public/views/importLegacy.html +msgid "Username" +msgstr "" + #: public/views/preferencesAbout.html msgid "Version" msgstr "" diff --git a/public/views/create.html b/public/views/create.html index b74cdf641..565e1dd92 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -91,15 +91,15 @@
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index ceac39936..b943b63a4 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -30,8 +30,8 @@ diff --git a/public/views/join.html b/public/views/join.html index 9e38fc796..1cf29abfb 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -74,11 +74,11 @@
-
diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html index aa2245893..9f72ebf67 100644 --- a/public/views/modals/scanner.html +++ b/public/views/modals/scanner.html @@ -5,7 +5,7 @@
-

+

QR-Scanner

From 45c5de64f42127dc642c151725741b40156963eb Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 5 Jun 2015 02:51:55 +0900 Subject: [PATCH 3/6] Added more strings --- po/ja.po | 6 +++++- po/template.pot | 5 +++++ src/js/services/profileService.js | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 21f2bdc63..125cc7de2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -672,7 +672,7 @@ msgstr "" "永久にこのウォレットを削除します。\n" "二度と取り戻せない行為ですのどご注意下さい。" -#: public/views/create.html +#: public/views/create.html src/js/services/profileService.js msgid "Personal Wallet" msgstr "個人用ウォレット" @@ -1087,6 +1087,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" diff --git a/po/template.pot b/po/template.pot index 8447017b4..33d88f427 100644 --- a/po/template.pot +++ b/po/template.pot @@ -666,6 +666,7 @@ msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "" #: public/views/create.html +#: src/js/services/profileService.js msgid "Personal Wallet" msgstr "" @@ -1059,6 +1060,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 diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 6b8132e8e..7f214ce5e 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -165,7 +165,7 @@ angular.module('copayApp.services') } var walletClient = bwcService.getClient(); - walletClient.createWallet('Personal Wallet', 'me', 1, 1, { + walletClient.createWallet(gettext('Personal Wallet'), gettext('me'), 1, 1, { network: 'livenet' }, function(err) { if (err) return cb(gettext('Error creating wallet. Check your internet connection')); From 113070d906c503576537ca5455eab74baddaf970 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 5 Jun 2015 02:57:23 +0900 Subject: [PATCH 4/6] More changes. fixing translations --- po/ja.po | 4 ++-- po/template.pot | 2 +- public/views/preferencesAlias.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index 125cc7de2..0e1dd45d0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -56,8 +56,8 @@ msgid "Advanced options" msgstr "詳細設定" #: public/views/preferencesAlias.html -msgid "Alias for" -msgstr "ウォレット通称" +msgid "Alias for {{index.walletName}}" +msgstr "{{index.walletName}} の通称設定" #: public/views/splash.html msgid "Already have a wallet?" diff --git a/po/template.pot b/po/template.pot index 33d88f427..1759ff1db 100644 --- a/po/template.pot +++ b/po/template.pot @@ -43,7 +43,7 @@ msgid "Advanced options" msgstr "" #: public/views/preferencesAlias.html -msgid "Alias for" +msgid "Alias for {{index.walletName}}" msgstr "" #: public/views/splash.html diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 35ab46869..629974aa6 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -6,7 +6,7 @@
- + From 01bd4f7aa2a29c7e393a64e09f818b0e2a1a9593 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 6 Jun 2015 00:17:54 +0900 Subject: [PATCH 5/6] Revert fixes --- po/template.pot | 9 --------- public/views/importLegacy.html | 4 ++-- src/js/services/profileService.js | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/po/template.pot b/po/template.pot index 1759ff1db..ac6a74c1f 100644 --- a/po/template.pot +++ b/po/template.pot @@ -334,10 +334,6 @@ msgstr "" msgid "ENTER" msgstr "" -#: public/views/importLegacy.html -msgid "Email" -msgstr "" - #: public/views/preferences.html msgid "Email Notifications" msgstr "" @@ -666,7 +662,6 @@ msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "" #: public/views/create.html -#: src/js/services/profileService.js msgid "Personal Wallet" msgstr "" @@ -950,10 +945,6 @@ msgstr "" msgid "Updating Wallet..." msgstr "" -#: public/views/importLegacy.html -msgid "Username" -msgstr "" - #: public/views/preferencesAbout.html msgid "Version" msgstr "" diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index b943b63a4..ceac39936 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -30,8 +30,8 @@ diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 7f214ce5e..6b8132e8e 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -165,7 +165,7 @@ angular.module('copayApp.services') } var walletClient = bwcService.getClient(); - walletClient.createWallet(gettext('Personal Wallet'), gettext('me'), 1, 1, { + walletClient.createWallet('Personal Wallet', 'me', 1, 1, { network: 'livenet' }, function(err) { if (err) return cb(gettext('Error creating wallet. Check your internet connection')); From dd0b901a7732a44acb7d1a30eac3e0536ee149a3 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 6 Jun 2015 00:19:18 +0900 Subject: [PATCH 6/6] update Japanese --- po/ja.po | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0e1dd45d0..f04671e75 100644 --- a/po/ja.po +++ b/po/ja.po @@ -349,10 +349,6 @@ msgstr "バックアップをダウンロード" msgid "ENTER" msgstr "ENTER" -#: public/views/importLegacy.html -msgid "Email" -msgstr "メールアドレス" - #: public/views/preferences.html msgid "Email Notifications" msgstr "メールのお知らせ" @@ -672,7 +668,7 @@ msgstr "" "永久にこのウォレットを削除します。\n" "二度と取り戻せない行為ですのどご注意下さい。" -#: public/views/create.html src/js/services/profileService.js +#: public/views/create.html msgid "Personal Wallet" msgstr "個人用ウォレット" @@ -975,10 +971,6 @@ msgstr "信用していない" msgid "Updating Wallet..." msgstr "ウォレット更新中…" -#: public/views/importLegacy.html -msgid "Username" -msgstr "ユーザ名" - #: public/views/preferencesAbout.html msgid "Version" msgstr "バージョン"