From d842a9f8effdec1fd4ec78263419bf1f1cfc6a02 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 11 Nov 2015 14:11:35 -0300 Subject: [PATCH] Fixes strings and prepares to translation --- i18n/po/template.pot | 100 ++++++++++++++--------- public/views/import.html | 2 +- public/views/preferencesInformation.html | 4 +- public/views/walletHome.html | 8 +- src/js/controllers/create.js | 4 +- src/js/controllers/import.js | 4 +- src/js/controllers/join.js | 4 +- 7 files changed, 75 insertions(+), 51 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index e5f45367b..820d7c691 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -17,7 +17,7 @@ msgid "{{fee}} will be deducted for bitcoin networking fees" msgstr "" #: public/views/copayers.html -#: public/views/walletHome.html +#: public/views/includes/walletInfo.html msgid "{{index.m}}-of-{{index.n}}" msgstr "" @@ -65,6 +65,16 @@ msgstr "" msgid "Accept" msgstr "" +#: public/views/join.html +#: public/views/preferencesInformation.html +msgid "Account" +msgstr "" + +#: public/views/create.html +#: public/views/import.html +msgid "Account Number" +msgstr "" + #: public/views/modals/destination-address.html msgid "Add a new entry" msgstr "" @@ -195,6 +205,12 @@ msgstr "" msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "" +#: public/views/create.html +#: public/views/import.html +#: public/views/join.html +msgid "BIP32 path for address derivation" +msgstr "" + #: public/views/walletHome.html msgid "Bitcoin address" msgstr "" @@ -264,7 +280,6 @@ msgstr "" #: public/views/includes/topbar.html #: public/views/modals/advancedSend.html -#: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/destination-address.html #: public/views/modals/paypro.html @@ -315,7 +330,7 @@ msgstr "" msgid "Copayer data mismatch" msgstr "" -#: public/views/modals/copayers.html +#: public/views/preferencesInformation.html msgid "Copayers" msgstr "" @@ -483,6 +498,12 @@ msgstr "" msgid "Deleting payment" msgstr "" +#: public/views/create.html +#: public/views/import.html +#: public/views/join.html +msgid "Derivation Path" +msgstr "" + #: public/views/preferencesInformation.html msgid "Derivation Strategy" msgstr "" @@ -538,6 +559,10 @@ msgstr "" msgid "Email Notifications" msgstr "" +#: src/js/services/bwsError.js +msgid "Empty addresses limit reached. New addresses cannot be generated." +msgstr "" + #: src/js/controllers/export.js msgid "Encrypted export file saved" msgstr "" @@ -580,10 +605,6 @@ msgstr "" msgid "Extended Public Keys" msgstr "" -#: public/views/includes/walletInfo.html -msgid "External Private Key:" -msgstr "" - #: public/views/export.html msgid "Failed to export" msgstr "" @@ -678,10 +699,6 @@ msgstr "" msgid "Hardware wallet" msgstr "" -#: public/views/import.html -msgid "Hardware Wallet" -msgstr "" - #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "" @@ -719,18 +736,10 @@ msgstr "" msgid "Import backup" msgstr "" -#: public/views/import.html -msgid "Import from Ledger" -msgstr "" - #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "" -#: public/views/import.html -msgid "Import from TREZOR" -msgstr "" - #: public/views/import.html msgid "Import here" msgstr "" @@ -773,10 +782,22 @@ msgstr "" msgid "Invalid" msgstr "" +#: src/js/controllers/create.js +#: src/js/controllers/import.js +#: src/js/controllers/join.js +msgid "Invalid account number" +msgstr "" + #: src/js/services/bwsError.js msgid "Invalid address" msgstr "" +#: src/js/controllers/create.js +#: src/js/controllers/import.js +#: src/js/controllers/join.js +msgid "Invalid derivation path" +msgstr "" + #: src/js/controllers/index.js msgid "Invalid Touch ID" msgstr "" @@ -862,8 +883,8 @@ msgstr "" msgid "me" msgstr "" +#: public/views/preferencesInformation.html #: public/views/includes/copayers.html -#: public/views/modals/copayers.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Me" @@ -885,8 +906,8 @@ msgstr "" msgid "Moved" msgstr "" -#: public/views/walletHome.html -msgid "Multisignature wallet" +#: public/views/join.html +msgid "Multiple wallets accounts are supported on the device simultaneously. Select which account should be used for this wallet" msgstr "" #: public/views/walletHome.html @@ -905,8 +926,13 @@ msgstr "" msgid "New Payment Proposal" msgstr "" -#: public/views/includes/walletInfo.html -msgid "No Private key" +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "New Random Seed" +msgstr "" + +#: public/views/import.html +msgid "No harware wallets supported on this device" msgstr "" #: public/views/walletHome.html @@ -1346,6 +1372,7 @@ msgid "Share this wallet address to receive payments. To protect your privacy, n msgstr "" #: public/views/create.html +#: public/views/import.html msgid "Shared Wallet" msgstr "" @@ -1356,6 +1383,10 @@ msgstr "" msgid "Show advanced options" msgstr "" +#: public/views/walletHome.html +msgid "Show all" +msgstr "" + #: public/views/backup.html msgid "Show Wallet Seed" msgstr "" @@ -1376,9 +1407,9 @@ msgstr "" msgid "Spanish" msgstr "" -#: public/views/create.html -#: public/views/join.html -msgid "Specify your wallet seed" +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Specify Seed..." msgstr "" #: src/js/services/bwsError.js @@ -1422,7 +1453,6 @@ msgid "Terms of Use" msgstr "" #: public/views/create.html -#: public/views/import.html msgid "Testnet" msgstr "" @@ -1540,6 +1570,10 @@ msgstr "" msgid "Transaction history" msgstr "" +#: public/views/walletHome.html +msgid "Transactions
Downloaded" +msgstr "" + #: public/views/translators.html msgid "Translation Credits" msgstr "" @@ -1573,16 +1607,6 @@ msgstr "" msgid "Updating Wallet..." msgstr "" -#: public/views/create.html -#: public/views/join.html -msgid "Use Ledger hardware wallet" -msgstr "" - -#: public/views/create.html -#: public/views/join.html -msgid "Use TREZOR hardware wallet" -msgstr "" - #: public/views/preferences.html #: public/views/walletHome.html msgid "Use Unconfirmed Funds" diff --git a/public/views/import.html b/public/views/import.html index 03f6e7fd7..8fa1dffb2 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -39,7 +39,7 @@ File/Text Backup
- Hardware Wallet + Hardware Wallet
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index eb510141c..1ca38d889 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -56,7 +56,7 @@
  • - Hardware Wallet + Hardware Wallet {{index.externalSource}} @@ -70,7 +70,7 @@
  • - Account ({{derivationStrategy}}) + Account ({{derivationStrategy}}) #{{index.account}} diff --git a/public/views/walletHome.html b/public/views/walletHome.html index b91cde671..540a60314 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -469,9 +469,9 @@ Initial transaction history synchronization can take some minutes for wallets with many transactions.
    Please stand by. -
    - {{index.txProgress}} Transactions
    - Downloaded +
    + {{index.txProgress}} + Transactions
    Downloaded
    @@ -534,7 +534,7 @@
    diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 490cbd82c..1fcb16d08 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -54,13 +54,13 @@ angular.module('copayApp.controllers').controller('createController', if (n > 1 && isChromeApp) self.seedOptions.push({ id: 'ledger', - label: gettext('Ledger Hardware Wallet'), + label: 'Ledger Hardware Wallet', }); if (isChromeApp || isDevel) { self.seedOptions.push({ id: 'trezor', - label: gettext('Trezor Hardware Wallet'), + label: 'Trezor Hardware Wallet', }); } }; diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index f89c3dd21..50ea3b01b 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -23,14 +23,14 @@ angular.module('copayApp.controllers').controller('importController', if (isChromeApp) { self.seedOptions.push({ id: 'ledger', - label: gettext('Ledger Hardware Wallet'), + label: 'Ledger Hardware Wallet', }); } if (isChromeApp || isDevel) { self.seedOptions.push({ id: 'trezor', - label: gettext('Trezor Hardware Wallet'), + label: 'Trezor Hardware Wallet', }); $scope.seedSource = self.seedOptions[0]; } diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 31ae0158d..8ab7386f2 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -29,14 +29,14 @@ angular.module('copayApp.controllers').controller('joinController', if (isChromeApp) { self.seedOptions.push({ id: 'ledger', - label: gettext('Ledger Hardware Wallet'), + label: 'Ledger Hardware Wallet', }); } if (isChromeApp || isDevel) { self.seedOptions.push({ id: 'trezor', - label: gettext('Trezor Hardware Wallet'), + label: 'Trezor Hardware Wallet', }); } };