From fcaf035369f0158560e957c106a56a27ab246e68 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Aug 2015 17:11:32 -0300 Subject: [PATCH] Updates templates.pot --- i18n/po/template.pot | 158 +++++++++++++++++++++++++------ public/views/includes/alert.html | 4 +- src/js/controllers/walletHome.js | 1 - 3 files changed, 132 insertions(+), 31 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index d7cd8e5e1..9df6cf09a 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -80,6 +80,10 @@ msgstr "" msgid "Amount" msgstr "" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -130,6 +134,10 @@ msgstr "" msgid "Backup options" msgstr "" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "" @@ -183,6 +191,10 @@ msgstr "" msgid "Cancel" msgstr "" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "" @@ -191,10 +203,6 @@ msgstr "" msgid "Changing wallet alias only affects the local wallet name." msgstr "" -#: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" -msgstr "" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "" @@ -231,6 +239,22 @@ msgstr "" msgid "Confirmations" msgstr "" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "" @@ -254,19 +278,19 @@ msgid "Copy to clipboard" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment" +msgstr "" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment" msgstr "" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "" - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +#: src/js/services/addressService.js +msgid "Could not create address" msgstr "" #: src/js/controllers/walletHome.js @@ -282,7 +306,7 @@ msgid "Could not decrypt file, check your password" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal" msgstr "" #: src/js/controllers/walletHome.js @@ -301,8 +325,8 @@ msgstr "" msgid "Could not join using the specified extended private key" msgstr "" -#: src/js/controllers/join.js -msgid "Could not join wallet:" +#: src/js/services/profileService.js +msgid "Could not join wallet" msgstr "" #: src/js/controllers/walletHome.js @@ -310,14 +334,14 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment" msgstr "" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "" @@ -430,12 +454,12 @@ msgstr "" msgid "Enter your password" msgstr "" -#: src/js/services/profileService.js -msgid "Error creating wallet" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" msgstr "" #: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" +msgid "Error creating wallet" msgstr "" #: src/js/services/profileService.js @@ -481,6 +505,10 @@ msgstr "" msgid "French" msgstr "" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "" @@ -578,10 +606,26 @@ msgstr "" msgid "Importing..." msgstr "" +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "" + #: public/views/walletHome.html msgid "Invalid" msgstr "" +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "" + #: src/js/controllers/copayers.js msgid "Invitation to share a Copay Wallet" msgstr "" @@ -623,6 +667,14 @@ msgstr "" msgid "Learn more about Wallet Migration" msgstr "" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "" @@ -671,6 +723,10 @@ msgstr "" msgid "Network" msgstr "" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "" @@ -687,6 +743,10 @@ msgstr "" msgid "Normal" msgstr "" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" @@ -698,6 +758,7 @@ msgstr "" msgid "Note" msgstr "" +#: public/views/includes/alert.html #: public/views/includes/password.html msgid "OK" msgstr "" @@ -822,6 +883,10 @@ msgstr "" msgid "Please enter the required fields" msgstr "" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "" @@ -906,6 +971,10 @@ msgstr "" msgid "Retrying..." msgstr "" +#: public/views/translators.html +msgid "Russian" +msgstr "" + #: public/views/includes/password.html msgid "SET" msgstr "" @@ -1026,6 +1095,10 @@ msgstr "" msgid "Show advanced options" msgstr "" +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "" + #: src/js/controllers/walletHome.js msgid "Signing payment" msgstr "" @@ -1038,6 +1111,14 @@ msgstr "" msgid "Spanish" msgstr "" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1062,7 +1143,7 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." +msgid "The payment was created but could not be signed. Please try again from home screen" msgstr "" #: public/views/modals/txp-details.html @@ -1070,7 +1151,7 @@ msgid "The payment was removed by creator" msgstr "" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" msgstr "" #: public/views/backup.html @@ -1081,6 +1162,10 @@ msgstr "" msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "" +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1126,6 +1211,10 @@ msgstr "" msgid "Transaction" msgstr "" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "" + #: public/views/translators.html msgid "Translation Credits" msgstr "" @@ -1164,10 +1253,6 @@ msgstr "" msgid "Use Unconfirmed Funds" msgstr "" -#: public/views/modals/txp-details.html -msgid "Uses unconfirmed funds" -msgstr "" - #: public/views/preferencesAbout.html msgid "Version" msgstr "" @@ -1212,6 +1297,7 @@ msgstr "" msgid "Wallet Invitation is not valid!" msgstr "" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "" @@ -1220,18 +1306,34 @@ msgstr "" msgid "Wallet incomplete and broken" msgstr "" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "" + #: public/views/create.html msgid "Wallet name" msgstr "" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" msgstr "" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "" diff --git a/public/views/includes/alert.html b/public/views/includes/alert.html index 2c9ed4b85..a3a25ee4d 100644 --- a/public/views/includes/alert.html +++ b/public/views/includes/alert.html @@ -3,12 +3,12 @@
-
+
{{index.showAlert.msg|translate}}
- OK + OK
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 3c7ae8c5a..bb7df5bf7 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -724,7 +724,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { if (err) $log.debug(err); - console.log('[walletHome.js.757:amount:]', amount, feePerKb); //TODO fc.sendTxProposal({ toAddress: address, amount: amount,