Merge pull request #5362 from gabrielbazan7/fix/translations05

fix translations

src/js/controllers/advancedSettings.js

@@ -29,50 +29,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
     };
   };
 
-  $scope.global = $rootScope;
-  if (!$scope.global.developmentUtilitiesEnabled) {
-    $scope.global.developmentUtilitiesEnabled = {
-      value: false
-    };
-  }
-
-  $scope.toggledDevelopmentUtils = function() {
-    if ($scope.global.developmentUtilitiesEnabled.value) {
-      $log.debug('User enabled development utilities.');
-      $timeout(function() {
-        $ionicScrollDelegate.resize();
-      }, 10);
-    } else {
-      $log.debug('User disabled development utilities.');
-    }
-  }
-
-  $scope.activateFeedbackCard = function() {
-    $scope.feedbackCardActivating = true;
-    storageService.getFeedbackInfo(function(error, info) {
-      var feedbackInfo = JSON.parse(info);
-      // hardcoding so we can distinguish from normal operation
-      feedbackInfo.time = 1231006505; // genesis block time
-      feedbackInfo.version = window.version;
-      feedbackInfo.sent = false;
-      storageService.setFeedbackInfo(JSON.stringify(feedbackInfo), function() {
-        $log.debug('Activated feedback card with: ' + JSON.stringify(feedbackInfo));
-        $ionicHistory.clearCache();
-        $timeout(function() {
-          $scope.feedbackCardActivating = false;
-          $scope.feedbackCardActivated = true;
-          $timeout(function() {
-            $scope.feedbackCardActivated = false;
-          }, 10000);
-        }, 500);
-      });
-    });
-  }
-
-  $scope.resetActivateFeedbackCard = function() {
-    $scope.feedbackCardActivated = false;
-  }
-
   $scope.spendUnconfirmedChange = function() {
     var opts = {
       wallet: {

src/js/controllers/onboarding/backupRequest.js

@@ -7,15 +7,15 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun
 
   $scope.openPopup = function() {
 
-    var title = gettextCatalog.getString('Without a backup, you could lose money.');
+    var title = gettextCatalog.getString('Watch out!');
     var message = gettextCatalog.getString('If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup.');
     var okText = gettextCatalog.getString('I understand');
     var cancelText = gettextCatalog.getString('Go back');
     popupService.showConfirm(title, message, okText, cancelText, function(val) {
       if (val) {
-        var title = gettextCatalog.getString('Are you sure you want to skip the backup?');
+        var title = gettextCatalog.getString('Are you sure you want to skip it?');
         var message = gettextCatalog.getString('You can create a backup later from your wallet settings.');
-        var okText = gettextCatalog.getString('Yes, skip backup');
+        var okText = gettextCatalog.getString('Yes, skip');
         var cancelText = gettextCatalog.getString('Go back');
         popupService.showConfirm(title, message, okText, cancelText, function(val) {
           if (val) {

src/js/controllers/onboarding/terms.js

@@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('termsController', function($s
     var url = appConfigService.disclaimerUrl;
     var optIn = true;
     var title = gettextCatalog.getString('View Terms of Service');
-    var message = gettextCatalog.getString('The official English Terms of Service are available on the BitPay website. Would you like to view them?');
+    var message = gettextCatalog.getString('The official English Terms of Service are available on the BitPay website.');
     var okText = gettextCatalog.getString('Open Website');
     var cancelText = gettextCatalog.getString('Go Back');
     externalLinkService.open(url, optIn, title, message, okText, cancelText);

src/js/controllers/tab-settings.js

@@ -50,7 +50,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     var url = 'https://help.bitpay.com/bitpay-app';
     var optIn = true;
     var title = gettextCatalog.getString('BitPay Help Center');
-    var message = gettextCatalog.getString('Help and support information is available at the BitPay Help Center website. Would you like to go there now?');
+    var message = gettextCatalog.getString('Help and support information is available at the BitPay Help Center website.');
     var okText = gettextCatalog.getString('Open Help Center');
     var cancelText = gettextCatalog.getString('Go Back');
     externalLinkService.open(url, optIn, title, message, okText, cancelText);

src/js/controllers/tx-details.js

@@ -122,8 +122,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
     var btx = $scope.btx;
     var url = 'https://' + ($scope.getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid;
     var optIn = true;
-    var title = gettextCatalog.getString('View Transaction on Insight');
-    var message = gettextCatalog.getString('Would you like to view this transaction on the Insight blockchain explorer?');
+    var title = null;
+    var message = gettextCatalog.getString('View Transaction on Insight');
     var okText = gettextCatalog.getString('Open Insight');
     var cancelText = gettextCatalog.getString('Go Back');
     externalLinkService.open(url, optIn, title, message, okText, cancelText);

www/views/addressbook.html

@@ -17,7 +17,7 @@
         <img src="img/address-book-add.svg"/>
       </i>
       <div class="zero-state-heading" translate>No contacts yet</div>
-      <div class="zero-state-description" translate>You haven’t added any contacts to your address book yet. Get started by adding your first one.</div>
+      <div class="zero-state-description" translate>Get started by adding your first one.</div>
       <div class="zero-state-cta">
         <button class="button button-standard button-primary" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
       </div>

www/views/advancedSettings.html

@@ -67,31 +67,6 @@
         <span transaction>If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.</span>
       </div> -->
 
-      <div ng-show="global.developmentUtilitiesEnabled.value">
-        <div class="item item-divider" translate>Development Utilities</div>
-        <div class="settings-explanation">
-          <div class="settings-description" translate>
-            These utilities may be unstable. Proceed at your own risk.
-          </div>
-        </div>
-
-        <div class="item has-comment item-button-right">
-          Feedback Card
-          <button class="button button-secondary" ng-click="activateFeedbackCard()" ng-show="!feedbackCardActivating && !feedbackCardActivated">
-            Activate
-          </button>
-          <button class="button button-secondary button-clear" disabled ng-show="feedbackCardActivating">
-            <ion-spinner></ion-spinner>
-          </button>
-          <button class="button button-secondary button-clear" ng-show="feedbackCardActivated" ng-click="resetActivateFeedbackCard()">
-            Activated
-          </button>
-        </div>
-        <div class="comment">
-          <span transaction>The feedback card is displayed on the Home tab at certain times. You can activate it immediately here.</span>
-        </div>
-      </div>
-
     </div>
   </ion-content>
 </ion-view>

www/views/includes/backupLaterPopup.html

@@ -1,10 +0,0 @@
-<div>
-  <h1 translate>Without a backup, you could lose money</h1>
-  <span translate>If something happens to this device, this app is deleted, or your password forgotten, neither you nor Bitpay can recover your funds.</span>
-  <button ng-click="goBack()" class="button button-block button-light" translate>
-    Go back
-  </button>
-  <button ng-click="continue()" class="button button-block button-light" translate>
-    I understand
-  </button>
-</div>

www/views/includes/backupNeededPopup.html

@@ -7,7 +7,7 @@
       <div class="popup-modal-heading" translate>Backup Needed</div>
       <div class="popup-modal-message" translate>Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup.</div>
       <button class="button button-clear" ng-click="doBackup()" translate>Backup now</button>
-      <button class="button button-secondary button-clear" ng-click="close()" translate>I'll do it later</button>
+      <button class="button button-secondary button-clear" ng-click="close()" translate>Do it later</button>
     </div>
   </div>
 </div>

www/views/onboarding/backupRequest.html

@@ -9,7 +9,7 @@
       <i class="ion-ios-arrow-thin-down" id="arrow-down"></i>
       <div class="onboarding-tldr" id="backup-tldr" translate>Your wallet is never saved to cloud storage or standard device backups.</div>
       <button class="button button-standard button-primary" ui-sref="onboarding.backupWarning({from: 'onboarding', walletId: walletId})" translate>Backup wallet</button>
-      <button class="button button-standard button-secondary button-clear" ng-click="openPopup()" translate>I'll backup my wallet later</button>
+      <button class="button button-standard button-secondary" ng-click="openPopup()" translate>Do it later</button>
     </div>
   </ion-content>
 </ion-view>

www/views/preferencesBwsUrl.html

@@ -17,8 +17,7 @@
     </div>
     <div class="settings-explanation">
       <div class="settings-description" translate>
-        {{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization.
-        The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance).
+        {{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance).
       </div>
     </div>
     <button class="button button-standard button-primary" ng-click="save()" translate>Save</button>