Update translation. Removed old files

po/es.po

@@ -36,36 +36,20 @@ msgstr ""
 "* Usted puede instalar la copia de seguridad en otro dispositivo y usar el "
 "monedero al mismo tiempo en varios dispositivos."
 
-#: public/views/modals/address-book.html
-msgid "Add"
-msgstr "Agregar"
-
-#: public/views/modals/address-book.html
-msgid "Add a new entry"
-msgstr "Nueva Entrada"
-
-#: public/views/modals/address-book.html
-msgid "Add entry"
-msgstr "Nueva Entrada"
-
 #: public/views/includes/sidebar.html
 msgid "Add wallet"
 msgstr "Agregar monedero"
 
-#: public/views/paymentUri.html public/views/modals/address-book.html
+#: public/views/paymentUri.html
-#: public/views/modals/qr-address.html
 msgid "Address"
 msgstr "Dirección"
 
-#: public/views/modals/address-book.html
-msgid "Address Book"
-msgstr "Libreta de Direcciones"
-
 #: public/views/preferences.html
 msgid "Alternative Currency"
 msgstr "Moneda Alternativa"
 
 #: public/views/paymentUri.html public/views/send.html
+#: public/views/modals/txp-details.html
 msgid "Amount"
 msgstr "Importe"
 
@@ -73,6 +57,10 @@ msgstr "Importe"
 msgid "Amount in"
 msgstr "Importe en"
 
+#: public/views/preferencesLanguage.html
+msgid "Applying changes"
+msgstr "Aplicando los cambios"
+
 #: public/views/send.html
 msgid "Available Balance"
 msgstr "Balance disponible"
@@ -125,23 +113,21 @@ msgid "CANCEL"
 msgstr "CANCELAR"
 
 #: public/views/copayers.html public/views/send.html
-#: public/views/modals/address-book.html public/views/modals/confirmation.html
+#: public/views/modals/confirmation.html
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: public/views/modals/paypro.html
-msgid "Certified by:"
+msgid "Certified by"
-msgstr "Certificado por:"
+msgstr "Certificado por"
 
 #: public/views/import.html
 msgid "Choose backup file from your computer"
 msgstr "Seleccione el archivo backup de su computadora"
 
-#: public/views/modals/address-book.html public/views/modals/copayers.html
+#: public/views/modals/copayers.html public/views/modals/paypro.html
-#: public/views/modals/paypro.html public/views/modals/qr-address.html
 #: public/views/modals/scanner.html public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
-#: public/views/modals/walletSelection.html
 msgid "Close"
 msgstr "Cerrar"
 
@@ -150,8 +136,8 @@ msgid "Color"
 msgstr "Color"
 
 #: public/views/modals/tx-details.html
-msgid "Confirmations:"
+msgid "Confirmations"
-msgstr "Confirmaciones:"
+msgstr "Confirmaciones"
 
 #: public/views/modals/copayers.html
 msgid "Copayers"
@@ -166,7 +152,7 @@ msgid "Copy this text as it is in a safe place (notepad or email)"
 msgstr ""
 "Copiar el texto como esta en un lugar seguro (notepad o correo electrónico)"
 
-#: public/views/backup.html public/views/modals/qr-address.html
+#: public/views/backup.html
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
@@ -194,22 +180,18 @@ msgstr "Crear nuevo monedero"
 msgid "Create, join or import"
 msgstr "Crear, unirse o importar"
 
+#: public/views/modals/txp-details.html
+msgid "Created by"
+msgstr "Creado por"
+
 #: public/views/create.html public/views/createProfile.html
 msgid "Creating wallet..."
 msgstr "Creando monedero..."
 
-#: public/views/modals/address-book.html
+#: public/views/modals/tx-details.html
-msgid "Creator"
-msgstr "Creador"
-
-#: public/views/modals/address-book.html
 msgid "Date"
 msgstr "Fecha"
 
-#: public/views/modals/tx-details.html
-msgid "Date:"
-msgstr "Fecha:"
-
 #: public/views/preferences.html
 msgid "Delete"
 msgstr "Eliminar"
@@ -222,26 +204,17 @@ msgstr "Descargar copia de seguridad"
 msgid "ENTER"
 msgstr "ENTRAR"
 
-#: public/views/modals/address-book.html
-msgid "Empty. Create an alias for your addresses"
-msgstr "Vacío. Crea una etiqueta para tus direcciones"
-
 #: public/views/preferences.html
 msgid "Encrypt Private Key"
 msgstr "Encriptar Clave Privada"
 
 #: public/views/includes/password.html
-#, fuzzy
 msgid "Enter your password"
 msgstr "Escribe tu contraseña"
 
-#: public/views/modals/address-book.html
+#: public/views/modals/paypro.html public/views/modals/txp-details.html
-msgid "Entry"
+msgid "Expires"
-msgstr "Entrada"
+msgstr "Expira"
-
-#: public/views/modals/paypro.html
-msgid "Expires:"
-msgstr "Expira:"
 
 #: public/views/create.html
 msgid "Family vacation funds"
@@ -319,18 +292,14 @@ msgstr "Unirse a un monedero"
 msgid "Joining shared wallet..."
 msgstr "Unirse a un monedero..."
 
-#: public/views/modals/address-book.html
+#: public/views/preferences.html
-msgid "Label"
+msgid "Language"
-msgstr "Etiqueta"
+msgstr "Idioma"
 
 #: public/views/importLegacy.html
 msgid "Learn more about Wallet Migration"
 msgstr "Más detalles para migrar Monedero"
 
-#: public/views/modals/walletSelection.html
-msgid "Loading..."
-msgstr "Cargando..."
-
 #: public/views/paymentUri.html
 msgid "Make a payment to"
 msgstr "Hacer un pago a"
@@ -344,8 +313,8 @@ msgid "Me"
 msgstr "Yo"
 
 #: public/views/modals/paypro.html public/views/modals/tx-details.html
-msgid "Merchant Message:"
+msgid "Merchant message"
-msgstr "Mensaje del negocio:"
+msgstr "Mensaje del negocio"
 
 #: public/views/paymentUri.html
 msgid "Message"
@@ -375,20 +344,16 @@ msgstr "No hay gastos pendientes en este momento."
 msgid "No transactions yet"
 msgstr "Sin transacciones todavía"
 
-#: public/views/send.html public/views/modals/address-book.html
+#: public/views/send.html
 msgid "Not valid"
 msgstr "No válido"
 
-#: public/views/send.html
+#: public/views/send.html public/views/modals/tx-details.html
+#: public/views/modals/txp-details.html
 msgid "Note"
 msgstr "Nota"
 
-#: public/views/modals/tx-details.html
-msgid "Note:"
-msgstr "Nota:"
-
 #: public/views/modals/confirmation.html
-#, fuzzy
 msgid "OK"
 msgstr "LISTO"
 
@@ -422,6 +387,10 @@ msgstr "Pegar invitación aquí"
 msgid "Payment Sent"
 msgstr "Pago Enviado"
 
+#: public/views/modals/txp-details.html
+msgid "Payment details"
+msgstr "Detalles del pago"
+
 #: public/views/modals/paypro.html
 msgid "Payment protocol request"
 msgstr "Solicitud de pago"
@@ -445,10 +414,6 @@ msgstr "Monedero Personal"
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: public/views/modals/scanner.html
-msgid "QR-Scanner"
-msgstr "Escáner QR"
-
 #: public/views/history.html
 msgid "Received"
 msgstr "Recibido"
@@ -474,7 +439,6 @@ msgid "Repeat password"
 msgstr "Repite la contraseña"
 
 #: public/views/import.html public/views/join.html
-#: public/views/modals/address-book.html
 msgid "Required"
 msgstr "Requerido"
 
@@ -514,10 +478,6 @@ msgstr "Seleccionar el archivo de copia de seguridad"
 msgid "Select a wallet"
 msgstr "Seleccione un monedero"
 
-#: public/views/modals/walletSelection.html
-msgid "Select a wallet to make the payment"
-msgstr "Seleccione monedero para realizar el pago"
-
 #: public/views/create.html
 msgid "Select required signatures"
 msgstr "Seleccione las firmas requeridas"
@@ -578,14 +538,10 @@ msgstr "Mostrar"
 msgid "Sign"
 msgstr "Firmar"
 
-#: public/views/modals/tx-details.html
+#: public/views/modals/tx-details.html public/views/modals/txp-details.html
 msgid "Signatures"
 msgstr "Firmas"
 
-#: public/views/includes/pin.html
-msgid "Skip"
-msgstr "Omitir"
-
 #: public/views/walletHome.html
 msgid "Spend proposals"
 msgstr "Propuestas de gastos"
@@ -614,13 +570,15 @@ msgstr ""
 "Este monedero no esta registrado en el servidor Bitcore Wallet Service "
 "(BWS). Debe recrearlo con la información local disponible."
 
-#: public/views/send.html public/views/includes/transaction.html
+#: public/views/modals/txp-details.html
-msgid "To"
+msgid "Time"
-msgstr "A"
+msgstr "Hora"
 
+#: public/views/send.html public/views/includes/transaction.html
 #: public/views/modals/paypro.html public/views/modals/tx-details.html
-msgid "To:"
+#: public/views/modals/txp-details.html
-msgstr "Para:"
+msgid "To"
+msgstr "Para"
 
 #: public/views/walletHome.html
 msgid "Total Locked Balance"
@@ -647,7 +605,6 @@ msgid "Transaction sent!"
 msgstr "¡Transacción enviada!"
 
 #: public/views/includes/offline.html
-#, fuzzy
 msgid "Trying to reconnnect..."
 msgstr "Intentando reconectar..."
 
@@ -687,10 +644,6 @@ msgstr "Red de prueba"
 msgid "View backup"
 msgstr "Ver Copia de Seguridad"
 
-#: public/views/modals/address-book.html
-msgid "Visible"
-msgstr "Visible"
-
 #: public/views/receive.html
 msgid "WARNING: Backup needed"
 msgstr "ADVERTENCIA: Se requiere hacer copia de seguridad"
@@ -719,6 +672,10 @@ msgstr "Invitación para unirse al monedero"
 msgid "Wallet Invitation is not valid!"
 msgstr "¡Invitación no válida!"
 
+#: public/views/includes/clientError.html
+msgid "Wallet Service Error"
+msgstr "Error en Wallet Service"
+
 #: public/views/copayers.html
 msgid "Wallet incomplete and broken"
 msgstr "Monedero incompleto y roto"
@@ -736,7 +693,6 @@ msgid "You do not have any wallet"
 msgstr "No tienes ningún monedero"
 
 #: public/views/backup.html public/views/import.html
-#, fuzzy
 msgid "Your backup password"
 msgstr "Tu contraseña"
 
@@ -756,16 +712,12 @@ msgstr "Contraseña de tu perfil"
 msgid "advanced options"
 msgstr "opciones avanzadas"
 
-#: public/views/modals/qr-address.html
-msgid "change"
-msgstr "vuelto"
-
 #: public/views/send.html
 msgid "in pending transactions"
 msgstr "en transacciones pendientes"
 
 #: public/views/copayers.html public/views/create.html
-#: public/views/walletHome.html
+#: public/views/walletHome.html public/views/includes/sidebar.html
 msgid "of"
 msgstr "de"
 
@@ -785,12 +737,60 @@ msgstr "monedero"
 msgid "{{index.walletName}} settings"
 msgstr "Opciones de {{index.walletName}}"
 
+#~ msgid "To:"
+#~ msgstr "Para:"
+
+#~ msgid "Add"
+#~ msgstr "Agregar"
+
+#~ msgid "Add a new entry"
+#~ msgstr "Nueva Entrada"
+
+#~ msgid "Add entry"
+#~ msgstr "Nueva Entrada"
+
+#~ msgid "Address Book"
+#~ msgstr "Libreta de Direcciones"
+
+#~ msgid "Creator"
+#~ msgstr "Creador"
+
+#~ msgid "Date:"
+#~ msgstr "Fecha:"
+
+#~ msgid "Empty. Create an alias for your addresses"
+#~ msgstr "Vacío. Crea una etiqueta para tus direcciones"
+
+#~ msgid "Entry"
+#~ msgstr "Entrada"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#~ msgid "Loading..."
+#~ msgstr "Cargando..."
+
+#~ msgid "Note:"
+#~ msgstr "Nota:"
+
+#~ msgid "QR-Scanner"
+#~ msgstr "Escáner QR"
+
+#~ msgid "Select a wallet to make the payment"
+#~ msgstr "Seleccione monedero para realizar el pago"
+
+#~ msgid "Skip"
+#~ msgstr "Omitir"
+
+#~ msgid "Visible"
+#~ msgstr "Visible"
+
+#~ msgid "change"
+#~ msgstr "vuelto"
+
 #~ msgid "BIP32 master extended private key"
 #~ msgstr "BIP32 master extended private key"
 
-#~ msgid "Bitcore Wallet Service"
-#~ msgstr "Bitcore Wallet Service"
-
 #~ msgid "Bitcore Wallet Service URL"
 #~ msgstr "Bitcore Wallet Service URL"
 
@@ -1448,9 +1448,6 @@ msgstr "Opciones de {{index.walletName}}"
 #~ msgid "transaction proposal purged"
 #~ msgstr "propuestas de transacciones purgadas"
 
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
 #~ msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet"
 #~ msgstr "Crea monedero {{requiredCopayers}}-de-{{totalCopayers}}"
 

po/fr.po

@@ -9,20 +9,33 @@ msgstr ""
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Language: fr_FR\n"
+"Language: fr\n"
-"X-Generator: Poedit 1.7.6\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: public/views/splash/1.html
-msgid "* In case you need to import wallets from previous Copay versions go to <b>Menu</b>"
+msgid ""
-msgstr "* Si vous avez besoin d'importer des portefeuilles depuis les versions précédentes de Copay, allez au <b>Menu</b>"
+"* In case you need to import wallets from previous Copay versions go to "
+"<b>Menu</b>"
+msgstr ""
+"* Si vous avez besoin d'importer des portefeuilles depuis les versions "
+"précédentes de Copay, allez au <b>Menu</b>"
 
 #: public/views/modals/txp-details.html
-msgid "* Only transactions created by yourself with no peer signatures can be removed"
+msgid ""
-msgstr "* Seules les transactions créées par vous-même sans signatures de pairs peuvent être supprimées"
+"* Only transactions created by yourself with no peer signatures can be "
+"removed"
+msgstr ""
+"* Seules les transactions créées par vous-même sans signatures de pairs "
+"peuvent être supprimées"
 
 #: public/views/backup.html
-msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time."
+msgid ""
-msgstr "* Vous pouvez installer en toute sécurité votre sauvegarde sur un autre appareil et utiliser votre portefeuille depuis plusieurs appareils en même temps"
+"* You can safely install your backup on other device and use your wallet "
+"from many devices at the same time."
+msgstr ""
+"* Vous pouvez installer en toute sécurité votre sauvegarde sur un autre "
+"appareil et utiliser votre portefeuille depuis plusieurs appareils en même "
+"temps"
 
 #: public/views/modals/address-book.html
 msgid "Add"
@@ -40,8 +53,7 @@ msgstr "Ajouter une entrée"
 msgid "Add wallet"
 msgstr "Ajouter un portefeuille"
 
-#: public/views/paymentUri.html
+#: public/views/paymentUri.html public/views/modals/address-book.html
-#: public/views/modals/address-book.html
 #: public/views/modals/qr-address.html
 msgid "Address"
 msgstr "Adresse"
@@ -54,8 +66,7 @@ msgstr "Carnet d'adresses"
 msgid "Alternative Currency"
 msgstr "Devise alternative"
 
-#: public/views/paymentUri.html
+#: public/views/paymentUri.html public/views/send.html
-#: public/views/send.html
 msgid "Amount"
 msgstr "Montant"
 
@@ -67,8 +78,7 @@ msgstr "Montant en"
 msgid "Available Balance"
 msgstr "Solde disponible"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-#: public/views/join.html
 msgid "BIP32 master extended private key"
 msgstr "Clé privée étendue maîtresse BIP32"
 
@@ -89,8 +99,11 @@ msgid "Backup options"
 msgstr "Options de sauvegarde"
 
 #: public/views/receive.html
-msgid "Before receiving funds, it is highly recommended you backup your wallet keys."
+msgid ""
-msgstr "Avant de recevoir des fonds, il est fortement recommandé de sauvegarder les clés de votre portefeuille."
+"Before receiving funds, it is highly recommended you backup your wallet keys."
+msgstr ""
+"Avant de recevoir des fonds, il est fortement recommandé de sauvegarder les "
+"clés de votre portefeuille."
 
 #: public/views/paymentUri.html
 msgid "Bitcoin URI is NOT valid!"
@@ -116,10 +129,8 @@ msgstr "Mais non diffusée. Essayez de l'envoyer manuellement"
 msgid "CANCEL"
 msgstr "ANNULER"
 
-#: public/views/copayers.html
+#: public/views/copayers.html public/views/send.html
-#: public/views/send.html
+#: public/views/modals/address-book.html public/views/modals/confirmation.html
-#: public/views/modals/address-book.html
-#: public/views/modals/confirmation.html
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -131,12 +142,9 @@ msgstr "Certifié par :"
 msgid "Choose backup file from your computer"
 msgstr "Choisissez un fichier de sauvegarde depuis votre ordinateur"
 
-#: public/views/modals/address-book.html
+#: public/views/modals/address-book.html public/views/modals/copayers.html
-#: public/views/modals/copayers.html
+#: public/views/modals/paypro.html public/views/modals/qr-address.html
-#: public/views/modals/paypro.html
+#: public/views/modals/scanner.html public/views/modals/tx-details.html
-#: public/views/modals/qr-address.html
-#: public/views/modals/scanner.html
-#: public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
 #: public/views/modals/walletSelection.html
 msgid "Close"
@@ -162,8 +170,7 @@ msgstr "Copiez la sauvegarde dans un endroit sûr"
 msgid "Copy this text as it is in a safe place (notepad or email)"
 msgstr "Copiez le texte dans un endroit sûr (bloc-notes ou e-mail)"
 
-#: public/views/backup.html
+#: public/views/backup.html public/views/modals/qr-address.html
-#: public/views/modals/qr-address.html
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papier"
 
@@ -179,8 +186,7 @@ msgstr "Impossible de récupérer l'historique des transactions"
 msgid "Could not update Wallet"
 msgstr "Impossible de mettre à jour le portefeuille"
 
-#: public/views/create.html
+#: public/views/create.html public/views/walletHome.html
-#: public/views/walletHome.html
 msgid "Create"
 msgstr "Créer"
 
@@ -192,8 +198,7 @@ msgstr "Créer un nouveau portefeuille"
 msgid "Create, join or import"
 msgstr "Créer, joindre ou importer"
 
-#: public/views/create.html
+#: public/views/create.html public/views/createProfile.html
-#: public/views/createProfile.html
 msgid "Creating wallet..."
 msgstr "Création du portefeuille..."
 
@@ -261,8 +266,7 @@ msgstr "Acquisition des transactions..."
 msgid "Global settings"
 msgstr "Paramètres globaux"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-#: public/views/join.html
 msgid "Hide"
 msgstr "Masquer"
 
@@ -298,13 +302,11 @@ msgstr "Importer un portefeuille"
 msgid "Importing wallet..."
 msgstr "Importation du portefeuille..."
 
-#: public/views/modals/tx-details.html
+#: public/views/modals/tx-details.html public/views/modals/txp-details.html
-#: public/views/modals/txp-details.html
 msgid "Information"
 msgstr "Information"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-#: public/views/join.html
 msgid "John"
 msgstr "John"
 
@@ -340,13 +342,11 @@ msgstr "Faire un paiement à"
 msgid "Master extended private key"
 msgstr "Clé privée étendue maîtresse"
 
-#: public/views/includes/copayers.html
+#: public/views/includes/copayers.html public/views/modals/copayers.html
-#: public/views/modals/copayers.html
 msgid "Me"
 msgstr "Moi"
 
-#: public/views/modals/paypro.html
+#: public/views/modals/paypro.html public/views/modals/tx-details.html
-#: public/views/modals/tx-details.html
 msgid "Merchant Message:"
 msgstr "Message marchand :"
 
@@ -378,8 +378,7 @@ msgstr "Aucune propositions de dépense en attente à ce moment."
 msgid "No transactions yet"
 msgstr "Aucune transaction"
 
-#: public/views/send.html
+#: public/views/send.html public/views/modals/address-book.html
-#: public/views/modals/address-book.html
 msgid "Not valid"
 msgstr "Non valide"
 
@@ -403,14 +402,15 @@ msgstr "Ok"
 msgid "Opening Wallet..."
 msgstr "Ouverture du portefeuille..."
 
-#: public/views/import.html
+#: public/views/import.html public/views/importLegacy.html
-#: public/views/importLegacy.html
 msgid "Password"
 msgstr "Mot de passe"
 
 #: public/views/includes/password.html
 msgid "Password cannot be recovered. Be sure to write it down"
-msgstr "Le mot de passe ne peut pas être récupéré. Assurez-vous de l'écrire sur papier"
+msgstr ""
+"Le mot de passe ne peut pas être récupéré. Assurez-vous de l'écrire sur "
+"papier"
 
 #: public/views/import.html
 msgid "Paste backup plain text code"
@@ -433,8 +433,11 @@ msgid "Payment to"
 msgstr "Paiement à"
 
 #: public/views/preferencesDeleteWallet.html
-msgid "Permanently delete this wallet. WARNING: this action cannot be reversed."
+msgid ""
-msgstr "Supprimer définitivement ce portefeuille. ATTENTION : cette action ne peut pas être annulée."
+"Permanently delete this wallet. WARNING: this action cannot be reversed."
+msgstr ""
+"Supprimer définitivement ce portefeuille. ATTENTION : cette action ne peut "
+"pas être annulée."
 
 #: public/views/walletHome.html
 msgid "Personal Wallet"
@@ -468,13 +471,11 @@ msgstr "Rejeter"
 msgid "Remove transaction"
 msgstr "Supprimer la transaction"
 
-#: public/views/backup.html
+#: public/views/backup.html public/views/includes/password.html
-#: public/views/includes/password.html
 msgid "Repeat password"
 msgstr "Répéter le mot de passe"
 
-#: public/views/import.html
+#: public/views/import.html public/views/join.html
-#: public/views/join.html
 #: public/views/modals/address-book.html
 msgid "Required"
 msgstr "Requis"
@@ -564,11 +565,15 @@ msgid "Share this secret with your copayers"
 msgstr "Partagez ce secret avec vos copayers"
 
 #: public/views/receive.html
-msgid "Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them."
+msgid ""
-msgstr "Partagez ceci avec quiconque pour recevoir des paiements. Pour protéger votre anonymat, de nouvelles adresses sont générées automatiquement une fois que vous les utilisez."
+"Share this with anyone to have them send you payments. To protect your "
+"privacy, new addresses are generated automatically once you use them."
+msgstr ""
+"Partagez ceci avec quiconque pour recevoir des paiements. Pour protéger "
+"votre anonymat, de nouvelles adresses sont générées automatiquement une fois "
+"que vous les utilisez."
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-#: public/views/join.html
 msgid "Show"
 msgstr "Montrer"
 
@@ -597,20 +602,26 @@ msgid "The transaction was removed by creator"
 msgstr "La transaction a été supprimée par le créateur"
 
 #: public/views/backup.html
-msgid "This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup."
+msgid ""
-msgstr "Ce portefeuille a sa clé privée chiffrée. Exporter une sauvegarde gardera la clé privée chiffrée lors de la sauvegarde."
+"This wallet have its private key encrypted. Exporting a backup will keep the "
+"private key encrypted on the backup."
+msgstr ""
+"Ce portefeuille a sa clé privée chiffrée. Exporter une sauvegarde gardera la "
+"clé privée chiffrée lors de la sauvegarde."
 
 #: public/views/walletHome.html
-msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
+msgid ""
-msgstr "Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS). Vous pouvez le recréer depuis l'information locale."
+"This wallet is not registered at the given Bitcore Wallet Service (BWS). You "
+"can recreate it from the local information."
+msgstr ""
+"Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS). "
+"Vous pouvez le recréer depuis l'information locale."
 
-#: public/views/send.html
+#: public/views/send.html public/views/includes/transaction.html
-#: public/views/includes/transaction.html
 msgid "To"
 msgstr "À"
 
-#: public/views/modals/paypro.html
+#: public/views/modals/paypro.html public/views/modals/tx-details.html
-#: public/views/modals/tx-details.html
 msgid "To:"
 msgstr "À :"
 
@@ -642,8 +653,7 @@ msgstr "Transaction envoyée !"
 msgid "Trying to reconnnect..."
 msgstr "Tentative de reconnexion..."
 
-#: public/views/history.html
+#: public/views/history.html public/views/modals/tx-details.html
-#: public/views/modals/tx-details.html
 msgid "Unconfirmed"
 msgstr "Non confirmée"
 
@@ -727,13 +737,11 @@ msgstr "Attention !"
 msgid "You do not have any wallet"
 msgstr "Vous n'avez aucun portefeuille"
 
-#: public/views/backup.html
+#: public/views/backup.html public/views/import.html
-#: public/views/import.html
 msgid "Your backup password"
 msgstr "Votre mot de passe de sauvegarde"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-#: public/views/join.html
 msgid "Your nickname"
 msgstr "Votre surnom"
 
@@ -745,8 +753,7 @@ msgstr "Votre mot de passe"
 msgid "Your profile password"
 msgstr "Votre mot de passe de profil"
 
-#: public/views/create.html
+#: public/views/create.html public/views/join.html
-#: public/views/join.html
 msgid "advanced options"
 msgstr "options avancées"
 
@@ -758,8 +765,7 @@ msgstr "change"
 msgid "in pending transactions"
 msgstr "dans les transactions en attente"
 
-#: public/views/copayers.html
+#: public/views/copayers.html public/views/create.html
-#: public/views/create.html
 #: public/views/walletHome.html
 msgid "of"
 msgstr "de"

po/ja.po

@@ -9,8 +9,8 @@ msgstr ""
 "Last-Translator: \n"
 "Language-Team: dabura667\n"
 "MIME-Version: 1.0\n"
-"Language: ja_JP\n"
+"Language: ja\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: public/views/splash/1.html
 msgid ""

po/template.pot

@@ -16,38 +16,21 @@ msgstr ""
 msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time."
 msgstr ""
 
-#: public/views/modals/address-book.html
-msgid "Add"
-msgstr ""
-
-#: public/views/modals/address-book.html
-msgid "Add a new entry"
-msgstr ""
-
-#: public/views/modals/address-book.html
-msgid "Add entry"
-msgstr ""
-
 #: public/views/includes/sidebar.html
 msgid "Add wallet"
 msgstr ""
 
 #: public/views/paymentUri.html
-#: public/views/modals/address-book.html
-#: public/views/modals/qr-address.html
 msgid "Address"
 msgstr ""
 
-#: public/views/modals/address-book.html
-msgid "Address Book"
-msgstr ""
-
 #: public/views/preferences.html
 msgid "Alternative Currency"
 msgstr ""
 
 #: public/views/paymentUri.html
 #: public/views/send.html
+#: public/views/modals/txp-details.html
 msgid "Amount"
 msgstr ""
 
@@ -55,6 +38,10 @@ msgstr ""
 msgid "Amount in"
 msgstr ""
 
+#: public/views/preferencesLanguage.html
+msgid "Applying changes"
+msgstr ""
+
 #: public/views/send.html
 msgid "Available Balance"
 msgstr ""
@@ -105,27 +92,23 @@ msgstr ""
 
 #: public/views/copayers.html
 #: public/views/send.html
-#: public/views/modals/address-book.html
 #: public/views/modals/confirmation.html
 msgid "Cancel"
 msgstr ""
 
 #: public/views/modals/paypro.html
-msgid "Certified by:"
+msgid "Certified by"
 msgstr ""
 
 #: public/views/import.html
 msgid "Choose backup file from your computer"
 msgstr ""
 
-#: public/views/modals/address-book.html
 #: public/views/modals/copayers.html
 #: public/views/modals/paypro.html
-#: public/views/modals/qr-address.html
 #: public/views/modals/scanner.html
 #: public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
-#: public/views/modals/walletSelection.html
 msgid "Close"
 msgstr ""
 
@@ -134,7 +117,7 @@ msgid "Color"
 msgstr ""
 
 #: public/views/modals/tx-details.html
-msgid "Confirmations:"
+msgid "Confirmations"
 msgstr ""
 
 #: public/views/modals/copayers.html
@@ -150,7 +133,6 @@ msgid "Copy this text as it is in a safe place (notepad or email)"
 msgstr ""
 
 #: public/views/backup.html
-#: public/views/modals/qr-address.html
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -179,21 +161,17 @@ msgstr ""
 msgid "Create, join or import"
 msgstr ""
 
+#: public/views/modals/txp-details.html
+msgid "Created by"
+msgstr ""
+
 #: public/views/create.html
 #: public/views/createProfile.html
 msgid "Creating wallet..."
 msgstr ""
 
-#: public/views/modals/address-book.html
-msgid "Creator"
-msgstr ""
-
-#: public/views/modals/address-book.html
-msgid "Date"
-msgstr ""
-
 #: public/views/modals/tx-details.html
-msgid "Date:"
+msgid "Date"
 msgstr ""
 
 #: public/views/preferences.html
@@ -208,10 +186,6 @@ msgstr ""
 msgid "ENTER"
 msgstr ""
 
-#: public/views/modals/address-book.html
-msgid "Empty. Create an alias for your addresses"
-msgstr ""
-
 #: public/views/preferences.html
 msgid "Encrypt Private Key"
 msgstr ""
@@ -220,12 +194,9 @@ msgstr ""
 msgid "Enter your password"
 msgstr ""
 
-#: public/views/modals/address-book.html
-msgid "Entry"
-msgstr ""
-
 #: public/views/modals/paypro.html
-msgid "Expires:"
+#: public/views/modals/txp-details.html
+msgid "Expires"
 msgstr ""
 
 #: public/views/create.html
@@ -307,18 +278,14 @@ msgstr ""
 msgid "Joining shared wallet..."
 msgstr ""
 
-#: public/views/modals/address-book.html
+#: public/views/preferences.html
-msgid "Label"
+msgid "Language"
 msgstr ""
 
 #: public/views/importLegacy.html
 msgid "Learn more about Wallet Migration"
 msgstr ""
 
-#: public/views/modals/walletSelection.html
-msgid "Loading..."
-msgstr ""
-
 #: public/views/paymentUri.html
 msgid "Make a payment to"
 msgstr ""
@@ -334,7 +301,7 @@ msgstr ""
 
 #: public/views/modals/paypro.html
 #: public/views/modals/tx-details.html
-msgid "Merchant Message:"
+msgid "Merchant message"
 msgstr ""
 
 #: public/views/paymentUri.html
@@ -366,16 +333,13 @@ msgid "No transactions yet"
 msgstr ""
 
 #: public/views/send.html
-#: public/views/modals/address-book.html
 msgid "Not valid"
 msgstr ""
 
 #: public/views/send.html
-msgid "Note"
-msgstr ""
-
 #: public/views/modals/tx-details.html
-msgid "Note:"
+#: public/views/modals/txp-details.html
+msgid "Note"
 msgstr ""
 
 #: public/views/modals/confirmation.html
@@ -411,6 +375,10 @@ msgstr ""
 msgid "Payment Sent"
 msgstr ""
 
+#: public/views/modals/txp-details.html
+msgid "Payment details"
+msgstr ""
+
 #: public/views/modals/paypro.html
 msgid "Payment protocol request"
 msgstr ""
@@ -431,10 +399,6 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: public/views/modals/scanner.html
-msgid "QR-Scanner"
-msgstr ""
-
 #: public/views/history.html
 msgid "Received"
 msgstr ""
@@ -462,7 +426,6 @@ msgstr ""
 
 #: public/views/import.html
 #: public/views/join.html
-#: public/views/modals/address-book.html
 msgid "Required"
 msgstr ""
 
@@ -502,10 +465,6 @@ msgstr ""
 msgid "Select a wallet"
 msgstr ""
 
-#: public/views/modals/walletSelection.html
-msgid "Select a wallet to make the payment"
-msgstr ""
-
 #: public/views/create.html
 msgid "Select required signatures"
 msgstr ""
@@ -564,13 +523,10 @@ msgid "Sign"
 msgstr ""
 
 #: public/views/modals/tx-details.html
+#: public/views/modals/txp-details.html
 msgid "Signatures"
 msgstr ""
 
-#: public/views/includes/pin.html
-msgid "Skip"
-msgstr ""
-
 #: public/views/walletHome.html
 msgid "Spend proposals"
 msgstr ""
@@ -592,14 +548,16 @@ msgstr ""
 msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
 msgstr ""
 
-#: public/views/send.html
+#: public/views/modals/txp-details.html
-#: public/views/includes/transaction.html
+msgid "Time"
-msgid "To"
 msgstr ""
 
+#: public/views/send.html
+#: public/views/includes/transaction.html
 #: public/views/modals/paypro.html
 #: public/views/modals/tx-details.html
-msgid "To:"
+#: public/views/modals/txp-details.html
+msgid "To"
 msgstr ""
 
 #: public/views/walletHome.html
@@ -667,10 +625,6 @@ msgstr ""
 msgid "View backup"
 msgstr ""
 
-#: public/views/modals/address-book.html
-msgid "Visible"
-msgstr ""
-
 #: public/views/receive.html
 msgid "WARNING: Backup needed"
 msgstr ""
@@ -699,6 +653,10 @@ msgstr ""
 msgid "Wallet Invitation is not valid!"
 msgstr ""
 
+#: public/views/includes/clientError.html
+msgid "Wallet Service Error"
+msgstr ""
+
 #: public/views/copayers.html
 msgid "Wallet incomplete and broken"
 msgstr ""
@@ -738,10 +696,6 @@ msgstr ""
 msgid "advanced options"
 msgstr ""
 
-#: public/views/modals/qr-address.html
-msgid "change"
-msgstr ""
-
 #: public/views/send.html
 msgid "in pending transactions"
 msgstr ""
@@ -749,6 +703,7 @@ msgstr ""
 #: public/views/copayers.html
 #: public/views/create.html
 #: public/views/walletHome.html
+#: public/views/includes/sidebar.html
 msgid "of"
 msgstr ""
 

public/views/includes/clientError.html

@@ -4,7 +4,7 @@
       <i class="fi-alert"></i>
     </div>
     <div class="dr-notification-content">
-      <h3 class="dr-notification-title">Wallet Service Error</h3>
+      <h3 class="dr-notification-title" translate>Wallet Service Error</h3>
       <div class="dr-notification-text ellipsis">
         {{index.clientError.error || index.clientError.message || index.clientError}}
       </div>

public/views/includes/loading.html

@@ -1,6 +0,0 @@
-<div class="loading-screen">
-  <div class="loading-screen-content">
-    <img src="img/ajax-loader.gif" alt="Loading...">
-    <div class="text-gray size-12" ng-show="title">{{title|translate}}...</div>
-  </div>
-</div>

public/views/includes/photo.html

@@ -1 +0,0 @@
-<span class="photo-container"><i class="fi-torso size-42"></i></span>

public/views/includes/pin.html

@@ -1,54 +0,0 @@
-<div ng-controller="pinController as pin" ng-init="pin.init(confirmPin, testPin)">
-  <h3 class="text-center text-white">
-    <span ng-show="pin.askForPin == 1">Setup a PIN</span>
-    <span ng-show="pin.askForPin == 2">Repeat PIN</span>
-  </h3>
-  <div class="text-center size-12 text-warning" ng-show="pin.error || cp.error">
-    {{(pin.error || cp.error)|translate}}
-  </div>
-  <div class="pin" ng-show="!pin.error && !cp.error">
-    <div class="pin-box">
-      <i class="icon-circle" ng-show="!pin.defined[0]"></i>
-      <i class="icon-circle-active" ng-show="pin.defined[0]"></i>
-    </div>
-      
-    <div class="pin-box">
-      <i class="icon-circle" ng-show="!pin.defined[1]"></i>
-      <i class="icon-circle-active" ng-show="pin.defined[1]"></i>
-    </div>
-
-    <div class="pin-box">
-      <i class="icon-circle" ng-show="!pin.defined[2]"></i>
-      <i class="icon-circle-active" ng-show="pin.defined[2]"></i>
-    </div>
-
-    <div class="pin-box">
-      <i class="icon-circle" ng-show="!pin.defined[3]"></i>
-      <i class="icon-circle-active" ng-show="pin.defined[3]"></i>
-    </div>
-  </div>
-  <div class="pin-numbers">
-    <div class="pin-button-bar">
-      <a class="pin-button" ng-click="pin.press(1)">1</a>
-      <a class="pin-button" ng-click="pin.press(2)">2</a>
-      <a class="pin-button" ng-click="pin.press(3)">3</a>
-    </div>
-    <div class="pin-button-bar">
-      <a class="pin-button" ng-click="pin.press(4)">4</a>
-      <a class="pin-button" ng-click="pin.press(5)">5</a>
-      <a class="pin-button" ng-click="pin.press(6)">6</a>
-    </div>
-    <div class="pin-button-bar">
-      <a class="pin-button" ng-click="pin.press(7)">7</a>
-      <a class="pin-button" ng-click="pin.press(8)">8</a>
-      <a class="pin-button" ng-click="pin.press(9)">9</a>
-    </div>
-    <div class="pin-button-bar">
-      <a class="pin-button" ng-click="pin.skip()">
-        <i class="text-primary size-16 vm" translate>Skip</i>
-      </a>
-      <a class="pin-button" ng-click="pin.press(0)">0</a>
-      <a class="pin-button" ng-click="pin.clear()"><i class="fi-arrow-left"></i></a>
-    </div>
-  </div>
-</div>

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="ellipsis name-wallet">{{item.name || item.id}}</div>
-      <div class="size-12">{{item.m}} of {{item.n}}</div> 
+      <div class="size-12">{{item.m}} <span translate>of</span> {{item.n}}</div> 
     </a>
     </li> 
     <li>

public/views/includes/transaction.html

@@ -2,7 +2,7 @@
   ng-class="{'text-gray':!tx.pendingForUs}" 
   ng-click="openTxModal(tx, index.copayers)">
   <div class="m5b size-12 text-gray">
-    <time>{{ (tx.ts || tx.createdTs ) | amTimeAgo}}</time>
+    <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
   </div>
   <div class="row collapse">
     <div class="ellipsis small-8 columns size-14">

public/views/modals/address-book.html

@@ -1,82 +0,0 @@
-<nav class="tab-bar text-right hide-for-large-up">
-  <span ng-click="close()" class="p10 text-white" translate>Close</span>
-</nav>
-<div class="modal-mobile">
-    <h1 ng-show="!showForm" translate>Address Book</h1>
-    <h1 ng-show="showForm" translate>Add a new entry</h1>
-    <p translate class="text-gray m15b" ng-show="!showForm && !hasEntry()" translate>
-      Empty. Create an alias for your addresses
-    </p>
-    <div class="box-notification" ng-show="success">
-      <span class="size-14 text-success">
-        {{success|translate}}
-      </span>
-    </div>
-    <table class="addressbook line-t" ng-show="!showForm && hasEntry()">
-      <thead class="show-for-large-up">
-        <tr>
-          <th translate>Entry</th>
-          <th class="show-for-large-up" ng-class="{'hide-for-small-only' : $root.wallet.isShared()}" ng-show="$root.wallet.isShared()" translate>Creator</th>
-          <th class="show-for-large-up" translate>Date</th>
-          <th class="show-for-large-up" translate>Visible</th>
-        </tr>
-      </thead>
-      <tbody>
-      <tr
-        ng-repeat="(addr, info) in addressBook"
-        ng-class="{'addressbook-disabled': info.hidden}">
-        <td ng-click="copyToSend(addr)">
-          <b>{{info.label}}</b><br>
-          <small class="address-size">{{::addr}}</small>
-        </td>
-        <td class="show-for-large-up" ng-click="copyToSend(addr)" ng-show="$root.wallet.isShared()">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
-        <td ng-click="copyToSend(addr)" class="show-for-large-up"><time>{{::info.createdTs | amCalendar}}</time></td>
-        <td class="show-for-large-up text-center">
-          <a ng-click="toggleAddressBookEntry(addr)" title="{{ info.hidden ? 'Enable' : 'Disable'}} address">
-            <i class="fi-checkbox size-21" 
-              ng-class="{'text-success':!info.hidden, 'text-gray':info.hidden}"></i>
-          </a>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-    <form ng-show="showForm" class="m0" name="addressBookForm" 
-      ng-disabled="loading"
-      ng-submit="submitAddressBook(addressBookForm)" novalidate>
-      <div class="box-notification" ng-show="error">
-        <span class="size-14 text-warning">
-          {{error|translate}}
-        </span>
-      </div>
-      <div class="row collapse">
-        <label for="newaddress" class="left"><span translate>Address</span>
-          <small translate ng-hide="!addressBookForm.newaddress.$pristine || newaddress">Required</small>
-        </label>
-        <span class="has-error right size-12" ng-show="addressBookForm.newaddress.$invalid && newaddress">
-          <span class="icon-input"><i class="fi-x"></i></span>
-          <span translate>Not valid</span>
-        </span>
-        <small class="icon-input right" ng-show="!addressBookForm.newaddress.$invalid && newaddress"><i class="fi-check"></i></small>
-      </div>
-      <div class="input">
-        <input type="text" name="newaddress"
-        placeholder="{{'Address'|translate}}" ng-model="newaddress" valid-address required>
-      </div>
-
-      <label for="newlabel"><span translate>Label</span>
-        <small translate ng-hide="!addressBookForm.newlabel.$pristine || newlabel">Required</small>
-        <div class="input">
-          <input type="text" name="newlabel"
-          placeholder="{{'Label'|translate}}" ng-model="newlabel" required>
-        </div>
-      </label>
-      <a translate class="button secondary default" ng-show="!loading" ng-click="cancel(addressBookForm)">Cancel</a>
-      <button class="primary right" 
-        ng-disabled="addressBookForm.$invalid || loading" 
-        ng-click="submitAddressBook(addressBookForm)">{{'Add'|translate}}</button>
-    </form>
-    <a ng-show="!showForm" class="button primary expand" ng-disabled="loading" ng-click="toggleForm()">
-      <i class="fi-plus"></i> <span translate>Add entry</span>
-    </a>
-  <a class="close-reveal-modal show-for-large-up" ng-click="close()"><i class="fi-x size-18"></i></a>
-</div>

public/views/modals/paypro.html

@@ -24,24 +24,24 @@
     <div class="line-b m10v"></div>
 
     <div class="ellipsis m10v">
-      <i translate>To:</i> {{paypro.domain}}
+      <i translate>To</i>: {{paypro.domain}}
     </div>
 
     <div class="m10v">
-      <i translate>Certified by:</i>
+      <i translate>Certified by</i>: 
       <span ng-show="paypro.verified"><i class="fi-lock color-greeni"></i> {{paypro.verifyData.caName}}</span>
       <span ng-show="!paypro.verified"><i class="fi-unlock color-yellowi"></i> <span translate>Untrusted</span></span>
     </div>
 
     <div ng-if="md.pr.pd.memo" class="m10v lh140">
-      <i translate>Merchant Message:</i>
+      <i translate>Merchant message</i>: 
       <span class="text-gray">
         {{paypro.memo}}
       </span>
     </div>
 
     <div ng-if="md.expirationDate" class="m10v">
-      <i translate>Expires:</i> {{paypro.expires | amTimeAgo }}
+      <i translate>Expires</i>: {{paypro.expires | amTimeAgo }}
     </div>
   </div>
 </div>

public/views/modals/qr-address.html

@@ -1,26 +0,0 @@
-<nav class="tab-bar">
-  <section class="right-small">
-    <a ng-click="cancel()">
-      <span class="text-close" translate>Close</span>
-    </a>
-  </section>
-  <section class="middle tab-bar-section">
-    <h1 class="title ellipsis" translate>
-      Address
-    </h1>
-  </section>
-</nav>
-
-<div class="p60t text-center" ng-init="addr = address.address">
-  <qrcode size="220" data="{{addr}}"></qrcode>
-
-  <div class="size-12" ng-class="{'enable_text_select': !isCordova}">
-    {{addr}}
-  </div> 
-  <div class="m5t size-10 text-secondary" ng-show="address.isChange" translate>change</div>
-  <div class="text-center m10t" ng-if="isCordova">
-    <button class="secondary" ng-click="copyAddress(addr)">
-      <i class="fi-clipboard-pencil"></i> <span translate>Copy to clipboard</span>
-    </button>
-  </div>
-</div>

public/views/modals/scanner.html

@@ -5,7 +5,7 @@
     </a>
   </section>
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis" translate>
+    <h1 class="title ellipsis">
       QR-Scanner
     </h1>
   </section>

public/views/modals/tx-details.html

@@ -24,7 +24,7 @@
   <h4 class="title m0" translate>Information</h4>
   <ul class="no-bullet size-14 m0">
     <li ng-if="btx.addressTo" class="line-b p10 oh">
-    <span class="text-gray" translate>To:</span>
+    <span class="text-gray" translate>To</span>:
     <span class="right">
       <span ng-if="btx.merchant">
         <span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
@@ -36,25 +36,25 @@
     </span>
     </li>
     <li ng-if="btx.time" class="line-b p10">
-    <span class="text-gray" translate>Date:</span>
+    <span class="text-gray" translate>Date</span>:
     <span class="right">
       <time>{{ btx.time * 1000 | amCalendar}}</time>
     </span>
     </li>
     <li ng-if="btx.message" class="line-b p10 oh">
-    <span class="text-gray" translate>Note:</span>
+    <span class="text-gray" translate>Note</span>:
     <span class="right">
       {{btx.message}}
     </span>
     </li>
     <li ng-if="btx.merchant" class="line-b p10 oh">
-    <span class="text-gray" translate>Merchant Message:</span>
+    <span class="text-gray" translate>Merchant message</span>:
     <span class="right">
       {{btx.merchant.pr.pd.memo}}
     </span>
     </li>
     <li ng-if="btx.time" class="line-b p10">
-    <span class="text-gray" translate>Confirmations:</span>
+    <span class="text-gray" translate>Confirmations</span>:
     <span class="right" >
       <span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
         Unconfirmed

public/views/modals/txp-details.html

@@ -14,35 +14,35 @@
   <h4 class="title m0" translate>Information</h4>
   <ul class="no-bullet size-14 m0">
     <li class="line-b p10">
-      <span class="text-gray">To:</span>
+      <span class="text-gray" translate>To</span>:
       <span class="right">{{tx.toAddress}}</span>
     </li>
     <li class="line-b p10">
-      <span class="text-gray">Amount:</span>
+      <span class="text-gray" translate>Amount</span>:
       <span class="right">{{amountStr}} 
         <span class="label gray radius">{{alternativeAmountStr}}</span>
       </span>
     </li>
     <li class="line-b p10">
-      <span class="text-gray">Time:</span>
+      <span class="text-gray" translate>Time</span>:
       <span class="right">
         <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
       </span>
     </li>
     <li class="line-b p10 oh">
-      <span class="text-gray">Create by:</span>
+      <span class="text-gray" translate>Created by</span>:
       <span class="right">{{tx.creatorName}}</span>
     </li>
     <li class="line-b p10 oh">
-      <span class="text-gray">Note:</span>
+      <span class="text-gray" translate>Note</span>:
       <span class="right">{{tx.message}}</span>
     </li>
   </ul>
   <div ng-if="tx.paypro">
-    <h4 class="title m0">PAYMENT DETAILS</h4>
+    <h4 class="title m0" translate>Payment details</h4>
     <ul class="no-bullet size-14 m0">
       <li class="line-b p10">
-        <span class="text-gray">To:</span>
+        <span class="text-gray" translate>To</span>:
         <span class="right">
           <span> 
             <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span>
@@ -52,7 +52,7 @@
         </span>
       </li>
       <li class="line-b p10">
-        <span class="text-gray">Expires:</span>
+        <span class="text-gray" translate>Expires</span>:
         <span class="right">
           <time>{{tx.paypro.expirationDate | amTimeAgo }}</time>
         </span>
@@ -65,7 +65,7 @@
   </div>
 
   <div ng-if="tx.actions[0] && !txRejected && !txBroadcasted">
-    <h4 class="title m0">Signatures:</h4>
+    <h4 class="title m0" translate>Signatures</h4>
     <ul class="no-bullet size-14 m0">
       <li class="line-b p10 text-gray" ng-repeat="ac in tx.actions">
         <i class="icon-contact size-24"></i>

public/views/modals/walletSelection.html

@@ -1,30 +0,0 @@
-<nav class="tab-bar text-right hide-for-large-up">
-  <span ng-click="cancel()" class="p10 text-white" translate>Close</span>
-</nav>
-<div class="modal-mobile" ng-init="setWallets()">
-
-  <h1 class="line-b" translate>Select a wallet to make the payment</h1>
-
-  <div class="m20v" ng-show="!wallets[0]" translate>Loading...</div>
-  <ul class="wallet-selection wallets" ng-show="wallets[0]">
-    <li ng-repeat="item in wallets track by $index" class="nav-item" ng-show="+item.balanceInfo.totalBalanceBTC > 0"  ng-click="ok(item)">
-      <div class="col1">
-        <div class="avatar-wallet">{{item.getName() | limitTo: 1}}</div>
-      </div>
-      <div class="col2">
-        <a class="size-12 wallet-item">
-          <div class="oh">
-            <div class="right size-10 type-wallet">
-              [ {{item.requiredCopayers}} of {{item.totalCopayers}} ]</div>
-            <div class="ellipsis name-wallet">{{item.getName()}}</div>
-          </div>
-          <div class="oh">
-            <b class="m5r size-12">{{item.balanceInfo.totalBalance || 0}} {{item.settings.unitName}}</b>
-            <span class="alt-currency size-10">{{item.balanceInfo.totalBalanceAlternative}} {{item.balanceInfo.alternativeIsoCode}}</span>
-          </div>
-        </a>
-      </div>
-    </li>
-  </ul>
-  <a class="close-reveal-modal show-for-large-up" ng-click="cancel()"><i class="fi-x size-18"></i></a>
-</div>

public/views/preferences.html

@@ -26,12 +26,21 @@
     </li>
 
     <h4 class="title m0" translate>Global settings</h4>
+
+    <li class="line-b p20" ng-click="$root.go('preferencesLanguage')">
+      <span translate>Language</span>
+      <span class="right text-gray">
+        <i class="icon-arrow-right3 size-24 right"></i>
+        {{index.defaultLanguageName}}
+      </span>
+    </li>
+
     <li class="line-b p20" ng-click="$root.go('preferencesUnit')">
       <span translate>Unit</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
         {{preferences.unitName}}
-      </span>      
+      </span>
     </li>
       
     <li class="line-b p20" ng-click="$root.go('preferencesAltCurrency')">

public/views/preferencesLanguage.html

@@ -0,0 +1,10 @@
+<div class="preferences" ng-controller="preferencesLanguageController as prefLang">
+  <div class="animated infinite flash text-center m20t text-gray" ng-show="prefLang.loading" translate>Applying changes</div>
+  <div ng-show="!prefLang.loading"
+    ng-repeat="lang in index.availableLanguages" 
+    ng-click="prefLang.save(lang.isoCode)" class="line-b p20 size-14">
+    <span>{{lang.name}}</span>
+    <i class="fi-check size-16 right" ng-show="index.defaultLanguage == lang.isoCode"></i>
+  </div>
+</div>
+<div class="extra-margin-bottom"></div>

public/views/walletHome.html

@@ -88,7 +88,7 @@
 
   <div ng-show="index.requiresMultipleSignatures  && index.txps[0]">
     <h4 class="title m0" translate>Spend proposals</h4>
-    <div class="last-transactions pr" ng-repeat="tx in index.txps  | orderBy:'-createdTs'" 
+    <div class="last-transactions pr" ng-repeat="tx in index.txps" 
       ng-include="'views/includes/transaction.html'">
     </div>
 

src/js/controllers/createProfile.js

@@ -6,24 +6,21 @@ angular.module('copayApp.controllers').controller('createProfileController', fun
   if (profileService.profile)
     go.walletHome();
 
-  var pin='';
+  self.creatingProfile = true;
-  // $rootScope.$on('pin', function(event, pin) {
-    self.creatingProfile = true;
 
-    $timeout(function() {
+  $timeout(function() {
-      profileService.create(pin, function(err) {
+    profileService.create(function(err) {
-        if (err) {
+      if (err) {
-          self.creatingProfile = false;
+        self.creatingProfile = false;
-          $log.warn(err);
+        $log.warn(err);
-          self.error = err;
+        self.error = err;
-          $scope.$apply();
+        $scope.$apply();
-          $timeout(function() {
+        $timeout(function() {
-            go.reload();
+          go.reload();
-          }, 3000);
+        }, 3000);
-        } else {
+      } else {
-          go.walletHome();
+        go.walletHome();
-        }
+      }
-      });
+    });
-     }, 100);
+  }, 100);
-  // });
 });

src/js/controllers/index.js

@@ -28,6 +28,23 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     'link': 'history'
   }]; 
 
+  self.availableLanguages = [{
+    name: 'English',
+    isoCode: 'en',
+  }, {
+    name: 'Spanish',
+    isoCode: 'es',
+  }, {
+    name: 'Français',
+    isoCode: 'fr',
+  }, {
+    name: '日本人',
+    isoCode: 'ja',
+  }];
+
+  self.defaultLanguage = configService.getSync().wallet.settings.defaultLanguage || 'en';
+  self.defaultLanguageName = lodash.result(lodash.find(this.availableLanguages, { 'isoCode': self.defaultLanguage }), 'name');
+
   self.setOngoingProcess = function(processName, isOn) {
     $log.debug('onGoingProcess', processName, isOn);
     self[processName] = isOn;
@@ -419,7 +436,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-
   // UX event handlers
   $rootScope.$on('Local/ColorUpdated', function(event) {
     self.updateColor();

src/js/controllers/pinController.js

@@ -1,73 +0,0 @@
-'use strict';
-
-angular.module('copayApp.controllers').controller('pinController', function($scope, $timeout) {
-  this.init = function(confirmPin, testPin) {
-    this._firstpin = null;
-    this.askForPin = 1;
-    this.confirmPin = confirmPin;
-    this.clear();
-    if (testPin) {
-      console.log('WARN: using test pin:', testPin);
-      $timeout(function() {
-        $scope.$emit('pin', testPin);
-      }, 100);
-    }
-  };
-
-  this.clear = function() {
-    this.digits = [];
-    this.defined = [];
-  };
-
-  this.press = function(digit) {
-    var self = this;
-    $timeout(function() {
-      self._press(digit);
-    }, 1);
-  };
-
-  this._press = function(digit) {
-    var self = this;
-    this.error = null;
-    this.digits.push(digit);
-    this.defined.push(true);
-
-    if (this.digits.length == 4) {
-      var pin = this.digits.join('');
-
-      if (this.confirmPin) {
-        if (!this._firstpin) {
-          this._firstpin = pin;
-          this.askForPin = 2;
-          $timeout(function() {
-            self.clear();
-          }, 100);
-          return;
-        } else {
-          if (pin === this._firstpin) {
-            $scope.$emit('pin', pin);
-            return;
-          } else {
-            this._firstpin = null;
-            this.askForPin = 1;
-            $timeout(function() {
-              self.clear();
-              self.error = 'Entered PINs were not equal. Try again';
-              var _self = self;
-              $timeout(function() {
-                _self.error = null;
-              }, 2000);
-            }, 100);
-            return;
-          }
-        }
-      } else {
-        $scope.$emit('pin', pin);
-      }
-    }
-  };
-
-  this.skip = function() {
-    $scope.$emit('pin', null);
-  };
-});

src/js/controllers/preferencesLanguage.js

@@ -0,0 +1,23 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('preferencesLanguageController',
+  function($scope, $timeout, configService, applicationService) {
+
+    this.save = function(newLang) {
+      var opts = {
+        wallet: {
+          settings: {
+            defaultLanguage: newLang
+          }
+        }
+      };
+
+      this.loading = true;
+      $timeout(function() {
+        configService.set(opts, function(err) {
+          if (err) console.log(err);
+          applicationService.restart();
+        });
+      }, 100);
+    };
+  });

src/js/controllers/receive.js

@@ -59,31 +59,5 @@ angular.module('copayApp.controllers').controller('receiveController',
       }
     };
 
-    this.openAddressModal = function(address) {
-      var self = this;
-      var ModalInstanceCtrl = function($scope, $modalInstance, address) {
-        $scope.address = address;
-        $scope.isCordova = self.isCordova;
-        $scope.copyAddress = function(addr) {
-          self.copyAddress(addr);
-        };
-
-        $scope.cancel = function() {
-          $modalInstance.dismiss('cancel');
-        };
-      };
-
-      $modal.open({
-        templateUrl: 'views/modals/qr-address.html',
-        windowClass: 'full',
-        controller: ModalInstanceCtrl,
-        resolve: {
-          address: function() {
-            return address;
-          }
-        }
-      });
-    };
-
   }
 );

src/js/controllers/send.js

@@ -430,90 +430,4 @@ angular.module('copayApp.controllers').controller('sendController',
         return value;
       }
     };
-
-    this.openAddressBook = function() {
-      var w = $rootScope.wallet;
-      var modalInstance = $modal.open({
-        templateUrl: 'views/modals/address-book.html',
-        windowClass: 'full',
-        controller: function($scope, $modalInstance) {
-
-          $scope.showForm = null;
-          $scope.addressBook = w.addressBook;
-
-          $scope.hasEntry = function() {
-            return _.keys($scope.addressBook).length > 0 ? true : false;
-          };
-
-          $scope.toggleAddressBookEntry = function(key) {
-            w.toggleAddressBookEntry(key);
-          };
-
-          $scope.copyToSend = function(addr) {
-            $modalInstance.close(addr);
-          };
-
-          $scope.cancel = function(form) {
-            $scope.error = $scope.success = $scope.newaddress = $scope.newlabel = null;
-            clearForm(form);
-            $scope.toggleForm();
-          };
-
-          $scope.toggleForm = function() {
-            $scope.showForm = !$scope.showForm;
-          };
-
-          var clearForm = function(form) {
-            form.newaddress.$pristine = true;
-            form.newaddress.$setViewValue('');
-            form.newaddress.$render();
-
-            form.newlabel.$pristine = true;
-            form.newlabel.$setViewValue('');
-            form.newlabel.$render();
-            form.$setPristine();
-          };
-
-          // TODO change to modal
-          $scope.submitAddressBook = function(form) {
-            if (form.$invalid) {
-              return;
-            }
-            $scope.blockUx = true;
-            $timeout(function() {
-              var errorMsg;
-              var entry = {
-                "address": form.newaddress.$modelValue,
-                "label": form.newlabel.$modelValue
-              };
-              try {
-                w.setAddressBook(entry.address, entry.label);
-              } catch (e) {
-                $log.warn(e);
-                errorMsg = e.message;
-              }
-
-              if (errorMsg) {
-                $scope.error = errorMsg;
-              } else {
-                clearForm(form);
-                $scope.toggleForm();
-                notification.success('Entry created', 'New addressbook entry created')
-              }
-              $scope.blockUx = false;
-              $rootScope.$digest();
-            }, 100);
-            return;
-          };
-
-          $scope.close = function() {
-            $modalInstance.dismiss('cancel');
-          };
-        },
-      });
-
-      modalInstance.result.then(function(addr) {
-        $scope.setForm(addr);
-      });
-    };
   });

src/js/routes.js

@@ -254,6 +254,23 @@ angular
           }
         }
       })
+      .state('preferencesLanguage', {
+        url: '/preferencesLanguage',
+        walletShouldBeComplete: true,
+        needProfile: true,
+        views: {
+          'main': {
+            templateUrl: 'views/preferencesLanguage.html'
+          },
+          'topbar': {
+            templateUrl: 'views/includes/topbar.html',
+            controller: function($scope) {
+              $scope.titleSection = 'Language';
+              $scope.goBackToState = 'preferences';
+            }
+          }
+        }
+      })
       .state('preferencesUnit', {
         url: '/preferencesUnit',
         templateUrl: 'views/preferencesUnit.html',
@@ -415,22 +432,32 @@ angular
         needProfile: false
       });
   })
-  .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService) {
+  .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService, configService) {
 
-    // Auto-detect browser language
+    var userLang = configService.getSync().wallet.settings.defaultLanguage;
-    // (default: English)
+    if (!userLang) {
-    var userLang, androidLang;
+      // Auto-detect browser language
-    
+      var androidLang;
-    if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
+
-      userLang = androidLang[1];
+      if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
-    } else {
+        userLang = androidLang[1];
-      // works for iOS and Android 4.x
+      } else {
-      userLang = navigator.userLanguage || navigator.language;
+        // works for iOS and Android 4.x
+        userLang = navigator.userLanguage || navigator.language;
+      }
+      userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
     }
 
-    userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
+    configService.set({
-    gettextCatalog.setCurrentLanguage(userLang);
+      wallet: {
-    amMoment.changeLocale(userLang);
+        settings: {
+          defaultLanguage: userLang
+        }
+      }
+    }, function() {
+      gettextCatalog.setCurrentLanguage(userLang);
+      amMoment.changeLocale(userLang);
+    });
 
     // Register URI handler, not for mobileApp
     if (!isCordova) {
@@ -446,6 +473,7 @@ angular
       preferencesColor: 12,
       backup: 12,
       delete: 12,
+      preferencesLanguage: 12,
       preferencesUnit: 12,
       preferencesAltCurrency: 12,
       preferencesBwsUrl: 12,

src/js/services/configService.js

@@ -58,8 +58,6 @@ angular.module('copayApp.services').factory('configService', function(localStora
   var configCache = null;
 
 
-
-
   root.getSync = function() {
     if (!configCache)
       throw new Error('configService#getSync called when cache is not initialized');

src/js/services/profileService.js

@@ -136,7 +136,7 @@ angular.module('copayApp.services')
       });
     };
 
-    root._createNewProfile = function(pin, cb) {
+    root._createNewProfile = function(cb) {
       var walletClient = bwcService.getClient();
 
       walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
@@ -260,8 +260,8 @@ angular.module('copayApp.services')
 
 
 
-    root.create = function(pin, cb) {
+    root.create = function(cb) {
-      root._createNewProfile(pin, function(err, p) {
+      root._createNewProfile(function(err, p) {
         if (err) return cb(err);
         root.bindProfile(p, function(err) {
           storageService.storeNewProfile(p, function(err) {