diff --git a/app/i18n/locales/en-US.json b/app/i18n/locales/en-US.json index 560dc67e28..ed665953ca 100644 --- a/app/i18n/locales/en-US.json +++ b/app/i18n/locales/en-US.json @@ -229,11 +229,11 @@ "wallet.transaction.assuranceLevel.medium": "medium", "wallet.transaction.confirmations": "confirmations", "wallet.transaction.conversion.rate": "Conversion rate", - "wallet.transaction.fee": "Fee", "wallet.transaction.export.dialog.exportButton.label": "Export", "wallet.transaction.export.dialog.infoText1": "The entire transaction history within your wallet will be exported to a file.", "wallet.transaction.export.dialog.title": "Export transactions to file", "wallet.transaction.export.exportIcon.tooltip": "Export to file", + "wallet.transaction.fee": "Fee", "wallet.transaction.received": "{currency} received", "wallet.transaction.sent": "{currency} sent", "wallet.transaction.state.failed": "Transaction failed", diff --git a/app/i18n/locales/ja-JP.json b/app/i18n/locales/ja-JP.json index cc811bd179..5c0de6b6f5 100644 --- a/app/i18n/locales/ja-JP.json +++ b/app/i18n/locales/ja-JP.json @@ -229,11 +229,11 @@ "wallet.transaction.assuranceLevel.medium": "中", "wallet.transaction.confirmations": "確認", "wallet.transaction.conversion.rate": "コンバージョン率", - "wallet.transaction.fee": "手数料", "wallet.transaction.export.dialog.exportButton.label": "出力", "wallet.transaction.export.dialog.infoText1": "ウォレット内の全トランザクション歴がファイルに出力されます。", "wallet.transaction.export.dialog.title": "トランザクション歴をファイルに出力する", "wallet.transaction.export.exportIcon.tooltip": "ファイルに出力する", + "wallet.transaction.fee": "手数料", "wallet.transaction.received": "{currency} 受信済", "wallet.transaction.sent": "{currency} 送信済", "wallet.transaction.state.failed": "処理に失敗しました", diff --git a/app/i18n/locales/ko-KR.json b/app/i18n/locales/ko-KR.json index 5026ae3b0a..026d760425 100644 --- a/app/i18n/locales/ko-KR.json +++ b/app/i18n/locales/ko-KR.json @@ -229,11 +229,11 @@ "wallet.transaction.assuranceLevel.medium": "중간", "wallet.transaction.confirmations": "확인", "wallet.transaction.conversion.rate": "환율", - "wallet.transaction.fee": "수수료", "wallet.transaction.export.dialog.exportButton.label": "출력", "wallet.transaction.export.dialog.infoText1": "지갑의 전체 거래내역이 파일로 출력됩니다", "wallet.transaction.export.dialog.title": "거래내역을 파일로 출력", "wallet.transaction.export.exportIcon.tooltip": "파일로 출력", + "wallet.transaction.fee": "수수료", "wallet.transaction.received": "{currency} 받음", "wallet.transaction.sent": "{currency} 보냄", "wallet.transaction.state.failed": "거래 실패", diff --git a/app/i18n/locales/ru-RU.json b/app/i18n/locales/ru-RU.json index 869c113554..f016ab9597 100644 --- a/app/i18n/locales/ru-RU.json +++ b/app/i18n/locales/ru-RU.json @@ -229,11 +229,11 @@ "wallet.transaction.assuranceLevel.medium": "средний", "wallet.transaction.confirmations": "подтверждения", "wallet.transaction.conversion.rate": "Обменный курс", - "wallet.transaction.fee": "Комиссия", "wallet.transaction.export.dialog.exportButton.label": "Экспорт", "wallet.transaction.export.dialog.infoText1": "Вся история транзакций в Вашем кошельке будет экспортирована в файл.", "wallet.transaction.export.dialog.title": "Экспорт транзакций в файл", "wallet.transaction.export.exportIcon.tooltip": "Экспорт в файл", + "wallet.transaction.fee": "Комиссия", "wallet.transaction.received": "{currency} получено", "wallet.transaction.sent": "{currency} отправлено", "wallet.transaction.state.failed": "Не удалось провести транзакцию", diff --git a/app/i18n/locales/zh-Hans.json b/app/i18n/locales/zh-Hans.json index b07c023273..d20930effc 100644 --- a/app/i18n/locales/zh-Hans.json +++ b/app/i18n/locales/zh-Hans.json @@ -229,11 +229,11 @@ "wallet.transaction.assuranceLevel.medium": "中", "wallet.transaction.confirmations": "确认", "wallet.transaction.conversion.rate": "汇价", - "wallet.transaction.fee": "费用", "wallet.transaction.export.dialog.exportButton.label": "输出", "wallet.transaction.export.dialog.infoText1": "钱包中的所有交易记录将输出到文件中。", "wallet.transaction.export.dialog.title": "输出交易记录至文件", "wallet.transaction.export.exportIcon.tooltip": "输出文件", + "wallet.transaction.fee": "费用", "wallet.transaction.received": "已接收 {currency}", "wallet.transaction.sent": "已发送 {currency}", "wallet.transaction.state.failed": "交易失败", diff --git a/app/i18n/locales/zh-Hant.json b/app/i18n/locales/zh-Hant.json index 914e8b15ce..e8a5306010 100644 --- a/app/i18n/locales/zh-Hant.json +++ b/app/i18n/locales/zh-Hant.json @@ -227,17 +227,13 @@ "wallet.transaction.assuranceLevel.high": "高", "wallet.transaction.assuranceLevel.low": "低", "wallet.transaction.assuranceLevel.medium": "適中", - "wallet.transaction.export.dialog.exportButton.label": "輸出", - "wallet.transaction.export.dialog.infoText1": "錢包中的所有交易記錄將輸出到文件中。", - "wallet.transaction.export.dialog.title": "輸出交易記錄至文件", - "wallet.transaction.export.exportIcon.tooltip": "輸出文件", "wallet.transaction.confirmations": "確認", "wallet.transaction.conversion.rate": "匯率", - "wallet.transaction.fee": "費用", "wallet.transaction.export.dialog.exportButton.label": "輸出", "wallet.transaction.export.dialog.infoText1": "錢包中的所有交易記錄將輸出到文件中", "wallet.transaction.export.dialog.title": "輸出交易記錄至文件", "wallet.transaction.export.exportIcon.tooltip": "輸出文件", + "wallet.transaction.fee": "費用", "wallet.transaction.received": "已收到 {currency}", "wallet.transaction.sent": "已傳送 {currency}", "wallet.transaction.state.failed": "交易失敗", diff --git a/package-lock.json b/package-lock.json index 48f97aabb0..8808f03a0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2419,12 +2419,12 @@ "dev": true }, "babel-plugin-react-intl": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz", - "integrity": "sha1-PUORLoJNoAXgjo6COdW6eEN0uwA=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-3.0.1.tgz", + "integrity": "sha512-FqnEO+Tq7kJVUPKsSG3s5jaHi3pAC4RUR11IrscvjsfkOApLP2DtzNo6dtQ+tX+OzEzJx7cUms8aCw5BFyW5xg==", "dev": true, "requires": { - "babel-runtime": "6.3.19", + "@babel/runtime": "7.1.5", "intl-messageformat-parser": "1.4.0", "mkdirp": "0.5.1" } @@ -2635,15 +2635,6 @@ } } }, - "babel-runtime": { - "version": "6.3.19", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.3.19.tgz", - "integrity": "sha1-8ttpbDyMN5iB4qU2ZeAhhwdNxoE=", - "dev": true, - "requires": { - "core-js": "1.2.7" - } - }, "babel-template": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", diff --git a/package.json b/package.json index b281d127d4..9a46fb72dc 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "babel-eslint": "10.0.1", "babel-loader": "8.0.4", "babel-plugin-add-module-exports": "0.2.1", - "babel-plugin-react-intl": "2.3.1", + "babel-plugin-react-intl": "3.0.1", "babel-preset-react-optimize": "1.0.1", "chai": "3.2.0", "chromedriver": "2.40.0",