From 245ca449f61430c0a07e8b11b347372e525c6fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 28 Dec 2016 17:19:17 -0300 Subject: [PATCH] some translations fixes --- i18n/po/template.pot | 57 +++++++++++++--------- www/views/backupWarning.html | 2 +- www/views/includes/backupWarningPopup.html | 7 --- www/views/tab-home.html | 2 +- 4 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 www/views/includes/backupWarningPopup.html diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 37c106e1e..284ea705a 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -45,8 +45,8 @@ msgid "About" msgstr "" #: src/js/services/confirmDialog.js:8 +#: www/views/confirm.html:126 #: www/views/confirm.html:134 -#: www/views/confirm.html:144 #: www/views/modals/txp-details.html:169 #: www/views/modals/txp-details.html:176 msgid "Accept" @@ -93,7 +93,7 @@ msgstr "" msgid "Add Funds" msgstr "" -#: www/views/confirm.html:78 +#: www/views/confirm.html:72 msgid "Add Memo" msgstr "" @@ -157,10 +157,6 @@ msgstr "" msgid "All Addresses" msgstr "" -#: www/views/backupWarning.html:15 -msgid "All clear, let's do this" -msgstr "" - #: www/views/modals/wallet-balance.html:18 msgid "All of your bitcoin wallet balance may not be available for immediate spending." msgstr "" @@ -394,6 +390,7 @@ msgstr "" #: www/views/feedback/send.html:5 #: www/views/includes/confirm-tx.html:30 #: www/views/includes/note.html:6 +#: www/views/includes/password.html:22 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "" @@ -644,11 +641,8 @@ msgstr "" msgid "Create Shared Wallet" msgstr "" -#: www/views/tab-home.html:66 -msgid "Create a bitcoin wallet" -msgstr "" - #: www/views/onboarding/tour.html:46 +#: www/views/tab-home.html:66 #: www/views/tab-send.html:16 msgid "Create bitcoin wallet" msgstr "" @@ -832,6 +826,10 @@ msgstr "" msgid "Enter your password" msgstr "" +#: www/views/includes/password.html:8 +msgid "Enter your spending password" +msgstr "" + #. Trying to import a malformed wallet export QR code #: src/js/controllers/activity.js:45 #: src/js/controllers/addressbook.js:50 @@ -997,7 +995,7 @@ msgstr "" msgid "Family vacation funds" msgstr "" -#: www/views/confirm.html:85 +#: www/views/confirm.html:79 #: www/views/includes/confirm-tx.html:19 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:73 @@ -1110,7 +1108,7 @@ msgstr "" msgid "Go back" msgstr "" -#: www/views/includes/backupWarningPopup.html:4 +#: www/views/backupWarning.html:15 #: www/views/includes/confirmBackupPopup.html:8 msgid "Got it" msgstr "" @@ -1276,7 +1274,7 @@ msgid "Incorrect code format" msgstr "" #: src/js/services/bwcError.js:44 -#: www/views/confirm.html:122 +#: www/views/confirm.html:116 msgid "Insufficient funds" msgstr "" @@ -1526,7 +1524,7 @@ msgstr "" msgid "No wallet found!" msgstr "" -#: www/views/confirm.html:119 +#: www/views/confirm.html:113 msgid "No wallets available" msgstr "" @@ -1716,7 +1714,7 @@ msgstr "" msgid "Payment Rejected" msgstr "" -#: www/views/confirm.html:150 +#: www/views/confirm.html:140 #: www/views/includes/walletActivity.html:11 #: www/views/modals/txp-details.html:182 #: www/views/modals/txp-details.html:42 @@ -1827,7 +1825,7 @@ msgstr "" #: src/js/controllers/modals/txpDetails.js:38 #: src/js/controllers/tx-details.js:64 -#: www/views/confirm.html:151 +#: www/views/confirm.html:141 msgid "Proposal Created" msgstr "" @@ -1952,6 +1950,10 @@ msgstr "" msgid "Repeat the password" msgstr "" +#: www/views/includes/password.html:5 +msgid "Repeat the spending password" +msgstr "" + #: www/views/preferences.html:51 msgid "Request Fingerprint" msgstr "" @@ -1984,6 +1986,10 @@ msgstr "" msgid "Retry Camera" msgstr "" +#: www/views/includes/password.html:31 +msgid "SET" +msgstr "" + #: www/views/addressbook.add.html:56 #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 @@ -2017,7 +2023,6 @@ msgstr "" msgid "Scanning Wallet funds..." msgstr "" -#: www/views/includes/backupWarningPopup.html:2 #: www/views/includes/screenshotWarningModal.html:7 msgid "Screenshots are not secure" msgstr "" @@ -2153,6 +2158,10 @@ msgstr "" msgid "Set up a password" msgstr "" +#: www/views/includes/password.html:4 +msgid "Set up a spending password" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2499,7 +2508,7 @@ msgstr "" msgid "Transaction already broadcasted" msgstr "" -#: www/views/confirm.html:152 +#: www/views/confirm.html:142 msgid "Transaction created" msgstr "" @@ -2929,10 +2938,18 @@ msgstr "" msgid "Your password" msgstr "" +#: www/views/includes/password.html:12 +msgid "Your spending password" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "" +#: www/views/includes/password.html:39 +msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down" +msgstr "" + #: src/js/services/walletService.js:825 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." msgstr "" @@ -2949,10 +2966,6 @@ msgstr "" msgid "address not yet available" msgstr "" -#: www/views/includes/backupWarningPopup.html:3 -msgid "if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen." -msgstr "" - #: www/views/includes/available-balance.html:8 msgid "locked by pending payments" msgstr "" diff --git a/www/views/backupWarning.html b/www/views/backupWarning.html index 0f426c151..67848cca0 100644 --- a/www/views/backupWarning.html +++ b/www/views/backupWarning.html @@ -12,7 +12,7 @@
Anyone with your backup phrase can access or spend your bitcoin.
- +
diff --git a/www/views/includes/backupWarningPopup.html b/www/views/includes/backupWarningPopup.html deleted file mode 100644 index df7c0bcd9..000000000 --- a/www/views/includes/backupWarningPopup.html +++ /dev/null @@ -1,7 +0,0 @@ -
-

Screenshots are not secure

- if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen. - -
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 2cb7387dd..a0b17d7e6 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -63,7 +63,7 @@ - Create a bitcoin wallet + Create bitcoin wallet