anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3016 from dabura667/jpfix2

Browse source 
Fix Japanese and English
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-20 10:10:56 -03:00
commit f47f553a31
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
po/ja.po
View file

@ -258,7 +258,7 @@ msgstr "送金できませんでした。接続を確認し、やり直して下
#: src/js/controllers/walletHome.js
msgid ""
"Could not connect wallet service. Check your Internet connexion and your "
"Could not connect wallet service. Check your Internet connection and your "
"wallet service configuration."
msgstr ""
"ウォレットサービスと接続できませんでした。インターネットの接続とウォレット"
@ -303,7 +303,7 @@ msgstr "指定された拡張秘密鍵で参加できませんでした。"
#: src/js/controllers/join.js
msgid "Could not join wallet:"
msgstr "ウォレットに参加できませんでした。"
msgstr "ウォレットに参加できませんでした："
#: src/js/controllers/walletHome.js
msgid "Could not recognize a valid Bitcoin QR Code"
@ -444,7 +444,7 @@ msgstr "ウォレット作成時にエラー発生、インターネットの接
#: src/js/services/profileService.js
msgid "Error importing wallet:"
msgstr "ウォレットインポート時にエラー"
msgstr "ウォレットインポート時にエラー："
#: public/views/modals/paypro.html public/views/modals/txp-details.html
msgid "Expires"
@ -462,7 +462,7 @@ msgstr "ウォレットのインポート失敗しました"
msgid "Family vacation funds"
msgstr "家族旅行貯金"
#: public/views/modals/txp-details.html
#: public/views/modals/tx-details.html public/views/modals/txp-details.html
msgid "Fee"
msgstr "手数料"
@ -1251,7 +1251,7 @@ msgstr "ウォレット名"
#: src/js/controllers/walletHome.js
msgid ""
"Wallet service timed out. Check your Internet connexion and your wallet "
"Wallet service timed out. Check your Internet connection and your wallet "
"service configuration."
msgstr ""
"ウォレットサービスがタイムアウトになりました。インターネットの接続とウォレッ"

5
po/template.pot
View file

@ -229,7 +229,7 @@ msgid "Could not broadcast payment. Check you connection and try again"
msgstr ""
#: src/js/controllers/walletHome.js
msgid "Could not connect wallet service. Check your Internet connexion and your wallet service configuration."
msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration."
msgstr ""
#: src/js/controllers/walletHome.js
@ -433,6 +433,7 @@ msgstr ""
msgid "Family vacation funds"
msgstr ""
#: public/views/modals/tx-details.html
#: public/views/modals/txp-details.html
msgid "Fee"
msgstr ""
@ -1133,7 +1134,7 @@ msgid "Wallet name"
msgstr ""
#: src/js/controllers/walletHome.js
msgid "Wallet service timed out. Check your Internet connexion and your wallet service configuration."
msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration."
msgstr ""
#: public/views/preferencesDeleteWallet.html

4
src/js/controllers/walletHome.js
View file

@ -98,11 +98,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (err.message) {
// TODO : this is not used anymore?
if (err.message.indexOf('CORS') >= 0) {
err.message = gettext('Could not connect wallet service. Check your Internet connexion and your wallet service configuration.');
err.message = gettext('Could not connect wallet service. Check your Internet connection and your wallet service configuration.');
}
if (err.message.indexOf('TIMEDOUT') >= 0) {
err.message = gettext('Wallet service timed out. Check your Internet connexion and your wallet service configuration.');
err.message = gettext('Wallet service timed out. Check your Internet connection and your wallet service configuration.');
}
}
};