From 9ae5c4945f9988232c798a41e26bfdb1ddfe064c Mon Sep 17 00:00:00 2001
From: dabura667 <matsuringo667@gmail.com>
Date: Fri, 18 Sep 2015 00:24:01 +0900
Subject: [PATCH 1/3] cut up translation for disclaimer so TM can match

---
 public/views/disclaimer.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index baa3484fe..25306cdf5 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -13,19 +13,19 @@
 		</h4>
 		<div class="p20h m10t">
 			<p class="enable_text_select size-14">
-				<ul translate>
-<li>The software you are about to use functions as a free, open source, and multi-signature digital wallet.</li>
-<li>The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.</li>
-<li>While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software.</li>
-<li>You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws.</li>
-<li>You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software.</li>
-<li><b>IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.</b></li>
-<li>All transaction requests are irreversible.</li>
-<li>The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network.</li>
-<li>To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement.</li>
-<li>You assume any and all risks associated with the use of the software.</li>
-<li>In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software.</li>
-<li>We reserve the right to modify this disclaimer from time to time.</li>
+				<ul>
+<li translate>The software you are about to use functions as a free, open source, and multi-signature digital wallet.</li>
+<li translate>The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.</li>
+<li translate>While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software.</li>
+<li translate>You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws.</li>
+<li translate>You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software.</li>
+<li translate><b>IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.</b></li>
+<li translate>All transaction requests are irreversible.</li>
+<li translate>The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network.</li>
+<li translate>To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement.</li>
+<li translate>You assume any and all risks associated with the use of the software.</li>
+<li translate>In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software.</li>
+<li translate>We reserve the right to modify this disclaimer from time to time.</li>
 				</ul>
 			</p>
 

From 28e42aa337a79e98c55b2f7b1a9d85d4749d4e58 Mon Sep 17 00:00:00 2001
From: dabura667 <matsuringo667@gmail.com>
Date: Fri, 18 Sep 2015 00:24:58 +0900
Subject: [PATCH 2/3] update template.pot

---
 i18n/po/template.pot | 64 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index ab3c64520..521970fe5 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -12,6 +12,10 @@ msgstr ""
 msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "<b>IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.</b>"
+msgstr ""
+
 #: public/views/backup.html
 msgid "<b>OR</b> 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers)."
 msgstr ""
@@ -24,22 +28,6 @@ msgstr ""
 msgid "<b>OR</b> the wallet seeds of <b>all</b> copayers in the wallet"
 msgstr ""
 
-#: public/views/disclaimer.html
-msgid ""
-"<li>The software you are about to use functions as a free, open source, and multi-signature digital wallet.</li>\n"
-"<li>The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.</li>\n"
-"<li>While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software.</li>\n"
-"<li>You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws.</li>\n"
-"<li>You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software.</li>\n"
-"<li><b>IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE.</b></li>\n"
-"<li>All transaction requests are irreversible.</li>\n"
-"<li>The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network.</li>\n"
-"<li>To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement.</li>\n"
-"<li>You assume any and all risks associated with the use of the software.</li>\n"
-"<li>In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software.</li>\n"
-"<li>We reserve the right to modify this disclaimer from time to time.</li>"
-msgstr ""
-
 #: public/views/splash.html
 msgid "A multisignature bitcoin wallet"
 msgstr ""
@@ -95,6 +83,10 @@ msgstr ""
 msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "All transaction requests are irreversible."
+msgstr ""
+
 #: public/views/splash.html
 msgid "Already have a wallet?"
 msgstr ""
@@ -685,6 +677,10 @@ msgstr ""
 msgid "Importing..."
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software."
+msgstr ""
+
 #: src/js/services/bwsError.js
 msgid "Incorrect address network"
 msgstr ""
@@ -1279,6 +1275,10 @@ msgstr ""
 msgid "The Ledger Chrome application is not installed"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network."
+msgstr ""
+
 #: src/js/controllers/walletHome.js
 msgid "The payment was created but could not be completed. Please try again from home screen"
 msgstr ""
@@ -1304,6 +1304,14 @@ msgstr ""
 msgid "The seed could require a passphrase to be imported"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin."
+msgstr ""
+
+#: public/views/disclaimer.html
+msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet."
+msgstr ""
+
 #: src/js/services/bwsError.js
 msgid "The spend proposal is not pending"
 msgstr ""
@@ -1349,6 +1357,10 @@ msgstr ""
 msgid "To restore this {{index.m}}-{{index.n}} shared wallet you will need"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement."
+msgstr ""
+
 #: public/views/modals/txp-details.html
 msgid "Total"
 msgstr ""
@@ -1572,6 +1584,14 @@ msgstr ""
 msgid "Warning: this transaction has unconfirmed inputs"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "We reserve the right to modify this disclaimer from time to time."
+msgstr ""
+
+#: public/views/disclaimer.html
+msgid "While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software."
+msgstr ""
+
 #: public/views/backup.html
 msgid "Write it down and keep them somewhere safe."
 msgstr ""
@@ -1588,6 +1608,18 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws."
+msgstr ""
+
+#: public/views/disclaimer.html
+msgid "You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software."
+msgstr ""
+
+#: public/views/disclaimer.html
+msgid "You assume any and all risks associated with the use of the software."
+msgstr ""
+
 #: public/views/backup.html
 msgid "You can safely install your wallet on another device and use it from multiple devices at the same time."
 msgstr ""

From 6fa4fdffb5c8dd4a2c59a9ecd95d2500524d181a Mon Sep 17 00:00:00 2001
From: dabura667 <matsuringo667@gmail.com>
Date: Fri, 18 Sep 2015 01:03:22 +0900
Subject: [PATCH 3/3] add original english disclaimer link

---
 i18n/po/template.pot             | 4 ++++
 public/views/disclaimer.html     | 3 +++
 src/js/controllers/disclaimer.js | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index 521970fe5..e3cfef575 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -845,6 +845,10 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#: public/views/disclaimer.html
+msgid "Official English Disclaimer"
+msgstr ""
+
 #: public/views/backup.html
 msgid "Once you have copy your wallet seed, it is recommended to delete it from this device."
 msgstr ""
diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index 25306cdf5..5b988b940 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -28,6 +28,9 @@
 <li translate>We reserve the right to modify this disclaimer from time to time.</li>
 				</ul>
 			</p>
+			<p ng-show="lang != 'en'">
+			  <a class="center" ng-click="$root.openExternalLink('https://copay.io/disclaimer')" translate>Official English Disclaimer</a>
+			</p>
 
 			<div ng-show="!agreed">
 				<p translate>I affirm that I have read, understood, and agree with these terms.</p>
diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js
index 1251e42bc..88533fd31 100644
--- a/src/js/controllers/disclaimer.js
+++ b/src/js/controllers/disclaimer.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('disclaimerController',
-  function($scope, $timeout, storageService, applicationService, gettextCatalog, isCordova) {
+  function($scope, $timeout, storageService, applicationService, gettextCatalog, isCordova, uxLanguage) {
 
     $scope.agree = function() {
       if (isCordova) {
@@ -22,6 +22,7 @@ angular.module('copayApp.controllers').controller('disclaimerController',
     
     $scope.init = function() {
       storageService.getCopayDisclaimerFlag(function(err, val) {
+        $scope.lang = uxLanguage.currentLanguage;
         $scope.agreed = val;
         $timeout(function() {
           $scope.$digest();