From de43990882292ac911f7036947112dc9f2e86861 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Fri, 12 Sep 2014 10:24:27 -0300
Subject: [PATCH 1/6] Conflicts fixed

---
 js/directives.js  | 12 +++++++-----
 views/create.html | 14 ++++++++++++++
 views/join.html   |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/js/directives.js b/js/directives.js
index 897757e39..27a4a131c 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -6,17 +6,16 @@ var bignum = bitcore.Bignum;
 var preconditions = require('preconditions').singleton();
 
 angular.module('copayApp.directives')
-  .directive('validAddress', ['$rootScope', function($rootScope) {
 
+.directive('validAddress', ['$rootScope',
+  function($rootScope) {
     return {
       require: 'ngModel',
       link: function(scope, elem, attrs, ctrl) {
         var validator = function(value) {
 
           // If we're setting the domain, ignore the change.
-          if ($rootScope.merchant
-              && $rootScope.merchant.domain
-              && value === $rootScope.merchant.domain) {
+          if ($rootScope.merchant && $rootScope.merchant.domain && value === $rootScope.merchant.domain) {
             ctrl.$setValidity('validAddress', true);
             return value;
           }
@@ -27,6 +26,7 @@ angular.module('copayApp.directives')
             return value;
           }
 
+
           // Bip21 uri
           if (/^bitcoin:/.test(value)) {
             var uri = new bitcore.BIP21(value);
@@ -41,11 +41,13 @@ angular.module('copayApp.directives')
           return value;
         };
 
+
         ctrl.$parsers.unshift(validator);
         ctrl.$formatters.unshift(validator);
       }
     };
-  }])
+  }
+])
   .directive('enoughAmount', ['$rootScope',
     function($rootScope) {
       var w = $rootScope.wallet;
diff --git a/views/create.html b/views/create.html
index ddc4c6ce8..fca8cfb3c 100644
--- a/views/create.html
+++ b/views/create.html
@@ -30,6 +30,7 @@
                 <input id="walletPassword" type="password" placeholder="{{'Choose your password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
                   <i>{{passwordStrength}}</i><br/><span
                     class='size-12'>Tip: Use lower and uppercase, numbers and
+<<<<<<< HEAD
                     symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
 
                 <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
@@ -38,6 +39,19 @@
                   <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-click="changeNetwork()" ng-checked="networkName == 'testnet' ? true : false">
                   <label for="network-name">Use test network</label>
                 </div>
+=======
+                    symbols</span>" 
+                  tooltip-trigger="focus" required
+                  tooltip-placement="top">
+
+                  <small translate class="is-valid" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">Please enter the same password you entered above</small>
+                  <input type="password" 
+                  placeholder="{{'Repeat password'|translate}}"
+                  name="walletPasswordConfirm"
+                  ng-model="walletPasswordConfirm" 
+                  match="walletPassword" 
+                  required>
+>>>>>>> Fixed
               </div>
 
               <a class="expand small" ng-click="hideAdv=!hideAdv">
diff --git a/views/join.html b/views/join.html
index 9f972d352..7e58dba5d 100644
--- a/views/join.html
+++ b/views/join.html
@@ -64,6 +64,7 @@
               numbers and symbols</span>" tooltip-trigger="focus" 
               tooltip-placement="top" required>
 
+            <small translate class="is-valid" ng-show="joinForm.joinPasswordConfirm.$dirty &&  joinForm.$invalid">Please enter the same password you entered above</small>
             <input type="password" 
             placeholder="{{'Repeat password'|translate}}"
             name="joinPasswordConfirm"

From 72d2e16415e5c5ebfd372d780669a11413d4661a Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Fri, 12 Sep 2014 10:33:28 -0300
Subject: [PATCH 2/6] Fixed

---
 views/create.html | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/views/create.html b/views/create.html
index fca8cfb3c..ca7a897c1 100644
--- a/views/create.html
+++ b/views/create.html
@@ -30,28 +30,14 @@
                 <input id="walletPassword" type="password" placeholder="{{'Choose your password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
                   <i>{{passwordStrength}}</i><br/><span
                     class='size-12'>Tip: Use lower and uppercase, numbers and
-<<<<<<< HEAD
                     symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
-
+                <small translate class="is-valid" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">Please enter the same password you entered above</small>
                 <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
 
                 <div class="text-left">
                   <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-click="changeNetwork()" ng-checked="networkName == 'testnet' ? true : false">
                   <label for="network-name">Use test network</label>
                 </div>
-=======
-                    symbols</span>" 
-                  tooltip-trigger="focus" required
-                  tooltip-placement="top">
-
-                  <small translate class="is-valid" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">Please enter the same password you entered above</small>
-                  <input type="password" 
-                  placeholder="{{'Repeat password'|translate}}"
-                  name="walletPasswordConfirm"
-                  ng-model="walletPasswordConfirm" 
-                  match="walletPassword" 
-                  required>
->>>>>>> Fixed
               </div>
 
               <a class="expand small" ng-click="hideAdv=!hideAdv">

From 4de113fa19297bc63db8f3a7ab950dbcbbed1ad8 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Fri, 12 Sep 2014 12:52:34 -0300
Subject: [PATCH 3/6] Translation added

---
 po/es.po | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/po/es.po b/po/es.po
index c3de76e45..038cb2993 100644
--- a/po/es.po
+++ b/po/es.po
@@ -738,3 +738,12 @@ msgstr "Faltan {{tx.missingSignatures}} firmas"
 #~ msgstr ""
 #~ "Nombre del\n"
 #~ "                monedero"
+
+#: views/create.html
+msgid "Please enter the same password you entered above"
+msgstr "Por favor ingrese la misma contraseña ingresada arriba"
+
+#: views/join.html
+msgid "Please enter the same password you entered above"
+msgstr "Por favor ingrese la misma contraseña ingresada arriba"
+

From 2bb61501bb2aa97aa3ba99b4ce2dca48b0a67fb8 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Fri, 12 Sep 2014 17:06:38 -0300
Subject: [PATCH 4/6] fix ui

---
 po/es.po          | 10 ++++++----
 views/create.html | 18 ++++++++++++------
 views/join.html   | 27 +++++++++++++++++++--------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/po/es.po b/po/es.po
index 038cb2993..0e8aa2757 100644
--- a/po/es.po
+++ b/po/es.po
@@ -740,10 +740,12 @@ msgstr "Faltan {{tx.missingSignatures}} firmas"
 #~ "                monedero"
 
 #: views/create.html
-msgid "Please enter the same password you entered above"
-msgstr "Por favor ingrese la misma contraseña ingresada arriba"
+msgid "Passwords must match"
+msgstr "Las contraseñas deben coincidir"
 
 #: views/join.html
-msgid "Please enter the same password you entered above"
-msgstr "Por favor ingrese la misma contraseña ingresada arriba"
+msgid "Passwords must match"
+msgstr "Las contraseñas deben coincidir"
+
+
 
diff --git a/views/create.html b/views/create.html
index ca7a897c1..f1a2f5178 100644
--- a/views/create.html
+++ b/views/create.html
@@ -24,17 +24,23 @@
                 <input id="Name" type="text" placeholder="{{'Name'|translate}}" class="form-control" ng-model="$parent.myNickname">
               </div>
               <div>
-                <label for="walletPassword"><span translate>Your Wallet Password</span> 
-                  <small translate data-options="disable_for_touch:true" class="has-tip text-gray" tooltip="doesn't need to be shared">Required</small>
+                <label for="walletPassword">
+                  <span translate>Your Password</span> 
                 </label>
-                <input id="walletPassword" type="password" placeholder="{{'Choose your password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
+                <input id="walletPassword" type="password" placeholder="{{'Choose a password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
                   <i>{{passwordStrength}}</i><br/><span
                     class='size-12'>Tip: Use lower and uppercase, numbers and
                     symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
-                <small translate class="is-valid" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">Please enter the same password you entered above</small>
-                <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
+                <div class="pr">
+                  <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
+                  <small class="icon-input" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid"><i class="fi-x"></i></small>
+                  <p translate class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
+                    <i class="fi-x m5r"></i>
+                    Passwords must match
+                  </p>
+                </div>
 
-                <div class="text-left">
+                <div class="text-left line-sidebar-t">
                   <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-click="changeNetwork()" ng-checked="networkName == 'testnet' ? true : false">
                   <label for="network-name">Use test network</label>
                 </div>
diff --git a/views/join.html b/views/join.html
index 7e58dba5d..d11b34edf 100644
--- a/views/join.html
+++ b/views/join.html
@@ -22,9 +22,13 @@
             </label>
             
             <div class="row collapse">
-              <div class="large-10 medium-10 small-10 columns">
+              <div class="large-10 medium-10 small-10 columns pr">
                 <input id="connectionId" type="text" class="small-9 columns" 
                 placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
+                <small class="icon-input" ng-show="joinForm.connectionId.$invalid
+                && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
+                <small class="icon-input" ng-show="joinForm.connectionId.$valid
+                && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
               </div>
               <div class="small-2 columns" ng-hide="showScanner || disableScanner">
                   <a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
@@ -64,13 +68,20 @@
               numbers and symbols</span>" tooltip-trigger="focus" 
               tooltip-placement="top" required>
 
-            <small translate class="is-valid" ng-show="joinForm.joinPasswordConfirm.$dirty &&  joinForm.$invalid">Please enter the same password you entered above</small>
-            <input type="password" 
-            placeholder="{{'Repeat password'|translate}}"
-            name="joinPasswordConfirm"
-            ng-model="joinPasswordConfirm" 
-            match="joinPassword" required>
-            <a class="expand small left"  ng-click="hideAdv=!hideAdv">
+            <div class="pr line-sidebar-b">
+              <input type="password" 
+              placeholder="{{'Repeat password'|translate}}"
+              name="joinPasswordConfirm"
+              ng-model="joinPasswordConfirm" 
+              match="joinPassword" required>
+              <small class="icon-input" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid"><i class="fi-x"></i></small>
+              <p translate class="m15b text-gray size-12" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid">
+                <i class="fi-x m5r"></i>
+                {{'Passwords must match'|translate}}
+              </p>
+            </div>
+
+            <a class="expand small"  ng-click="hideAdv=!hideAdv">
               <span translate ng-hide="!hideAdv">Show</span> 
               <span translate ng-hide="hideAdv">Hide</span> 
               <span translate>advanced options</span>

From a599251b39ef2897ad9b4988c7d6996b9a71991e Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Sat, 13 Sep 2014 08:46:55 -0300
Subject: [PATCH 5/6] Fixed

---
 js/controllers/join.js | 9 ++++-----
 views/create.html      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/controllers/join.js b/js/controllers/join.js
index 2a9ee0c51..2de8fa49a 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('JoinController',
     $scope.loading = false;
     $scope.isMobile = !!window.cordova;
 
-   // QR code Scanner
+    // QR code Scanner
     var cameraInput;
     var video;
     var canvas;
@@ -15,14 +15,13 @@ angular.module('copayApp.controllers').controller('JoinController',
     var context;
     var localMediaStream;
 
-    $scope.hideAdv=true;
-
+    $scope.hideAdv = true;
 
 
     navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
 
-    if (!window.cordova && !navigator.getUserMedia) 
-      $scope.disableScanner =1;
+    if (!window.cordova && !navigator.getUserMedia)
+      $scope.disableScanner = 1;
 
     var _scan = function(evt) {
       if (localMediaStream) {
diff --git a/views/create.html b/views/create.html
index f1a2f5178..a22ba56b7 100644
--- a/views/create.html
+++ b/views/create.html
@@ -36,7 +36,7 @@
                   <small class="icon-input" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid"><i class="fi-x"></i></small>
                   <p translate class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
                     <i class="fi-x m5r"></i>
-                    Passwords must match
+                   {{'Passwords must match'|translate}}
                   </p>
                 </div>
 

From 3818044a2ea464d9ec1c878034be98c56e4bfa04 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Mon, 15 Sep 2014 10:50:06 -0300
Subject: [PATCH 6/6] Translations fixed

---
 po/es.po          | 142 +++++++++++++++++++++++++---------------------
 views/create.html |   2 +-
 views/join.html   |   5 +-
 3 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/po/es.po b/po/es.po
index 0e8aa2757..69a693a3f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.8\n"
+"X-Generator: Poedit 1.6.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: views/create.html
@@ -17,8 +17,9 @@ msgid "(*) The limits are imposed by the bitcoin network."
 msgstr "(*) Los límites son impuestos por la red de bitcoin."
 
 #: views/more.html
+#, fuzzy
 msgid ""
-"ALL Transactions Proposals will be discarted. This need to be done on "
+"ALL Transactions Proposals will be discarted. This needs to be done on "
 "<b>ALL<b> peers of a wallet, to prevent the old proposals to be resynced "
 "again.\n"
 "        </b></b>"
@@ -52,7 +53,7 @@ msgstr "Libreta de Direcciones"
 msgid "Addresses"
 msgstr "Direcciones"
 
-#: views/settings.html
+#: views/more.html
 msgid "Alternative Currency"
 msgstr "Moneda Alternativa"
 
@@ -93,9 +94,9 @@ msgstr "Balance"
 msgid "Balance locked in pending transaction proposals"
 msgstr "Balance bloqueado en las propuestas de transacción pendientes"
 
-#: views/settings.html
-msgid "Bitcoin Network"
-msgstr "Red Bitcoin"
+#: views/send.html
+msgid "Bitcoin address"
+msgstr "Dirección bitcoin"
 
 #: views/includes/transaction.html
 msgid "Broadcast Transaction"
@@ -113,11 +114,16 @@ msgstr "Cancelar"
 msgid "Certificate:"
 msgstr "Certificado:"
 
+#: views/create.html
+#, fuzzy
+msgid "Choose a password"
+msgstr "Escribe tu contraseña"
+
 #: views/import.html
 msgid "Choose backup file from your computer"
 msgstr "Seleccione el archivo backup de su computadora"
 
-#: views/create.html views/join.html
+#: views/join.html
 msgid "Choose your password"
 msgstr "Escribe tu contraseña"
 
@@ -161,6 +167,12 @@ msgstr "Crear nuevo monedero"
 msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet"
 msgstr "Crea monedero {{requiredCopayers}}-de-{{totalCopayers}}"
 
+#: views/copayers.html
+msgid "Creating and storing a backup will allow you to recover wallet funds"
+msgstr ""
+"Crear y guardar una copia de seguridad  le permitirá recuperar el dinero de "
+"su monedero"
+
 #: views/create.html
 msgid "Creating wallet..."
 msgstr "Creando monedero..."
@@ -181,10 +193,6 @@ msgstr "Eliminar"
 msgid "Delete Wallet"
 msgstr "Borrar Monedero"
 
-#: views/copayers.html
-msgid "Delete wallet"
-msgstr "Borrar monedero"
-
 #: views/copayers.html
 msgid "Download Backup"
 msgstr "Descargar Copia de Seguridad"
@@ -193,10 +201,6 @@ msgstr "Descargar Copia de Seguridad"
 msgid "Download File"
 msgstr "Descargar Archivo"
 
-#: views/copayers.html
-msgid "Download seed backup"
-msgstr "Descargar copia de seguridad"
-
 #: views/send.html
 msgid "Empty. Create an alias for your addresses"
 msgstr "Vacío. Crea una etiqueta para tus direcciones"
@@ -213,8 +217,8 @@ msgstr "Tasa"
 msgid "Get QR code"
 msgstr "Obtener código QR"
 
-#: views/copayers.html views/create.html views/import.html views/join.html
-#: views/more.html views/transactions.html
+#: views/create.html views/import.html views/join.html views/more.html
+#: views/transactions.html
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -243,12 +247,9 @@ msgid "Including fee of"
 msgstr "Incluye tasa de"
 
 #: views/settings.html
-msgid "Insight API server"
-msgstr "Servidor API Insight"
-
-#: views/settings.html
+#, fuzzy
 msgid ""
-"Insight API server is open-source software.  You can run your own instance, "
+"Insight API server is open-source software. You can run your own instances, "
 "check <a href=\"http://insight.is\" target=\"_blank\">Insight API Homepage</"
 "a>"
 msgstr ""
@@ -256,6 +257,11 @@ msgstr ""
 "propia instancia en <a href=\"http://insight.is\" target=\"_blank\">Insight "
 "API Homepage</a>"
 
+#: views/settings.html
+#, fuzzy
+msgid "Insight API servers"
+msgstr "Servidor API Insight"
+
 #: views/send.html
 msgid "Insufficient funds"
 msgstr "Fondos insuficientes"
@@ -316,16 +322,6 @@ msgstr "Nombre"
 msgid "Network Error. Attempting to reconnect..."
 msgstr "Error de Red. Intentando reconectar..."
 
-#: views/settings.html
-msgid ""
-"Network has been fixed to <strong>{{networkName}}</strong> in this setup. "
-"See <a href=\"https://copay.io\">copay.io</a> for options to use Copay on "
-"both livenet and testnet."
-msgstr ""
-"La red fue fijada a <strong>{{networkName}}</strong> para esta "
-"configuración. Ver <a href=\"https://copay.io\">copay.io</a> para más "
-"opciones de uso de Copay en livenet y testnet."
-
 #: views/copayers.html
 msgid "New Wallet Created"
 msgstr "Nuevo Monedero Creado"
@@ -389,6 +385,10 @@ msgstr "Página no encontrada"
 msgid "Password"
 msgstr "Contraseña"
 
+#: views/create.html views/join.html
+msgid "Passwords must match"
+msgstr "Las contraseñas deben coincidir"
+
 #: views/join.html
 msgid "Paste wallet secret here"
 msgstr "Pegar código secreto del monedero aquí"
@@ -398,8 +398,9 @@ msgid "Payment Expiration:"
 msgstr "Vencimiento de Pago:"
 
 #: views/more.html
+#, fuzzy
 msgid ""
-"Pending Transactions Proposals will be discarted. This need to be done on "
+"Pending Transactions Proposals will be discarted. This needs to be done on "
 "<b>ALL<b> peers of a wallet, to prevent the old proposals to be resynced "
 "again.\n"
 "        </b></b>"
@@ -409,10 +410,6 @@ msgstr ""
 "prevenir que viejas propuestas sean re sincronizadas de nuevo.\n"
 "        </b></b>"
 
-#: views/settings.html
-msgid "Port"
-msgstr "Puerto"
-
 #: views/uri-payment.html
 msgid "Preparing payment..."
 msgstr "Preparando pago..."
@@ -457,11 +454,11 @@ msgstr "Rechazar"
 msgid "Repeat password"
 msgstr "Repite la contraseña"
 
-#: views/create.html views/import.html views/join.html
+#: views/import.html views/join.html
 msgid "Required"
 msgstr "Requerido"
 
-#: views/settings.html
+#: views/more.html views/settings.html
 msgid "Save"
 msgstr "Guardar"
 
@@ -513,8 +510,8 @@ msgstr "Configuración"
 msgid "Share this secret with your other copayers"
 msgstr "Compartir el código secreto con tus otros compañeros"
 
-#: views/copayers.html views/create.html views/import.html views/join.html
-#: views/more.html views/transactions.html
+#: views/create.html views/import.html views/join.html views/more.html
+#: views/transactions.html
 msgid "Show"
 msgstr "Mostrar"
 
@@ -530,6 +527,10 @@ msgstr "Ver menos"
 msgid "Sign"
 msgstr "Firmar"
 
+#: views/copayers.html
+msgid "Skip Backup"
+msgstr "Saltear Copia de Seguridad"
+
 #: views/import.html
 msgid "Skip public keys from peers"
 msgstr "Ignorar claves pública de los compañeros"
@@ -559,8 +560,8 @@ msgstr ""
 "sincronización de direcciones a los demás compañeros conectados."
 
 #: views/send.html
-msgid "To address"
-msgstr "Dirección"
+msgid "To:"
+msgstr "Para:"
 
 #: views/transactions.html
 msgid "Total"
@@ -582,10 +583,6 @@ msgstr "Propuestas de Transacción"
 msgid "Transaction finally rejected"
 msgstr "Transacción rechazada"
 
-#: views/settings.html
-msgid "Use SSL"
-msgstr "Usar SSL"
-
 #: views/send.html
 msgid "Use all funds"
 msgstr "Todos los fondos"
@@ -622,7 +619,7 @@ msgstr "Código Secreto del Monedero"
 msgid "Wallet Secret is not valid!"
 msgstr "¡El código secreto no es válido!"
 
-#: views/settings.html
+#: views/more.html
 msgid "Wallet Unit"
 msgstr "Unidad del monedero"
 
@@ -635,8 +632,9 @@ msgid "Warning!"
 msgstr "¡Advertencia!"
 
 #: views/create.html
-msgid "Your Wallet Password"
-msgstr "Contraseña de tu Monedero"
+#, fuzzy
+msgid "Your Password"
+msgstr "Tu contraseña"
 
 #: views/more.html
 msgid ""
@@ -662,8 +660,7 @@ msgstr "Tu contraseña"
 msgid "Your wallet password"
 msgstr "Contraseña de tu monedero"
 
-#: views/copayers.html views/create.html views/import.html views/join.html
-#: views/more.html
+#: views/create.html views/import.html views/join.html views/more.html
 msgid "advanced options"
 msgstr "opciones avanzadas"
 
@@ -676,7 +673,8 @@ msgid "first seen at"
 msgstr "Visto el"
 
 #: views/transactions.html
-msgid "mined at"
+#, fuzzy
+msgid "mined"
 msgstr "Minado el"
 
 #: views/send.html
@@ -719,6 +717,33 @@ msgstr "deben unirse"
 msgid "{{tx.missingSignatures}} signatures missing"
 msgstr "Faltan {{tx.missingSignatures}} firmas"
 
+#~ msgid "Bitcoin Network"
+#~ msgstr "Red Bitcoin"
+
+#~ msgid "Delete wallet"
+#~ msgstr "Borrar monedero"
+
+#~ msgid "Download seed backup"
+#~ msgstr "Descargar copia de seguridad"
+
+#~ msgid ""
+#~ "Network has been fixed to <strong>{{networkName}}</strong> in this setup. "
+#~ "See <a href=\"https://copay.io\">copay.io</a> for options to use Copay on "
+#~ "both livenet and testnet."
+#~ msgstr ""
+#~ "La red fue fijada a <strong>{{networkName}}</strong> para esta "
+#~ "configuración. Ver <a href=\"https://copay.io\">copay.io</a> para más "
+#~ "opciones de uso de Copay en livenet y testnet."
+
+#~ msgid "Port"
+#~ msgstr "Puerto"
+
+#~ msgid "Use SSL"
+#~ msgstr "Usar SSL"
+
+#~ msgid "Your Wallet Password"
+#~ msgstr "Contraseña de tu Monedero"
+
 #~ msgid "Send"
 #~ msgstr "Enviar"
 
@@ -738,14 +763,3 @@ msgstr "Faltan {{tx.missingSignatures}} firmas"
 #~ msgstr ""
 #~ "Nombre del\n"
 #~ "                monedero"
-
-#: views/create.html
-msgid "Passwords must match"
-msgstr "Las contraseñas deben coincidir"
-
-#: views/join.html
-msgid "Passwords must match"
-msgstr "Las contraseñas deben coincidir"
-
-
-
diff --git a/views/create.html b/views/create.html
index a22ba56b7..7d6c846f3 100644
--- a/views/create.html
+++ b/views/create.html
@@ -34,7 +34,7 @@
                 <div class="pr">
                   <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
                   <small class="icon-input" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid"><i class="fi-x"></i></small>
-                  <p translate class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
+                  <p class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
                     <i class="fi-x m5r"></i>
                    {{'Passwords must match'|translate}}
                   </p>
diff --git a/views/join.html b/views/join.html
index d11b34edf..3fe71ab36 100644
--- a/views/join.html
+++ b/views/join.html
@@ -25,8 +25,7 @@
               <div class="large-10 medium-10 small-10 columns pr">
                 <input id="connectionId" type="text" class="small-9 columns" 
                 placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
-                <small class="icon-input" ng-show="joinForm.connectionId.$invalid
-                && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
+                <small class="icon-input" ng-show="joinForm.connectionId.$invalid && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
                 <small class="icon-input" ng-show="joinForm.connectionId.$valid
                 && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
               </div>
@@ -75,7 +74,7 @@
               ng-model="joinPasswordConfirm" 
               match="joinPassword" required>
               <small class="icon-input" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid"><i class="fi-x"></i></small>
-              <p translate class="m15b text-gray size-12" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid">
+              <p class="m15b text-gray size-12" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid">
                 <i class="fi-x m5r"></i>
                 {{'Passwords must match'|translate}}
               </p>