From 45333651070658d3a208b098645d4a9bb6a9aa7e Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Sun, 13 Sep 2015 00:10:02 -0300
Subject: [PATCH] Fix translate attrs

---
 i18n/po/template.pot                     | 30 ++++++++----------------
 public/views/copayers.html               |  2 +-
 public/views/includes/alert.html         |  2 +-
 public/views/includes/password.html      |  6 ++---
 public/views/includes/sidebar.html       |  2 +-
 public/views/modals/tx-status.html       |  8 +++----
 public/views/preferencesEmail.html       |  2 +-
 public/views/preferencesInformation.html |  2 +-
 public/views/walletHome.html             |  3 ++-
 9 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index c03eda13c..ef2c56325 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -12,6 +12,15 @@ msgstr ""
 msgid "{{fee}} will be discounted for bitcoin networking fees"
 msgstr ""
 
+#: public/views/copayers.html
+#: public/views/walletHome.html
+msgid "{{index.m}}-of-{{index.n}}"
+msgstr ""
+
+#: public/views/includes/sidebar.html
+msgid "{{item.m}}-of-{{item.n}}"
+msgstr ""
+
 #: src/js/controllers/importLegacy.js
 msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance"
 msgstr ""
@@ -252,10 +261,6 @@ msgstr ""
 msgid "Confirmations"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Copayer {{$index}}"
-msgstr ""
-
 #: src/js/services/bwsError.js
 msgid "Copayer already in this wallet"
 msgstr ""
@@ -460,7 +465,7 @@ msgid "Economy"
 msgstr ""
 
 #: public/views/preferencesEmail.html
-msgid "email for wallet notifications"
+msgid "Email for wallet notifications"
 msgstr ""
 
 #: public/views/preferences.html
@@ -800,21 +805,6 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: public/views/copayers.html
-#: public/views/walletHome.html
-#: public/views/includes/sidebar.html
-msgid "of"
-msgstr ""
-
-#: public/views/includes/alert.html
-#: public/views/includes/password.html
-msgid "OK"
-msgstr ""
-
-#: public/views/modals/tx-status.html
-msgid "OKAY"
-msgstr ""
-
 #: public/views/preferencesInformation.html
 msgid "Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time."
 msgstr ""
diff --git a/public/views/copayers.html b/public/views/copayers.html
index e773637f2..4132d42d1 100644
--- a/public/views/copayers.html
+++ b/public/views/copayers.html
@@ -30,7 +30,7 @@
     <h4 class="title oh m0">
       <span translate>Waiting for copayers</span>
       <span class="text-gray right">
-        [ {{index.m}} <span translate>of</span> {{index.n}} ]
+        [ <span translate>{{index.m}}-of-{{index.n}}</span> ]
       </span>
     </h4>
     <div class="p10 line-b" ng-include="'views/includes/copayers.html'"></div>
diff --git a/public/views/includes/alert.html b/public/views/includes/alert.html
index a3a25ee4d..1f14419dc 100644
--- a/public/views/includes/alert.html
+++ b/public/views/includes/alert.html
@@ -8,7 +8,7 @@
         {{index.showAlert.msg|translate}}
     </div>
   <div class="text-center m20t" ng-click="index.showAlert.close()">
-      <a class="button outline light-gray round tiny small-4" translate>OK</a>
+      <a class="button outline light-gray round tiny small-4">OK</a>
     </div>
   </div>
  </div>
diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index 5f59ca1b7..64f5d0961 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -29,15 +29,15 @@
     <div class="small-6 columns">
       <button class="round expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password"
         ng-style="{'background-color':index.backgroundColor}">
-        <span translate ng-if="index.askPassword.isSetup" translate>SET</span>
-        <span translate ng-if="!index.askPassword.isSetup" translate>OK</span>
+        <span ng-if="index.askPassword.isSetup" translate>SET</span>
+        <span ng-if="!index.askPassword.isSetup">OK</span>
       </button>
     </div>
   </div>
 
     <p class="text-warning size-12 columns m20t text-center" ng-show="index.askPassword.isSetup">
       <i class="fi-alert"></i>
-      <span translate ng-show="!pass.error"> Password cannot be recovered. Be sure to write it down</span>
+      <span translate ng-show="!pass.error">Password cannot be recovered. Be sure to write it down</span>
 
       <span ng-show="pass.error">{{pass.error|translate}}</span>
     </p>
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html
index e1ed9f34f..030db56d3 100644
--- a/public/views/includes/sidebar.html
+++ b/public/views/includes/sidebar.html
@@ -12,7 +12,7 @@
       <div class="avatar-wallet"
         ng-style="{'background-color':item.color}">{{(item.name || item.id) | limitTo: 1}}</div>
       <div class="name-wallet" ng-class="{'m8t':item.n == 1}">{{item.name || item.id}}</div>
-      <div class="size-12" ng-show="item.n > 1">{{item.m}} <span translate>of</span> {{item.n}}</div>
+      <div class="size-12" ng-show="item.n > 1" translate>{{item.m}}-of-{{item.n}}</div>
     </a>
     </li>
     <li>
diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html
index 5f24dacce..507a85e6b 100644
--- a/public/views/modals/tx-status.html
+++ b/public/views/modals/tx-status.html
@@ -5,7 +5,7 @@
     <span translate>Payment Sent</span>
   </div>
   <div class="text-center">
-    <a class="button outline round white tiny small-4" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline round white tiny small-4" ng-click="cancel()">OKAY</a>
   </div>
 </div>
 
@@ -16,7 +16,7 @@
     <span translate>Payment Proposal Created</span>
   </div>
   <div class="text-center">
-    <a class="button outline round light-gray tiny small-4" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline round light-gray tiny small-4" ng-click="cancel()">OKAY</a>
   </div>
 </div>
 
@@ -28,7 +28,7 @@
     <span translate>Payment Accepted</span>
   </div>
   <div class="text-center">
-    <a class="button outline round light-gray tiny small-4" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline round light-gray tiny small-4" ng-click="cancel()">OKAY</a>
   </div>
 </div>
 
@@ -38,6 +38,6 @@
     <span translate>Payment Rejected</span>
   </div>
   <div class="text-center">
-    <a class="button outline light-gray round tiny small-4" ng-click="cancel()" translate>OKAY</a>
+    <a class="button outline light-gray round tiny small-4" ng-click="cancel()">OKAY</a>
   </div>
 </div>
diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html
index 55cac6990..0d3995724 100644
--- a/public/views/preferencesEmail.html
+++ b/public/views/preferencesEmail.html
@@ -29,7 +29,7 @@
       </span>
     </div>
 
-    <label translate>email for wallet notifications</label>
+    <label translate>Email for wallet notifications</label>
     <input type="email" id="email" name="email" ng-model="prefEmail.email" required>
     <input type="submit" class="button expand black round" value="{{'Save'|translate}}"
     ng-style="{'background-color':index.backgroundColor}" ng-disabled="emailForm.$invalid && !index.preferences.email">
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index 581ea93ad..c8f043b53 100644
--- a/public/views/preferencesInformation.html
+++ b/public/views/preferencesInformation.html
@@ -55,7 +55,7 @@
     <h4 class="title m0" translate>Extended Public Keys</h4>
       <li class="line-b p10"  ng-repeat="pk in pubKeys">
         <div class="row">
-          <div class="small-3 columns" translate>Copayer</span> {{$index}}
+          <div class="small-3 columns">Copayer {{$index}}
           </div>
           
           <div class="small-9 columns oh enable_text_select text-gray" style="text-overflow:ellipsis">
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 047936eeb..50b4db9a7 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -123,7 +123,8 @@
               {{(index.alias || index.walletName)}}
               </p>
               <div class="size-12 text-gray">
-                <span translate>Multisignature wallet</span> ({{index.m}} <span translate>of</span> {{index.n}})
+                <span translate>Multisignature wallet</span> 
+                (<span translate>{{index.m}}-of-{{index.n}}</span>)
                 <span ng-if="index.network != 'livenet'">- Testnet</span>
                 <span ng-if="!index.canSign"> - <span translate>No Private key</span></span>
               </div>