Merge pull request #5213 from cmgustavo/translation/updates-po-01

Translation/updates po 01
This commit is contained in:
Gabriel Edgardo Bazán 2016-12-13 10:47:42 -03:00 committed by GitHub
commit 155fb6c239
8 changed files with 4049 additions and 2347 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -22,7 +22,7 @@ msgstr ""
msgid "5-star ratings help us get BitPay into more hands, and more users means more resources can be committed to the app!" msgid "5-star ratings help us get BitPay into more hands, and more users means more resources can be committed to the app!"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:455 #: src/js/controllers/confirm.js:454
msgid "A SMS containing a confirmation code was sent to your phone." msgid "A SMS containing a confirmation code was sent to your phone."
msgstr "" msgstr ""
@ -31,16 +31,16 @@ msgstr ""
msgid "A member of the team will review your feedback as soon as possible." msgid "A member of the team will review your feedback as soon as possible."
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:213 #: src/js/controllers/confirm.js:212
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:207 #: src/js/controllers/confirm.js:206
msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
msgstr "" msgstr ""
#: src/js/controllers/preferencesAbout.js:6 #: src/js/controllers/preferencesAbout.js:6
#: www/views/tab-settings.html:161 #: www/views/tab-settings.html:159
msgid "About" msgid "About"
msgstr "" msgstr ""
@ -89,7 +89,7 @@ msgstr ""
msgid "Add Funds" msgid "Add Funds"
msgstr "" msgstr ""
#: www/views/confirm.html:71 #: www/views/confirm.html:72
msgid "Add Memo" msgid "Add Memo"
msgstr "" msgstr ""
@ -112,7 +112,7 @@ msgstr ""
msgid "Add an optional password to secure the recovery phrase" msgid "Add an optional password to secure the recovery phrase"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:267 #: src/js/controllers/confirm.js:266
msgid "Add description" msgid "Add description"
msgstr "" msgstr ""
@ -140,7 +140,7 @@ msgstr ""
msgid "Addresses With Balance" msgid "Addresses With Balance"
msgstr "" msgstr ""
#: www/views/tab-settings.html:154 #: www/views/tab-settings.html:152
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
@ -173,7 +173,7 @@ msgid "Almost done! Let's review."
msgstr "" msgstr ""
#: www/views/preferencesAltCurrency.html:4 #: www/views/preferencesAltCurrency.html:4
#: www/views/tab-settings.html:83 #: www/views/tab-settings.html:81
msgid "Alternative Currency" msgid "Alternative Currency"
msgstr "" msgstr ""
@ -294,7 +294,7 @@ msgid "Bitcoin Exchanges"
msgstr "" msgstr ""
#: www/views/preferencesFee.html:4 #: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:94 #: www/views/tab-settings.html:92
msgid "Bitcoin Network Fee Policy" msgid "Bitcoin Network Fee Policy"
msgstr "" msgstr ""
@ -302,7 +302,7 @@ msgstr ""
msgid "Bitcoin URI is NOT valid!" msgid "Bitcoin URI is NOT valid!"
msgstr "" msgstr ""
#: www/views/tab-settings.html:72 #: www/views/tab-settings.html:70
msgid "Bitcoin Unit" msgid "Bitcoin Unit"
msgstr "" msgstr ""
@ -367,7 +367,7 @@ msgstr ""
msgid "Calculating fee" msgid "Calculating fee"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:511 #: src/js/controllers/confirm.js:510
#: src/js/services/confirmDialog.js:9 #: src/js/services/confirmDialog.js:9
#: src/js/services/popupService.js:58 #: src/js/services/popupService.js:58
#: www/views/addressbook.add.html:10 #: www/views/addressbook.add.html:10
@ -400,10 +400,6 @@ msgstr ""
msgid "Certified by" msgid "Certified by"
msgstr "" msgstr ""
#: www/views/translators.html:18
msgid "Chinese"
msgstr ""
#: www/views/tab-import-file.html:4 #: www/views/tab-import-file.html:4
msgid "Choose a backup file from your computer" msgid "Choose a backup file from your computer"
msgstr "" msgstr ""
@ -437,7 +433,7 @@ msgstr ""
msgid "Commit hash" msgid "Commit hash"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:510 #: src/js/controllers/confirm.js:509
#: src/js/controllers/copayers.js:42 #: src/js/controllers/copayers.js:42
#: src/js/services/confirmDialog.js:10 #: src/js/services/confirmDialog.js:10
#: www/views/backup.html:53 #: www/views/backup.html:53
@ -493,8 +489,8 @@ msgstr ""
msgid "Continue" msgid "Continue"
msgstr "" msgstr ""
#: www/views/preferencesLanguage.html:17 #: www/views/preferencesLanguage.html:26
#: www/views/translators.html:25 #: www/views/translators.html:33
msgid "Contribute Translations" msgid "Contribute Translations"
msgstr "" msgstr ""
@ -581,7 +577,7 @@ msgstr ""
msgid "Could not get dynamic fee for level: {{feeLevel}}" msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:656 #: src/js/controllers/confirm.js:655
msgid "Could not get the destination bitcoin address" msgid "Could not get the destination bitcoin address"
msgstr "" msgstr ""
@ -612,7 +608,7 @@ msgstr ""
msgid "Could not remove card" msgid "Could not remove card"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:450 #: src/js/controllers/confirm.js:449
msgid "Could not send confirmation code to your phone" msgid "Could not send confirmation code to your phone"
msgstr "" msgstr ""
@ -677,10 +673,6 @@ msgstr ""
msgid "Custom Amount" msgid "Custom Amount"
msgstr "" msgstr ""
#: www/views/translators.html:20
msgid "Czech"
msgstr ""
#: www/views/preferencesDeleteWallet.html:21 #: www/views/preferencesDeleteWallet.html:21
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -731,8 +723,8 @@ msgstr ""
msgid "Do not include private key" msgid "Do not include private key"
msgstr "" msgstr ""
#: www/views/preferencesLanguage.html:20 #: www/views/preferencesLanguage.html:21
#: www/views/translators.html:29 #: www/views/translators.html:28
msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language."
msgstr "" msgstr ""
@ -846,33 +838,33 @@ msgstr ""
#: src/js/controllers/amazon.js:25 #: src/js/controllers/amazon.js:25
#: src/js/controllers/amazon.js:46 #: src/js/controllers/amazon.js:46
#: src/js/controllers/amazon.js:66 #: src/js/controllers/amazon.js:66
#: src/js/controllers/amount.js:251 #: src/js/controllers/amount.js:265
#: src/js/controllers/amount.js:258 #: src/js/controllers/amount.js:272
#: src/js/controllers/amount.js:266 #: src/js/controllers/amount.js:280
#: src/js/controllers/amount.js:295 #: src/js/controllers/amount.js:309
#: src/js/controllers/amount.js:308 #: src/js/controllers/amount.js:322
#: src/js/controllers/amount.js:315 #: src/js/controllers/amount.js:329
#: src/js/controllers/amount.js:324 #: src/js/controllers/amount.js:338
#: src/js/controllers/bitpayCard.js:145 #: src/js/controllers/bitpayCard.js:145
#: src/js/controllers/bitpayCard.js:68 #: src/js/controllers/bitpayCard.js:68
#: src/js/controllers/bitpayCardIntro.js:27 #: src/js/controllers/bitpayCardIntro.js:27
#: src/js/controllers/confirm.js:153 #: src/js/controllers/confirm.js:152
#: src/js/controllers/confirm.js:166 #: src/js/controllers/confirm.js:165
#: src/js/controllers/confirm.js:172 #: src/js/controllers/confirm.js:171
#: src/js/controllers/confirm.js:450 #: src/js/controllers/confirm.js:449
#: src/js/controllers/confirm.js:461 #: src/js/controllers/confirm.js:460
#: src/js/controllers/confirm.js:473 #: src/js/controllers/confirm.js:472
#: src/js/controllers/confirm.js:622 #: src/js/controllers/confirm.js:621
#: src/js/controllers/confirm.js:650 #: src/js/controllers/confirm.js:649
#: src/js/controllers/confirm.js:656 #: src/js/controllers/confirm.js:655
#: src/js/controllers/confirm.js:684 #: src/js/controllers/confirm.js:683
#: src/js/controllers/confirm.js:690 #: src/js/controllers/confirm.js:689
#: src/js/controllers/confirm.js:697 #: src/js/controllers/confirm.js:696
#: src/js/controllers/confirm.js:704 #: src/js/controllers/confirm.js:703
#: src/js/controllers/confirm.js:722 #: src/js/controllers/confirm.js:721
#: src/js/controllers/confirm.js:741 #: src/js/controllers/confirm.js:740
#: src/js/controllers/confirm.js:755 #: src/js/controllers/confirm.js:754
#: src/js/controllers/confirm.js:798 #: src/js/controllers/confirm.js:797
#: src/js/controllers/copayers.js:54 #: src/js/controllers/copayers.js:54
#: src/js/controllers/create.js:101 #: src/js/controllers/create.js:101
#: src/js/controllers/create.js:129 #: src/js/controllers/create.js:129
@ -932,7 +924,7 @@ msgstr ""
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:354 #: src/js/controllers/confirm.js:353
msgid "Error at confirm" msgid "Error at confirm"
msgstr "" msgstr ""
@ -956,8 +948,8 @@ msgstr ""
msgid "Experimental Features" msgid "Experimental Features"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:312 #: src/js/controllers/confirm.js:311
#: www/views/confirm.html:29 #: www/views/confirm.html:30
#: www/views/modals/txp-details.html:114 #: www/views/modals/txp-details.html:114
msgid "Expired" msgid "Expired"
msgstr "" msgstr ""
@ -1012,7 +1004,7 @@ msgstr ""
msgid "Fee" msgid "Fee"
msgstr "" msgstr ""
#: www/views/confirm.html:78 #: www/views/confirm.html:79
msgid "Fee: {{feeLevel}}" msgid "Fee: {{feeLevel}}"
msgstr "" msgstr ""
@ -1052,8 +1044,8 @@ msgstr ""
msgid "French" msgid "French"
msgstr "" msgstr ""
#: www/views/confirm.html:59 #: www/views/confirm.html:60
#: www/views/confirm.html:61 #: www/views/confirm.html:62
#: www/views/modals/txp-details.html:74 #: www/views/modals/txp-details.html:74
#: www/views/tx-details.html:48 #: www/views/tx-details.html:48
msgid "From" msgid "From"
@ -1083,10 +1075,6 @@ msgstr ""
msgid "Generating new address..." msgid "Generating new address..."
msgstr "" msgstr ""
#: www/views/translators.html:14
msgid "German"
msgstr ""
#: www/views/bitpayCardIntro.html:23 #: www/views/bitpayCardIntro.html:23
msgid "Get local cash anywhere you go, from any Visa<sup>&reg;</sup> compatible ATM. ATM bank fees may apply." msgid "Get local cash anywhere you go, from any Visa<sup>&reg;</sup> compatible ATM. ATM bank fees may apply."
msgstr "" msgstr ""
@ -1137,7 +1125,7 @@ msgid "Have the OAuth Code?"
msgstr "" msgstr ""
#: www/views/tab-settings.html:27 #: www/views/tab-settings.html:27
msgid "Help &amp; Support" msgid "Help & Support"
msgstr "" msgstr ""
#: www/views/addresses.html:29 #: www/views/addresses.html:29
@ -1158,6 +1146,10 @@ msgstr ""
msgid "Hide advanced options" msgid "Hide advanced options"
msgstr "" msgstr ""
#: www/views/tabs.html:3
msgid "Home"
msgstr ""
#: src/js/controllers/feedback/send.js:55 #: src/js/controllers/feedback/send.js:55
#: src/js/controllers/feedback/send.js:59 #: src/js/controllers/feedback/send.js:59
#: src/js/controllers/feedback/send.js:63 #: src/js/controllers/feedback/send.js:63
@ -1271,7 +1263,7 @@ msgstr ""
#: www/views/includes/walletSelector.html:18 #: www/views/includes/walletSelector.html:18
#: www/views/tab-home.html:79 #: www/views/tab-home.html:79
#: www/views/tab-settings.html:115 #: www/views/tab-settings.html:114
msgid "Incomplete" msgid "Incomplete"
msgstr "" msgstr ""
@ -1289,7 +1281,7 @@ msgid "Incorrect code format"
msgstr "" msgstr ""
#: src/js/services/bwcError.js:44 #: src/js/services/bwcError.js:44
#: www/views/confirm.html:115 #: www/views/confirm.html:116
msgid "Insufficient funds" msgid "Insufficient funds"
msgstr "" msgstr ""
@ -1346,14 +1338,6 @@ msgstr ""
msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again." msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again."
msgstr "" msgstr ""
#: www/views/translators.html:17
msgid "Italian"
msgstr ""
#: www/views/translators.html:12
msgid "Japanese"
msgstr ""
#: www/views/join.html:18 #: www/views/join.html:18
msgid "John" msgid "John"
msgstr "" msgstr ""
@ -1384,6 +1368,7 @@ msgid "Key already associated with an existing wallet"
msgstr "" msgstr ""
#: www/views/preferencesLanguage.html:4 #: www/views/preferencesLanguage.html:4
#: www/views/tab-settings.html:60
msgid "Language" msgid "Language"
msgstr "" msgstr ""
@ -1533,11 +1518,11 @@ msgstr ""
msgid "No transactions yet" msgid "No transactions yet"
msgstr "" msgstr ""
#: src/js/controllers/amount.js:295 #: src/js/controllers/amount.js:309
msgid "No wallet found!" msgid "No wallet found!"
msgstr "" msgstr ""
#: www/views/confirm.html:112 #: www/views/confirm.html:113
msgid "No wallets available" msgid "No wallets available"
msgstr "" msgstr ""
@ -1553,7 +1538,7 @@ msgstr ""
msgid "Not authorized" msgid "Not authorized"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:172 #: src/js/controllers/confirm.js:171
msgid "Not enough funds for fee" msgid "Not enough funds for fee"
msgstr "" msgstr ""
@ -1654,7 +1639,7 @@ msgstr ""
msgid "Payment Accepted" msgid "Payment Accepted"
msgstr "" msgstr ""
#: www/views/confirm.html:27 #: www/views/confirm.html:28
msgid "Payment Expires:" msgid "Payment Expires:"
msgstr "" msgstr ""
@ -1754,7 +1739,7 @@ msgstr ""
msgid "Please upgrade Copay to perform this action" msgid "Please upgrade Copay to perform this action"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:454 #: src/js/controllers/confirm.js:453
msgid "Please, enter the code below" msgid "Please, enter the code below"
msgstr "" msgstr ""
@ -1762,10 +1747,6 @@ msgstr ""
msgid "Please, select your backup file" msgid "Please, select your backup file"
msgstr "" msgstr ""
#: www/views/translators.html:19
msgid "Polish"
msgstr ""
#: www/views/tab-settings.html:47 #: www/views/tab-settings.html:47
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
@ -1849,6 +1830,7 @@ msgid "Read more"
msgstr "" msgstr ""
#: www/views/tab-receive.html:3 #: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive" msgid "Receive"
msgstr "" msgstr ""
@ -1861,7 +1843,12 @@ msgstr ""
msgid "Received Funds" msgid "Received Funds"
msgstr "" msgstr ""
#: www/views/walletDetails.html:242
msgid "Receiving"
msgstr ""
#: www/views/bitpayCard.html:55 #: www/views/bitpayCard.html:55
#: www/views/walletDetails.html:199
msgid "Recent" msgid "Recent"
msgstr "" msgstr ""
@ -1949,10 +1936,6 @@ msgstr ""
msgid "Retry" msgid "Retry"
msgstr "" msgstr ""
#: www/views/translators.html:16
msgid "Russian"
msgstr ""
#: www/views/includes/password.html:31 #: www/views/includes/password.html:31
msgid "SET" msgid "SET"
msgstr "" msgstr ""
@ -1966,6 +1949,7 @@ msgid "Save"
msgstr "" msgstr ""
#: www/views/tab-scan.html:3 #: www/views/tab-scan.html:3
#: www/views/tabs.html:11
msgid "Scan" msgid "Scan"
msgstr "" msgstr ""
@ -2029,6 +2013,7 @@ msgstr ""
#: www/views/feedback/send.html:13 #: www/views/feedback/send.html:13
#: www/views/feedback/send.html:43 #: www/views/feedback/send.html:43
#: www/views/tab-send.html:3 #: www/views/tab-send.html:3
#: www/views/tabs.html:15
msgid "Send" msgid "Send"
msgstr "" msgstr ""
@ -2054,7 +2039,7 @@ msgstr ""
msgid "Send by email" msgid "Send by email"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:248 #: src/js/controllers/confirm.js:247
msgid "Send from" msgid "Send from"
msgstr "" msgstr ""
@ -2069,6 +2054,7 @@ msgstr ""
#: www/views/confirm.html:15 #: www/views/confirm.html:15
#: www/views/includes/txp.html:14 #: www/views/includes/txp.html:14
#: www/views/modals/txp-details.html:19 #: www/views/modals/txp-details.html:19
#: www/views/walletDetails.html:241
msgid "Sending" msgid "Sending"
msgstr "" msgstr ""
@ -2088,7 +2074,7 @@ msgstr ""
msgid "Sending transaction" msgid "Sending transaction"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:506 #: src/js/controllers/confirm.js:505
msgid "Sending {{amountStr}} from your {{name}} wallet" msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "" msgstr ""
@ -2123,11 +2109,13 @@ msgid "Set up a spending password"
msgstr "" msgstr ""
#: www/views/tab-settings.html:3 #: www/views/tab-settings.html:3
#: www/views/tabs.html:19
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: www/views/customAmount.html:20 #: www/views/customAmount.html:20
#: www/views/tab-receive.html:70 #: www/views/tab-receive.html:70
#: www/views/tab-settings.html:43
msgid "Share" msgid "Share"
msgstr "" msgstr ""
@ -2148,10 +2136,6 @@ msgstr ""
msgid "Share this invitation with your copayers" msgid "Share this invitation with your copayers"
msgstr "" msgstr ""
#: www/views/tab-settings.html:43
msgid "Share {{appName}}"
msgstr ""
#: www/views/tab-import-hardware.html:24 #: www/views/tab-import-hardware.html:24
msgid "Shared Wallet" msgid "Shared Wallet"
msgstr "" msgstr ""
@ -2259,7 +2243,7 @@ msgstr ""
msgid "Tap to retry" msgid "Tap to retry"
msgstr "" msgstr ""
#: www/views/tab-settings.html:144 #: www/views/tab-settings.html:142
msgid "Tell a friend" msgid "Tell a friend"
msgstr "" msgstr ""
@ -2387,7 +2371,7 @@ msgstr ""
msgid "This app stores your bitcoin with cutting-edge security." msgid "This app stores your bitcoin with cutting-edge security."
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:439 #: src/js/controllers/confirm.js:438
msgid "This bitcoin payment request has expired." msgid "This bitcoin payment request has expired."
msgstr "" msgstr ""
@ -2411,8 +2395,8 @@ msgstr ""
msgid "Timeline" msgid "Timeline"
msgstr "" msgstr ""
#: www/views/confirm.html:32 #: www/views/confirm.html:33
#: www/views/confirm.html:60 #: www/views/confirm.html:61
#: www/views/includes/output.html:2 #: www/views/includes/output.html:2
#: www/views/modals/txp-details.html:104 #: www/views/modals/txp-details.html:104
#: www/views/modals/txp-details.html:53 #: www/views/modals/txp-details.html:53
@ -2469,6 +2453,7 @@ msgstr ""
msgid "Translation Credits" msgid "Translation Credits"
msgstr "" msgstr ""
#: www/views/preferencesAbout.html:35
#: www/views/translators.html:3 #: www/views/translators.html:3
msgid "Translators" msgid "Translators"
msgstr "" msgstr ""
@ -2685,6 +2670,7 @@ msgid "Wallet needs backup"
msgstr "" msgstr ""
#: www/views/tab-receive.html:56 #: www/views/tab-receive.html:56
#: www/views/walletDetails.html:145
msgid "Wallet not backed up" msgid "Wallet not backed up"
msgstr "" msgstr ""
@ -2712,8 +2698,8 @@ msgstr ""
msgid "Wallets" msgid "Wallets"
msgstr "" msgstr ""
#: www/views/tab-settings.html:101 #: www/views/tab-settings.html:99
msgid "Wallets &amp; Integrations" msgid "Wallets & Integrations"
msgstr "" msgstr ""
#: src/js/controllers/modals/txpDetails.js:126 #: src/js/controllers/modals/txpDetails.js:126
@ -2744,7 +2730,7 @@ msgid "We're always looking for ways to improve BitPay. How could we improve you
msgstr "" msgstr ""
#: www/views/preferencesLanguage.html:16 #: www/views/preferencesLanguage.html:16
#: www/views/translators.html:24 #: www/views/translators.html:23
msgid "Were always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgid "Were always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin."
msgstr "" msgstr ""
@ -2867,6 +2853,7 @@ msgid "Your wallet key will be encrypted. The Spending Password cannot be recove
msgstr "" msgstr ""
#: www/views/includes/walletSelector.html:23 #: www/views/includes/walletSelector.html:23
#: www/views/includes/wallets.html:13
#: www/views/tab-home.html:84 #: www/views/tab-home.html:84
#: www/views/walletDetails.html:127 #: www/views/walletDetails.html:127
#: www/views/walletDetails.html:69 #: www/views/walletDetails.html:69
@ -2897,7 +2884,7 @@ msgstr ""
msgid "{{feeRateStr}} of the transaction" msgid "{{feeRateStr}} of the transaction"
msgstr "" msgstr ""
#: src/js/controllers/confirm.js:186 #: src/js/controllers/confirm.js:185
msgid "{{fee}} will be deducted for bitcoin networking fees." msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "" msgstr ""

View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesLanguageController', angular.module('copayApp.controllers').controller('preferencesLanguageController',
function($scope, $log, $ionicHistory, gettextCatalog, configService, profileService, uxLanguage, walletService, externalLinkService) { function($scope, $log, $ionicHistory, configService, profileService, uxLanguage, walletService, externalLinkService) {
$scope.availableLanguages = uxLanguage.getLanguages(); $scope.availableLanguages = uxLanguage.getLanguages();
@ -24,19 +24,18 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
} }
}; };
uxLanguage._set(newLang);
configService.set(opts, function(err) { configService.set(opts, function(err) {
if (err) $log.warn(err); if (err) $log.warn(err);
walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
$ionicHistory.goBack(); $log.debug('Remote preferences saved');
uxLanguage.init(function() {
walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
$log.debug('Remote preferences saved');
});
}); });
}); });
$ionicHistory.goBack();
}; };
$scope.$on("$ionicView.enter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.currentLanguage = uxLanguage.getCurrentLanguage(); $scope.currentLanguage = uxLanguage.getCurrentLanguage();
}); });
}); });

View file

@ -3,8 +3,6 @@
angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, gettextCatalog) { angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, gettextCatalog) {
var updateConfig = function() { var updateConfig = function() {
var config = configService.getSync();
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;
var isWindowsPhoneApp = platformInfo.isWP && isCordova; var isWindowsPhoneApp = platformInfo.isWP && isCordova;
@ -13,21 +11,39 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.isCordova = isCordova; $scope.isCordova = isCordova;
$scope.appName = $window.appConfig.nameCase; $scope.appName = $window.appConfig.nameCase;
$scope.unitName = config.wallet.settings.unitName;
$scope.currentLanguageName = uxLanguage.getCurrentLanguageName(); $scope.currentLanguageName = uxLanguage.getCurrentLanguageName();
$scope.selectedAlternative = {
name: config.wallet.settings.alternativeName,
isoCode: config.wallet.settings.alternativeIsoCode
};
$scope.feeOpts = feeService.feeOpts; $scope.feeOpts = feeService.feeOpts;
$scope.currentFeeLevel = feeService.getCurrentFeeLevel(); $scope.currentFeeLevel = feeService.getCurrentFeeLevel();
$scope.wallets = profileService.getWallets(); $scope.wallets = profileService.getWallets();
configService.whenAvailable(function(config) {
$scope.unitName = config.wallet.settings.unitName;
$scope.selectedAlternative = {
name: config.wallet.settings.alternativeName,
isoCode: config.wallet.settings.alternativeIsoCode
};
$scope.bitpayCardEnabled = config.bitpayCard.enabled; $scope.bitpayCardEnabled = config.bitpayCard.enabled;
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; if ($scope.bitpayCardEnabled) {
bitpayCardService.getBitpayDebitCards(function(err, data) {
if (err) $log.error(err);
if (!lodash.isEmpty(data)) {
$scope.bitpayCards = true;
}
});
}
if ($scope.glideraEnabled) {
storageService.getGlideraToken(glideraService.getEnvironment(), function(err, token) {
if (err) $log.error(err);
$scope.glideraToken = token;
});
}
});
}; };
$scope.openExternalLink = function() { $scope.openExternalLink = function() {
@ -42,18 +58,6 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
updateConfig(); updateConfig();
bitpayCardService.getBitpayDebitCards(function(err, data) {
if (err) $log.error(err);
if (!lodash.isEmpty(data)) {
$scope.bitpayCards = true;
}
});
storageService.getGlideraToken(glideraService.getEnvironment(), function(err, token) {
if (err) $log.error(err);
$scope.glideraToken = token;
});
}); });
}); });

View file

@ -10,54 +10,54 @@
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-exchange.svg" class="bg"/> <img src="img/icon-exchange.svg" class="bg"/>
</i> </i>
<span translate>Bitcoin Exchanges</span> <span>{{'Bitcoin Exchanges' | translate}}</span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item item-icon-left item-icon-right" ui-sref="tabs.addressbook"> <a class="item item-icon-left item-icon-right" ui-sref="tabs.addressbook">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-address-book.svg" class="bg"/> <img src="img/icon-address-book.svg" class="bg"/>
</i> </i>
<span translate>Address Book</span> <span>{{'Address Book' | translate}}</span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item item-icon-left item-icon-right" ng-click="openExternalLink()"> <a class="item item-icon-left item-icon-right" ng-click="openExternalLink()">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-help-support.svg" class="bg"/> <img src="img/icon-help-support.svg" class="bg"/>
</i> </i>
<span translate>Help &amp; Support</span> <span>{{'Help & Support' | translate }}</span>
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-link.svg" class="bg just-a-hint"/> <img src="img/icon-link.svg" class="bg just-a-hint"/>
</i> </i>
</a> </a>
<a class="item item-icon-left item-icon-right" ui-sref="tabs.feedback"> <a class="item item-icon-left item-icon-right" ui-sref="tabs.feedback">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-language.svg" class="bg"/> <img src="img/icon-send-feedback.svg" class="bg"/>
</i> </i>
<span translate>Send Feedback</span> <span>{{'Send Feedback' | translate}}</span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.shareApp({score: 4, skipped: true, fromSettings: true})"> <a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.shareApp({score: 4, skipped: true, fromSettings: true})">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-send-feedback.svg" class="bg"/> <img src="img/icon-heart.svg" class="bg"/>
</i> </i>
<span translate>Share {{appName}}</span> <span>{{'Share'|translate}} {{appName}}</span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<div class="item item-divider" translate>Preferences</div> <div class="item item-divider">{{'Preferences' | translate}}</div>
<a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications"> <a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-notifications.svg" class="bg"/> <img src="img/icon-notifications.svg" class="bg"/>
</i> </i>
<span translate>Notifications</span> <span>{{'Notifications' | translate}}</span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item item-icon-left item-icon-right" ui-sref="tabs.language"> <a class="item item-icon-left item-icon-right" ui-sref="tabs.language">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-language.svg" class="bg"/> <img src="img/icon-language.svg" class="bg"/>
</i> </i>
<span translate>Language</span> <span>{{'Language' | translate}}</span>
<span class="item-note"> <span class="item-note">
{{currentLanguageName|translate}} {{currentLanguageName|translate}}
</span> </span>
@ -67,7 +67,7 @@
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-unit.svg" class="bg"/> <img src="img/icon-unit.svg" class="bg"/>
</i> </i>
<span class="setting-title" translate>Bitcoin Unit</span> <span class="setting-title">{{'Bitcoin Unit' | translate}}</span>
<span class="setting-value"> <span class="setting-value">
{{unitName}} {{unitName}}
</span> </span>
@ -78,7 +78,7 @@
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-alternative-currency.svg" class="bg"/> <img src="img/icon-alternative-currency.svg" class="bg"/>
</i> </i>
<span class="setting-title" translate>Alternative Currency</span> <span class="setting-title">{{'Alternative Currency' | translate}}</span>
<span class="setting-value"> <span class="setting-value">
{{selectedAlternative.name}} {{selectedAlternative.name}}
</span> </span>
@ -89,14 +89,14 @@
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-network.svg" class="bg"/> <img src="img/icon-network.svg" class="bg"/>
</i> </i>
<span class="setting-title" translate>Bitcoin Network Fee Policy</span> <span class="setting-title">{{'Bitcoin Network Fee Policy' | translate}}</span>
<span class="setting-value"> <span class="setting-value">
{{feeOpts[currentFeeLevel]|translate}} {{feeOpts[currentFeeLevel]|translate}}
</span> </span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<div class="item item-divider" ng-show="wallets[0]" translate>Wallets &amp; Integrations</div> <div class="item item-divider" ng-show="wallets[0]">{{'Wallets & Integrations' | translate}}</div>
<a class="item item-icon-left item-icon-right" href <a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': item.id})" ui-sref="tabs.preferences({'walletId': item.id})"
@ -110,8 +110,8 @@
{{item.m}}-of-{{item.n}} {{item.m}}-of-{{item.n}}
</span> </span>
</span> </span>
<span class="right text-light assertive" ng-show="!item.isComplete()" translate> <span class="right text-light assertive" ng-show="!item.isComplete()">
Incomplete {{'Incomplete' | translate}}
</span> </span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
@ -135,28 +135,18 @@
<div class="item item-divider"></div> <div class="item item-divider"></div>
<a class="ng-hide item item-icon-left item-icon-right" href ng-hide="true">
<i class="icon big-icon-svg">
<img src="img/icon-heart.svg" class="bg"/>
</i>
<span translate>Tell a friend</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="ng-hide item item-divider" ng-hide="true"></div>
<a class="item item-icon-right item-icon-left" href ui-sref="tabs.advanced"> <a class="item item-icon-right item-icon-left" href ui-sref="tabs.advanced">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-advanced.svg" class="bg"/> <img src="img/icon-advanced.svg" class="bg"/>
</i> </i>
<span translate>Advanced</span> <span>{{'Advanced' | translate}}</span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item item-icon-left item-icon-right" href ui-sref="tabs.about"> <a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-about.svg" class="bg"/> <img src="img/icon-about.svg" class="bg"/>
</i> </i>
<span translate>About</span> {{appName}} <span>{{'About' | translate}}</span> {{appName}}
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<div class="item item-divider"></div> <div class="item item-divider"></div>

View file

@ -1,22 +1,22 @@
<ion-tabs class="tabs-icon-top tabs-color-active-positive ion-tabs-transparent {{$root.hideTabs}}"> <ion-tabs class="tabs-icon-top tabs-color-active-positive ion-tabs-transparent {{$root.hideTabs}}">
<ion-tab title="Home" icon-off="ico-home" icon-on="ico-home-selected" ui-sref="tabs.home"> <ion-tab title="{{'Home'|translate}}" icon-off="ico-home" icon-on="ico-home-selected" ui-sref="tabs.home">
<ion-nav-view name="tab-home"></ion-nav-view> <ion-nav-view name="tab-home"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Receive" icon-off="ico-receive" icon-on="ico-receive-selected" ui-sref="tabs.receive"> <ion-tab title="{{'Receive'|translate}}" icon-off="ico-receive" icon-on="ico-receive-selected" ui-sref="tabs.receive">
<ion-nav-view name="tab-receive"></ion-nav-view> <ion-nav-view name="tab-receive"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Scan" icon-off="ico-scan" icon-on="ico-scan-selected" ui-sref="tabs.scan"> <ion-tab title="{{'Scan'|translate}}" icon-off="ico-scan" icon-on="ico-scan-selected" ui-sref="tabs.scan">
<ion-nav-view name="tab-scan"></ion-nav-view> <ion-nav-view name="tab-scan"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Send" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send"> <ion-tab title="{{'Send'|translate}}" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send">
<ion-nav-view name="tab-send"></ion-nav-view> <ion-nav-view name="tab-send"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Settings" icon-off="ico-settings" icon-on="ico-settings-selected" ui-sref="tabs.settings"> <ion-tab title="{{'Settings'|translate}}" icon-off="ico-settings" icon-on="ico-settings-selected" ui-sref="tabs.settings">
<ion-nav-view name="tab-settings"></ion-nav-view> <ion-nav-view name="tab-settings"></ion-nav-view>
</ion-tab> </ion-tab>
</ion-tabs> </ion-tabs>

View file

@ -142,7 +142,7 @@
</div> </div>
</div> <!-- oh --> </div> <!-- oh -->
<a class="wallet-not-backed-up-warning" ng-if="wallet.needsBackup" ui-sref="tabs.wallet.backupWarning({from: 'tabs.wallet'})"> <a class="wallet-not-backed-up-warning" ng-if="wallet.needsBackup" ui-sref="tabs.wallet.backupWarning({from: 'tabs.wallet'})" translate>
Wallet not backed up Wallet not backed up
</a> </a>
@ -196,11 +196,11 @@
<div class="wallet-details__list" ng-show="txHistory[0]"> <div class="wallet-details__list" ng-show="txHistory[0]">
<div ng-repeat="btx in txHistory track by $index" ng-click="openTxModal(btx)"> <div ng-repeat="btx in txHistory track by $index" ng-click="openTxModal(btx)">
<div class="wallet-details__group-label" ng-if="isFirstInGroup($index)"> <div class="wallet-details__group-label" ng-if="isFirstInGroup($index)">
<span ng-if="isDateInCurrentMonth(getDate(btx.time))"> <span ng-if="isDateInCurrentMonth(getDate(btx.time))" translate>
Recent Recent
</span> </span>
<span ng-if="!isDateInCurrentMonth(getDate(btx.time))"> <span ng-if="!isDateInCurrentMonth(getDate(btx.time))">
{{getDate(btx.time) | date:'MMMM'}} {{getDate(btx.time) | amDateFormat:'MMMM'}}
</span> </span>
</div> </div>
@ -217,7 +217,7 @@
<div class="wallet-details__tx-title" ng-if="!isUnconfirmed(btx)"> <div class="wallet-details__tx-title" ng-if="!isUnconfirmed(btx)">
<div ng-show="btx.action == 'received'" class="ellipsis"> <div ng-show="btx.action == 'received'" class="ellipsis">
<div ng-if="btx.note.body" class="wallet-details__tx-message ellipsis">{{btx.note.body}}</div> <div ng-if="btx.note.body" class="wallet-details__tx-message ellipsis">{{btx.note.body}}</div>
<div ng-if="!btx.note.body" class="wallet-details__tx-message ellipsis" translate> Received</div> <div ng-if="!btx.note.body" class="wallet-details__tx-message ellipsis" translate>Received</div>
</div> </div>
<div ng-show="btx.action == 'sent'" class="ellipsis"> <div ng-show="btx.action == 'sent'" class="ellipsis">
@ -238,8 +238,8 @@
<div class="wallet-details__tx-title" ng-if="isUnconfirmed(btx)"> <div class="wallet-details__tx-title" ng-if="isUnconfirmed(btx)">
<div class="ellipsis" style="color: #B4B4B4;"> <div class="ellipsis" style="color: #B4B4B4;">
<span ng-if="btx.action == 'sent' || btx.action == 'moved'">Sending</span> <span ng-if="btx.action == 'sent' || btx.action == 'moved'" translate>Sending</span>
<span ng-if="btx.action == 'received'">Receiving</span> <span ng-if="btx.action == 'received'" translate>Receiving</span>
</div> </div>
</div> </div>
@ -255,7 +255,9 @@
</span> </span>
<div> <div>
<time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time)">{{btx.time * 1000 | amTimeAgo}}</time> <time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time)">{{btx.time * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time)">{{btx.time * 1000 | date:'MMMM d, y'}}</time> <time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time)">
{{btx.time * 1000 | amDateFormat:'MMM d, YYYY'}}
</time>
</div> </div>
</span> </span>
</div> </div>