Fix strings for translations

2018-03-20 11:09:33 -03:00 · 2018-03-20 11:09:33 -03:00 · 73b50dd48a
parent 4d42c23656
commit 73b50dd48a
18 changed files with 55 additions and 69 deletions
--- a/src/pages/add/import-wallet/import-wallet.html
+++ b/src/pages/add/import-wallet/import-wallet.html
@ -24,9 +24,8 @@
        <li translate>The derivation path</li>
        <li translate>The wallet service URL</li>
      </ul>
-      <small translate>
-        NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery
-        Phrase there.
+      <small>
+        <span translate>NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.</span>
      </small>
    </ion-item>
  </ion-card>
--- a/src/pages/home/home.html
+++ b/src/pages/home/home.html
@ -195,16 +195,13 @@
          </span>
          <span *ngIf="wallet.isComplete() && !wallet.needsBackup">
            <span *ngIf="!wallet.balanceHidden && !wallet.scanning">
-              {{wallet.status && wallet.status.totalBalanceStr ? (wallet.status.totalBalanceStr) : ( wallet.cachedBalance ? wallet.cachedBalance
-              + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '')
-              : '')}}
+              {{wallet.status && wallet.status.totalBalanceStr ? (wallet.status.totalBalanceStr) : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '')}}
            </span>
            <span *ngIf="wallet.scanning" translate>Scanning funds</span>
            <span *ngIf="wallet.balanceHidden && !wallet.scanning">[
              <span translate>Balance Hidden</span>]</span>
            <span *ngIf="wallet.credentials.m > 1">{{wallet.credentials.m}}-of-{{wallet.credentials.n}}</span>
-            <ion-icon *ngIf="!wallet.balanceHidden && wallet.status && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)"
-              name="timer"></ion-icon>
+            <ion-icon *ngIf="!wallet.balanceHidden && wallet.status && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" name="timer"></ion-icon>
            <span *ngIf="wallet.error" class="wallet-warning">{{wallet.error}}</span>
          </span>
        </div>
--- a/src/pages/includes/card-item/card-item.html
+++ b/src/pages/includes/card-item/card-item.html
@ -6,7 +6,7 @@
  </ion-icon>
  <h4 text-wrap>
    {{card.merchant.name || 'Unknown Merchant'}}
-    <span *ngIf="card.pending && card.transactionId">
+    <span *ngIf="card.pending && card.transactionId" translate>
      View Confirmation Status
    </span>
  </h4>
--- a/src/pages/includes/wallet-selector/wallet-selector.html
+++ b/src/pages/includes/wallet-selector/wallet-selector.html
@ -32,13 +32,11 @@
          </span>
          <span *ngIf="wallet.isComplete() && !wallet.needsBackup">
            <span *ngIf="!wallet.balanceHidden && !wallet.scanning">
-              {{wallet.status && wallet.status.totalBalanceStr ? (wallet.status.totalBalanceStr) : ( wallet.cachedBalance ? wallet.cachedBalance
-              + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '')
-              : '')}}
+              {{wallet.status && wallet.status.totalBalanceStr ? (wallet.status.totalBalanceStr) : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '')}}
            </span>
            <span *ngIf="wallet.scanning" translate>Scanning funds</span>
            <span *ngIf="wallet.balanceHidden && !wallet.scanning">[<span translate>Balance Hidden</span>]</span>
-            <span class="text-gray" *ngIf="wallet.credentials.m > 1">{{wallet.credentials.m}}-of-{{wallet.credentials.n}}</span>
+            <span class="text-gray" *ngIf="wallet.credentials.m > 1" translate>{{wallet.credentials.m}}-of-{{wallet.credentials.n}}</span>
            <ion-icon *ngIf="!wallet.balanceHidden && wallet.status && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)"
              name="timer"></ion-icon>
            <span *ngIf="wallet.error" class="error">{{wallet.error}}</span>
--- a/src/pages/integrations/amazon/buy-amazon/buy-amazon.html
+++ b/src/pages/integrations/amazon/buy-amazon/buy-amazon.html
@ -1,7 +1,7 @@
 <ion-header>

  <ion-navbar>
-    <ion-title>{{'Buy' | translate}}</ion-title>
+    <ion-title>Buy Gift Card</ion-title>
  </ion-navbar>

 </ion-header>
--- a/src/pages/integrations/bitpay-card/bitpay-card-intro/bitpay-card-intro.html
+++ b/src/pages/integrations/bitpay-card/bitpay-card-intro/bitpay-card-intro.html
@ -15,14 +15,12 @@
  <ion-slides pager="true">
    <ion-slide>
      <p class="slider-text" translate>
-        Turn bitcoin into dollars, swipe anywhere Visa
-        <sup>&reg;</sup> is accepted.
+        Turn bitcoin into dollars, swipe anywhere Visa&reg; is accepted.
      </p>
    </ion-slide>
    <ion-slide>
      <p class="slider-text" translate>
-        Get local cash anywhere you go, from any Visa
-        <sup>&reg;</sup> compatible ATM. ATM bank fees may apply.
+        Get local cash anywhere you go, from any Visa&reg; compatible ATM. ATM bank fees may apply.
      </p>
    </ion-slide>
    <ion-slide>
@ -32,7 +30,7 @@
    </ion-slide>
  </ion-slides>
  <div padding>
-    <button ion-button class="button-standard" (click)="orderBitPayCard()">Order the BitPay Card</button>
-    <button ion-button clear color="blank" class="button-standard" (click)="connectBitPayCard()">Connect my BitPay Card</button>
+    <button ion-button class="button-standard" (click)="orderBitPayCard()" translate>Order the BitPay Card</button>
+    <button ion-button clear color="blank" class="button-standard" (click)="connectBitPayCard()" translate>Connect my BitPay Card</button>
  </div>
-</ion-content>
+</ion-content>
--- a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.html
+++ b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.html
@ -1,7 +1,7 @@
 <ion-header>

  <ion-navbar>
-    <ion-title>{{'Buy'|translate}}</ion-title>
+    <ion-title>{{'Buy Gift Card'|translate}}</ion-title>
  </ion-navbar>

 </ion-header>
--- a/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.html
+++ b/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.html
@ -16,7 +16,7 @@
  <div class="header-modal">
    <img src="assets/img/mercado-libre/giftcard-pt.svg" alt="Mercado Livre Brazil Gift Card">
    <div class="header-modal-amount">
-     <span translate>Gift Card Amount:</span>
+     <span translate>Gift Card Amount</span>:
      <span class="text-bold">
        {{card.amount | currency : '$ ' : 2}} {{card.currency}}
      </span>
@ -69,7 +69,7 @@
    </button>

    <button class="links" ion-item *ngIf="card.status == 'FAILURE'" (click)="openSupportWebsite()">
-      <span><span translate>Help & Support</span> &rarr;</span>
+      <span><span translate>Help &amp; Support</span> &rarr;</span>
    </button>

    <button ion-item block *ngIf="card.cardStatus == 'inactive' || card.cardStatus == 'expired' || card.status == 'expired'"
--- a/src/pages/integrations/mercado-libre/mercado-libre.html
+++ b/src/pages/integrations/mercado-libre/mercado-libre.html
@ -14,7 +14,7 @@
        <img src="assets/img/mercado-libre/mlbr.svg" alt="Mercado Libre">
      </div>
      <div class="description" translate padding>
-        <b>Only</b> redeemable on Mercado Livre (Brazil)
+        Only redeemable on Mercado Livre (Brazil)
      </div>
      <button *ngIf="!showOauthForm" ion-button outline class="button-standard" (click)="goTo('Amount')" no-low-fee translate>Buy Gift Card</button>
      <button *ngIf="!showOauthForm" ion-button clear small block color="dark" (click)="openExternalLink('https://www.mercadolivre.com.br')" translate>Visit mercadolivre.com.br &rarr;</button>
@ -28,7 +28,7 @@
    <div class="integration-giftCard-logo">
      <img src="assets/img/mercado-libre/mlbr.svg" alt="Mercado Libre">
      <div class="subtitle" translate>
-        <b>Only</b> redeemable on Mercado Livre (Brazil)
+        Only redeemable on Mercado Livre (Brazil)
      </div>
      <button color="dark" ion-button clear icon-right no-low-fee (click)="goTo('Amount')">
        <span translate>Buy Gift Card</span>
@ -47,10 +47,10 @@
                {{item.value.amount | currency : '$ ' : 2}} {{item.value.currency}}
              </h2>
              <span>
-                <span class="assertive" *ngIf="item.value.status == 'FAILURE'">Error</span>
-                <span class="dark" *ngIf="item.value.status == 'expired'">Invoice expired</span>
-                <span class="calm" *ngIf="item.value.status == 'invalid'">Still pending</span>
-                <span class="positive" *ngIf="item.value.status == 'PENDING'">Pending</span>
+                <span class="assertive" *ngIf="item.value.status == 'FAILURE'" translate>Error</span>
+                <span class="dark" *ngIf="item.value.status == 'expired'" translate>Invoice expired</span>
+                <span class="calm" *ngIf="item.value.status == 'invalid'" translate>Still pending</span>
+                <span class="positive" *ngIf="item.value.status == 'PENDING'" translate>Pending</span>
                <span class="assertive" *ngIf="item.value.cardStatus == 'inactive'" translate>Inactive</span>
                <span class="assertive" *ngIf="item.value.cardStatus == 'expired'" translate>Expired</span>
              </span>
--- a/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.html
+++ b/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.html
@ -25,10 +25,8 @@
              Incomplete
            </span>
            <span *ngIf="fromWallet.isComplete()">
-              <span *ngIf="!fromWallet.balanceHidden  && !fromWallet.scanning"> {{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance
-                + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo)
-                : '') : '' ) }} </span>
-              <span *ngIf="fromWallet.scanning" translate>Scanning funds...</span>
+              <span *ngIf="!fromWallet.balanceHidden && !fromWallet.scanning"> {{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} </span>
+              <span *ngIf="fromWallet.scanning" translate>Scanning funds</span>...

              <span *ngIf="fromWallet.balanceHidden && !fromWallet.scanning">[<span translate>Balance Hidden</span>]</span>
              <span *ngIf="fromWallet.n > 1">
@ -60,10 +58,8 @@
              Incomplete
            </span>
            <span *ngIf="toWallet.isComplete()">
-              <span *ngIf="!toWallet.balanceHidden  && !toWallet.scanning"> {{toWallet.status.totalBalanceStr ? toWallet.status.totalBalanceStr : ( toWallet.cachedBalance ? toWallet.cachedBalance
-                + (toWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( toWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo)
-                : '') : '' ) }} </span>
-              <span *ngIf="toWallet.scanning" translate>Scanning funds...</span>
+              <span *ngIf="!toWallet.balanceHidden && !toWallet.scanning"> {{toWallet.status.totalBalanceStr ? toWallet.status.totalBalanceStr : ( toWallet.cachedBalance ? toWallet.cachedBalance + (toWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( toWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} </span>
+              <span *ngIf="toWallet.scanning" translate>Scanning funds</span>...

              <span *ngIf="toWallet.balanceHidden && !toWallet.scanning">[<span translate>Balance Hidden</span>]</span>
              <span class="tab-home__wallet__multisig-number" *ngIf="toWallet.n > 1">
@ -126,8 +122,9 @@
      <ion-checkbox class="check" [(ngModel)]="termsAccepted"></ion-checkbox>
    </ion-item>
    <div class="terms">
-      <p translate>
-        I agree to the <a (click)="openTerms()">Terms</a> and certify that I am the beneficial owner of the input assets and the destination address.
+      <p>
+      <span translate>I agree to the Terms and certify that I am the beneficial owner of the input assets and the destination address.</span>
+      <a (click)="openTerms()" translate>Click to open Terms</a>.
      </p>
    </div>
  </div>
--- a/src/pages/onboarding/disclaimer/disclaimer.html
+++ b/src/pages/onboarding/disclaimer/disclaimer.html
@ -7,12 +7,14 @@
  <p translate class="top-description">Bitcoin is different &ndash; it cannot be safely held with a bank or web service.</p>
  <ion-list class="checkbox-list" no-lines text-wrap>
    <ion-item>
-      <ion-label>I understand that my funds are held securely on this device, not by a company.</ion-label>
+      <ion-label>
+        {{'I understand that my funds are held securely on this device, not by a company' | translate}}.
+      </ion-label>
      <ion-checkbox [(ngModel)]="accepted.first"></ion-checkbox>
    </ion-item>
    <ion-item>
-      <ion-label>I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup
-        phrase.
+      <ion-label>
+        {{'I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase' | translate}}.
      </ion-label>
      <ion-checkbox [(ngModel)]="accepted.second"></ion-checkbox>
    </ion-item>
@ -22,12 +24,15 @@
  <div class="checkbox-list">
    <div *ngIf="accepted.first && accepted.second">
      <ion-item no-lines text-wrap>
-        <ion-label>I have read, understood, and agree to the Terms of Use.</ion-label>
+        <ion-label>
+          {{'I have read, understood, and agree to the Terms of Use' | translate}}.
+        </ion-label>
        <ion-checkbox [(ngModel)]="terms.accepted"></ion-checkbox>
      </ion-item>
      <a (click)="openDisclaimer()" translate>Terms of Use</a>
    </div>
-    <button ion-button class="button-standard" [disabled]="!accepted.first || !accepted.second || !terms.accepted" (click)="confirm()"
-      translate>Confirm &amp; Finish</button>
+    <button ion-button class="button-standard" [disabled]="!accepted.first || !accepted.second || !terms.accepted" (click)="confirm()" translate>
+      Confirm &amp; Finish
+    </button>
  </div>
-</ion-footer>
+</ion-footer>
--- a/src/pages/onboarding/onboarding.html
+++ b/src/pages/onboarding/onboarding.html
@ -1,11 +1,10 @@
 <ion-content no-bounce>
  <div class="logo-tagline">
    <img src='assets/img/app/logo-negative.svg' />
-    <p [ngClass]="{'primary-color': !isCopay, 'comment-color': isCopay}" translate>Take control of your money,
-      <br />get started with bitcoin.</p>
+    <p [ngClass]="{'primary-color': !isCopay, 'comment-color': isCopay}" translate>Take control of your money, get started with bitcoin.</p>
  </div>
  <div class="bottom-absolute">
    <button ion-button class="button-standard" (click)="getStarted()" translate>Get started</button>
    <button ion-button clear class="button-standard primary-color" (click)="restoreFromBackup()" translate>Restore from backup</button>
  </div>
-</ion-content>
+</ion-content>
--- a/src/pages/onboarding/tour/tour.html
+++ b/src/pages/onboarding/tour/tour.html
@ -13,8 +13,7 @@
 <ion-content no-bounce>
  <ion-slides pager="true" (ionSlideDidChange)="slideChanged()">
    <ion-slide>
-      <h3 class="title" translate>Bitcoin is secure,
-        <br/>digital money.</h3>
+      <h3 class="title" translate>Bitcoin is secure, digital money.</h3>
      <p translate class="top-description">You can spend bitcoin at millions of websites and stores worldwide.</p>
      <img src='assets/img/app/onboarding/tour-phone.svg' />
      <div class="bottom-absolute">
@ -50,4 +49,4 @@
      </div>
    </ion-slide>
  </ion-slides>
-</ion-content>
+</ion-content>
--- a/src/pages/receive/receive.html
+++ b/src/pages/receive/receive.html
@ -78,7 +78,7 @@
        </span>
        <span *ngIf="wallet.scanning" translate>Scanning funds</span>
        <span *ngIf="wallet.balanceHidden && !wallet.scanning"><span translate>[Balance Hidden]</span></span>
-        <span class="text-gray" *ngIf="wallet.credentials.m > 1">{{wallet.credentials.m}}-of-{{wallet.credentials.n}}</span>
+        <span class="text-gray" *ngIf="wallet.credentials.m > 1" translate>{{wallet.credentials.m}}-of-{{wallet.credentials.n}}</span>
        <ion-icon *ngIf="!wallet.balanceHidden && wallet.status && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)"
          ios="ios-timer-outline" md="md-timer"></ion-icon>
        <span *ngIf="wallet.error" class="wallet-warning">{{wallet.error}}</span>
--- a/src/pages/send/confirm/confirm.html
+++ b/src/pages/send/confirm/confirm.html
@ -21,7 +21,7 @@
    </ion-item>
    <button ion-item class="item-fee" (click)="chooseFeeLevel()">
      <div class="fee-title">
-        <span translate>Bitcoin miner fee</span>: {{tx.feeLevelName | translate}}
+        <span translate>Bitcoin miner fee</span>: {{tx.feeLevelName}}
      </div>
      <div class="fee-loading" *ngIf="!wallet || !tx.txp[wallet.id]">
        <div>...</div>
--- a/src/pages/settings/bitcoin-cash/bitcoin-cash.html
+++ b/src/pages/settings/bitcoin-cash/bitcoin-cash.html
@ -56,8 +56,10 @@
    </ion-list>

    <ion-item-divider text-wrap>
-      <span translate>Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the <a (click)="openRecoveryToolLink()">recovery tool.</a>
-      </span>
+      <span translate>
+        Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the recovery tool
+      </span>. 
+      <a (click)="openRecoveryToolLink()" translate>Click to open the recovery tool</a>.
    </ion-item-divider>
  </div>
 </ion-content>
--- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses.html
+++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses.html
@ -83,7 +83,7 @@
      </ion-item>

      <ion-item text-wrap>
-        <span translate> Approximate Bitcoin network fee to transfer wallet's balance (with normal priority) </span>
+        <span translate>Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)</span>
        <p class="info">{{minFeePer}} [{{minFee}}]</p>
      </ion-item>
    </div>
--- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export.html
+++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export.html
@ -44,19 +44,11 @@
          <ion-item-divider *ngIf="!canSign || exportWalletForm.value.noSignEnabled" text-wrap>
            <div class="warning" *ngIf="!canSign">
              <ion-icon name="ios-warning-outline"></ion-icon>
-              <span translate>
-                WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history,
-                and create spend proposals from the export. However, does not allow to approve (sign) proposals, so
-                <b>funds will not be accessible from the export</b>.
-              </span>
+              <span translate>WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export.</span>
            </div>
            <div class="warning" *ngIf="exportWalletForm.value.noSignEnabled">
              <ion-icon name="ios-warning-outline"></ion-icon>
-              <span translate>
-                WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals
-                from the export. However, does not allow to approve (sign) proposals, so
-                <b>funds will not be accessible from the export</b>.
-              </span>
+              <span translate>WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export.</span>
            </div>
          </ion-item-divider>
          <button *ngIf="!isSafari && !isCordova" class="button-standard" ion-button type="submit" (click)="downloadWalletBackup()"
@ -86,4 +78,4 @@
      </div>
    </ion-list>
  </div>
-</ion-content>
+</ion-content>