diff --git a/i18n/po/template.pot b/i18n/po/template.pot index d8281988f..bdabbc318 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -72,6 +72,26 @@ msgstr "" msgid "Instant transactions with low fees" msgstr "" +#: www/views/walletSelector.html:49 +msgid "Insufficient funds" +msgstr "" + +#: www/views/amount.html:42 +msgid "Change Currency" +msgstr "" + +#: www/views/amount.html:49 +msgid "Available Funds" +msgstr "" + +#: www/views/amount.html:59 +msgid "Use All Available Funds" +msgstr "" + +#: www/views/amount.html:99 +msgid "Next" +msgstr "" + #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "" @@ -1287,6 +1307,7 @@ msgstr "" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 +#: www/views/review.html:22 msgid "From" msgstr "" @@ -3072,6 +3093,14 @@ msgstr "" msgid "This bitcoin payment request has expired." msgstr "" +#: www/views/review.html:55 +msgid "Payment expires:" +msgstr "" + +#: www/views/review.html:56 +msgid "Payment request has expired" +msgstr "" + #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3805,10 +3834,6 @@ msgstr "" msgid "You are shifting" msgstr "" -#: www/views/review.html:22 -msgid "From:" -msgstr "" - #: www/views/review.html:36 msgid "To:" msgstr "" @@ -3817,6 +3842,13 @@ msgstr "" msgid "Add personal note" msgstr "" +#: www/views/review.html:87 +msgid "Suggested by merchant:" +msgstr "" + +#: src/js/controllers/review.controller.js:37 +msgid "Enter text here" +msgstr "" #: www/views/review.html:57 msgid "Personal note:" diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js index 3c528c1f9..c1f120241 100644 --- a/src/js/controllers/review.controller.js +++ b/src/js/controllers/review.controller.js @@ -34,6 +34,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit }; vm.originWallet = null; vm.paymentExpired = false; + vm.personalNotePlaceholder = gettextCatalog.getString('Enter text here'); vm.primaryAmount = ''; vm.primaryCurrency = ''; vm.usingMerchantFee = false; diff --git a/www/views/amount.html b/www/views/amount.html index b69431b6b..939937be8 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -46,7 +46,7 @@
- Available Funds: + Available Funds:
diff --git a/www/views/includes/walletHistory.html b/www/views/includes/walletHistory.html index 296b35b1a..3be30c2b1 100644 --- a/www/views/includes/walletHistory.html +++ b/www/views/includes/walletHistory.html @@ -73,7 +73,7 @@
- +
diff --git a/www/views/review.html b/www/views/review.html index f2970da51..50fcfbcac 100644 --- a/www/views/review.html +++ b/www/views/review.html @@ -18,7 +18,7 @@
-
From:
+
From:
@@ -52,7 +52,7 @@

{{vm.destination.name}}

-

Payment expires: {{vm.remainingTimeStr}}

+

Payment expires: {{vm.remainingTimeStr}}

Payment request has expired

@@ -67,14 +67,14 @@ ng-class="{ 'expand-content-revealed': vm.memoExpanded }" ng-click="vm.memoExpanded = !vm.memoExpanded"> - Add personal note + Add personal note
Personal Note:
- +
@@ -84,10 +84,10 @@
-
Suggested by merchant:
+
Suggested by merchant:
-
Fee: Less than 1 cent
-
Fee: {{vm.feeFiat}} {{vm.feeCurrency}}
+
Fee: Less than 1 cent
+
Fee: {{vm.feeFiat}} {{vm.feeCurrency}}
diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 339ac3556..41f5c4451 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -7,7 +7,7 @@
-
From:
+
From:
diff --git a/www/views/tx-details.html b/www/views/tx-details.html index 467ce28e3..3a690aff9 100644 --- a/www/views/tx-details.html +++ b/www/views/tx-details.html @@ -24,9 +24,9 @@ Receiving
-
+
- + ...