From 4e2c06f69d5a93d63c137908b79ee9ef8d3155e1 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Tue, 14 Aug 2018 12:24:10 +1200
Subject: [PATCH 1/4] Changed "Bitcoin" to "Bitcoin Core" on the Sweep Paper
 Wallet screen and made other strings translatable.

---
 i18n/po/template.pot       | 27 ++++++++++++++++++++++++++-
 www/views/paperWallet.html | 12 ++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index 277be03bb..dc22630ad 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -2916,10 +2916,15 @@ msgid "Sweep"
 msgstr ""
 
 #: www/views/includes/incomingDataMenu.html:89
-#: www/views/paperWallet.html:3
+msgctxt "List item"
 msgid "Sweep paper wallet"
 msgstr ""
 
+#: www/views/paperWallet.html:3
+msgctxt "Page title"
+msgid "Sweep Paper Wallet"
+msgstr ""
+
 #: src/js/services/onGoingProcess.js:33
 msgid "Sweeping Wallet..."
 msgstr ""
@@ -3849,4 +3854,24 @@ msgstr ""
 
 #: src/js/services/incomingData.js:129
 msgid "This invoice is no longer accepting payments"
+msgstr ""
+
+#: www/views/paperWallet.html:48
+msgid "No Bitcoin Cash wallet to transfer funds to found."
+msgstr ""
+
+#: www/views/paperWallet.html:54
+msgid "No Bitcoin Cash found."
+msgstr ""
+
+#: www/views/paperWallet.html:60
+msgid "Bitcoin Core found:"
+msgstr ""
+
+#: www/views/paperWallet.html:98
+msgid "No Bitcoin Core wallet to transfer funds to found."
+msgstr ""
+
+#: www/views/paperWallet.html:104
+msgid "No Bitcoin Core found."
 msgstr ""
\ No newline at end of file
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html
index a8d3d2ee4..26415a5d0 100644
--- a/www/views/paperWallet.html
+++ b/www/views/paperWallet.html
@@ -1,6 +1,6 @@
 <ion-view hide-tabs>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-title>{{'Sweep paper wallet' | translate}}</ion-nav-title>
+    <ion-nav-title>{{'Sweep Paper Wallet' | translate}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
@@ -45,19 +45,19 @@
       </div>
       <div ng-class="ng-hide" ng-show="noMatchingBchWallet">
         <div class="text-center size-12 text-gray">
-          <span>No Bitcoin Cash wallet to transfer funds to found.</span>
+          <span translate>No Bitcoin Cash wallet to transfer funds to found.</span>
         </div>
       </div>
     </div>
     <div ng-class="ng-hide" ng-show="!bchBalance && readyToShow">
       <div class="text-center">
-        <h4 class="text-bold" translate>No Bitcoin Cash found</h4>
+        <h4 class="text-bold" translate>No Bitcoin Cash found.</h4>
       </div>
     </div>
     <div ng-class="ng-hide" ng-show="btcBalance">
       <div class="row">
         <div class="col text-center">
-          <h4 class="text-bold" translate>Bitcoin found:</h4>
+          <h4 class="text-bold" translate>Bitcoin Core found:</h4>
           <div class="size-24">
             <span>{{btcBalanceText}}</span>
             <div class="size-14 amount-alternative">
@@ -95,13 +95,13 @@
       </div>
       <div ng-class="ng-hide" ng-show="noMatchingBtcWallet">
         <div class="text-center size-12 text-gray">
-          <span>No Bitcoin wallet to transfer funds to found.</span>
+          <span translate>No Bitcoin Core wallet to transfer funds to found.</span>
         </div>
       </div>
     </div>
     <div ng-class="ng-hide" ng-show="!btcBalance && readyToShow">
       <div class="text-center">
-        <h4 class="text-bold" translate>No Bitcoin found</h4>
+        <h4 class="text-bold" translate>No Bitcoin Core found.</h4>
       </div>
     </div>
     <slide-to-accept-success

From 09871c9ebac97a7e7ef2ced62731b3a7825f953e Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Mon, 20 Aug 2018 11:46:34 +1200
Subject: [PATCH 2/4] Updated package.json.


From 2a5a21f7d7306058c2b4be55e3f5547b677b0bad Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Mon, 20 Aug 2018 11:48:48 +1200
Subject: [PATCH 3/4] Updated package.json for real.


From bbe2fb20c41c018cfea0bd2c875fd3ccb337b10d Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Mon, 20 Aug 2018 12:02:11 +1200
Subject: [PATCH 4/4] Updated package.json attempt 4.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c1f37b2e6..e54e3d14d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "postinstall": "npm run apply:copay && echo && echo \"Repo configured for standard Copay distribution. To switch to the BitPay distribution, run 'npm run apply:bitpay'.\" && echo",
     "start": "echo && echo \"Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo",
     "apply:copay": "npm i fs-extra@0.30 && cd app-template && node apply.js copay && cd .. && npm i",
-    "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare",
+    "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare && cd ../ && ./fix-asn1.sh",
     "apply:bitpay": "npm i fs-extra@0.30 && cd app-template && node apply.js bitpay && cd .. && npm i",
     "unstage-package": "git reset package.json",
     "clean-all": "git clean -dfx"