Merge pull request #1346 from cmgustavo/bug/03-ui

Bug/03 ui

Author: matiu

po/es.po

@@ -68,7 +68,7 @@ msgstr "Importe en"
 msgid "Are you sure to delete this wallet from this computer?"
 msgstr "¿Estas seguro de borrar este monedero de tu computadora?"
 
-#: views/join.html views/open.html
+#: views/join.html
 msgid "Authenticating and looking for peers..."
 msgstr "Autenticando y buscando compañeros..."
 
@@ -109,6 +109,10 @@ msgstr "Navegador no soportado"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: views/send.html
+msgid "Certificate:"
+msgstr "Certificado:"
+
 #: views/import.html
 msgid "Choose backup file from your computer"
 msgstr "Seleccione el archivo backup de su computadora"
@@ -125,6 +129,10 @@ msgstr "Cerrar"
 msgid "Confirmations"
 msgstr "Confirmaciones"
 
+#: views/open.html
+msgid "Connecting..."
+msgstr "Conectando..."
+
 #: views/warning.html
 msgid "Continue anyways"
 msgstr "Continuar de todas maneras"
@@ -201,12 +209,12 @@ msgstr "Fondos para vacaciones en familia"
 msgid "Fee"
 msgstr "Tasa"
 
-#: views/join.html
+#: views/join.html views/send.html
 msgid "Get QR code"
 msgstr "Obtener código QR"
 
-#: views/create.html views/import.html views/join.html views/more.html
-#: views/transactions.html
+#: views/copayers.html views/create.html views/import.html views/join.html
+#: views/more.html views/transactions.html
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -296,10 +304,18 @@ msgstr "Master Private Key"
 msgid "Me"
 msgstr "Yo"
 
+#: views/send.html
+msgid "Merchant Data:"
+msgstr "Negocio:"
+
 #: views/create.html
 msgid "Name"
 msgstr "Nombre"
 
+#: index.html
+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. "
@@ -326,13 +342,13 @@ msgstr "Sin propuestas de transacciones aún."
 msgid "No transactions yet."
 msgstr "Aún no hay transacciones."
 
-#: views/send.html views/modals/address-book.html
+#: views/modals/address-book.html
 msgid "Not valid"
 msgstr "No válido"
 
 #: views/send.html
-msgid "Notes"
-msgstr "Notas"
+msgid "Note"
+msgstr "Nota"
 
 #: views/copayers.html
 msgid "One person has"
@@ -377,6 +393,10 @@ msgstr "Contraseña"
 msgid "Paste wallet secret here"
 msgstr "Pegar código secreto del monedero aquí"
 
+#: views/send.html
+msgid "Payment Expiration:"
+msgstr "Vencimiento de Pago:"
+
 #: views/more.html
 msgid ""
 "Pending Transactions Proposals will be discarted. This need to be done on "
@@ -465,10 +485,6 @@ msgstr "Seleccione las firmas requeridas (*)"
 msgid "Select total number of copayers (*)"
 msgstr "Seleccione el total de compañeros (*)"
 
-#: views/send.html
-msgid "Send"
-msgstr "Enviar"
-
 #: views/send.html
 msgid "Send Proposals"
 msgstr "Enviar Propuestas"
@@ -485,6 +501,10 @@ msgstr "Enviar a"
 msgid "Sent"
 msgstr "Enviado"
 
+#: views/send.html
+msgid "Server Says:"
+msgstr "Mensaje del Servidor:"
+
 #: views/home.html views/more.html
 msgid "Settings"
 msgstr "Configuración"
@@ -493,8 +513,8 @@ msgstr "Configuración"
 msgid "Share this secret with your other copayers"
 msgstr "Compartir el código secreto con tus otros compañeros"
 
-#: views/create.html views/import.html views/join.html views/more.html
-#: views/transactions.html
+#: views/copayers.html views/create.html views/import.html views/join.html
+#: views/more.html views/transactions.html
 msgid "Show"
 msgstr "Mostrar"
 
@@ -510,6 +530,14 @@ msgstr "Ver menos"
 msgid "Sign"
 msgstr "Firmar"
 
+#: views/import.html
+msgid "Skip public keys from peers"
+msgstr "Ignorar claves pública de los compañeros"
+
+#: views/import.html
+msgid "Skip transaction proposals from Backup"
+msgstr "Ignorar propuestas de transacciones desde la Copia de Seguridad"
+
 #: views/import.html
 msgid "Skipping fields: {{skipFields}}"
 msgstr "Saltear campos: {{skipFields}}"
@@ -538,6 +566,10 @@ msgstr "Dirección"
 msgid "Total"
 msgstr "Total"
 
+#: views/send.html
+msgid "Total amount for this transaction:"
+msgstr "Cantidad total de esta transacción:"
+
 #: views/includes/transaction.html
 msgid "Transaction ID"
 msgstr "ID Transacción"
@@ -562,7 +594,7 @@ msgstr "Todos los fondos"
 msgid "User information"
 msgstr "Información de Usuario"
 
-#: views/send.html views/modals/address-book.html
+#: views/modals/address-book.html
 msgid "Valid"
 msgstr "Válido"
 
@@ -630,7 +662,8 @@ msgstr "Tu contraseña"
 msgid "Your wallet password"
 msgstr "Contraseña de tu monedero"
 
-#: views/create.html views/import.html views/join.html views/more.html
+#: views/copayers.html views/create.html views/import.html views/join.html
+#: views/more.html
 msgid "advanced options"
 msgstr "opciones avanzadas"
 
@@ -686,6 +719,9 @@ msgstr "deben unirse"
 msgid "{{tx.missingSignatures}} signatures missing"
 msgstr "Faltan {{tx.missingSignatures}} firmas"
 
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
 #~ msgid ""
 #~ "{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet"
 #~ msgstr "Monedero {{requiredCopayers}}-de-{{totalCopayers}}"

views/import.html

@@ -33,11 +33,15 @@ <h1 class="text-white line-sidebar-b">{{title|translate}}</h1>
 
             <div ng-hide="hideAdv">
               <label>
-              <input translate type="checkbox" class="form-control" name="skipPublicKeyRing" ng-model="skipPublicKeyRing">Skip public keys from peers
+              <input type="checkbox" class="form-control"
+              name="skipPublicKeyRing" ng-model="skipPublicKeyRing"> 
+              <span translate>Skip public keys from peers</span>
               </label>
 
               <label>
-              <input translate type="checkbox" class="form-control" name="skipTxProposals" ng-model="skipTxProposals">Skip transaction proposals from Backup
+              <input type="checkbox" class="form-control"
+              name="skipTxProposals" ng-model="skipTxProposals"> 
+              <span translate>Skip transaction proposals from Backup</span>
               </label>
             </div>
 

views/join.html

@@ -26,7 +26,7 @@ <h1 translate class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
                 <input id="connectionId" type="text" class="small-9 columns" 
                 placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
               </div>
-              <div class="small-2 columns"  ng-hide="disableScanner" ng-hide="showScanner">
+              <div class="small-2 columns" ng-hide="showScanner || disableScanner">
                   <a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
               </div>
               <div class="small-2 columns" ng-show="showScanner">