diff --git a/po/fr.po b/po/fr.po
index 988aaa2b3..4c1746b89 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,60 +13,32 @@ msgstr ""
 "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>"
-msgstr ""
-"* Si vous avez besoin d'importer des portefeuilles depuis les versions "
-"précédentes de Copay, allez au <b>Menu</b>"
+msgid "* 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"
-msgstr ""
-"* Seules les transactions créées par vous-même sans signatures de pairs "
-"peuvent être supprimées"
+msgid "* 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."
-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"
-msgstr "Ajouter"
-
-#: public/views/modals/address-book.html
-msgid "Add a new entry"
-msgstr "Ajouter une nouvelle entrée"
-
-#: public/views/modals/address-book.html
-msgid "Add entry"
-msgstr "Ajouter une entrée"
+msgid "* 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/includes/sidebar.html
 msgid "Add wallet"
 msgstr "Ajouter un portefeuille"
 
-#: public/views/paymentUri.html public/views/modals/address-book.html
-#: public/views/modals/qr-address.html
+#: public/views/paymentUri.html
 msgid "Address"
 msgstr "Adresse"
 
-#: public/views/modals/address-book.html
-msgid "Address Book"
-msgstr "Carnet d'adresses"
-
 #: public/views/preferences.html
 msgid "Alternative Currency"
 msgstr "Devise alternative"
 
-#: public/views/paymentUri.html public/views/send.html
+#: public/views/paymentUri.html
+#: public/views/send.html
+#: public/views/modals/txp-details.html
 msgid "Amount"
 msgstr "Montant"
 
@@ -74,14 +46,14 @@ msgstr "Montant"
 msgid "Amount in"
 msgstr "Montant en"
 
+#: public/views/preferencesLanguage.html
+msgid "Applying changes"
+msgstr "Appliquer les changements"
+
 #: public/views/send.html
 msgid "Available Balance"
 msgstr "Solde disponible"
 
-#: public/views/create.html public/views/join.html
-msgid "BIP32 master extended private key"
-msgstr "Clé privée étendue maîtresse BIP32"
-
 #: public/views/includes/topbar.html
 msgid "Back"
 msgstr "Retour"
@@ -99,11 +71,8 @@ msgid "Backup options"
 msgstr "Options de sauvegarde"
 
 #: public/views/receive.html
-msgid ""
-"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."
+msgid "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!"
@@ -129,24 +98,25 @@ msgstr "Mais non diffusée. Essayez de l'envoyer manuellement"
 msgid "CANCEL"
 msgstr "ANNULER"
 
-#: public/views/copayers.html public/views/send.html
-#: public/views/modals/address-book.html public/views/modals/confirmation.html
+#: public/views/copayers.html
+#: public/views/send.html
+#: public/views/modals/confirmation.html
 msgid "Cancel"
 msgstr "Annuler"
 
 #: public/views/modals/paypro.html
-msgid "Certified by:"
-msgstr "Certifié par :"
+msgid "Certified by"
+msgstr "Certifié par"
 
 #: public/views/import.html
 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/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/copayers.html
+#: public/views/modals/paypro.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 "Fermer"
 
@@ -155,8 +125,8 @@ msgid "Color"
 msgstr "Couleur"
 
 #: public/views/modals/tx-details.html
-msgid "Confirmations:"
-msgstr "Confirmations :"
+msgid "Confirmations"
+msgstr "Confirmations"
 
 #: public/views/modals/copayers.html
 msgid "Copayers"
@@ -170,7 +140,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/modals/qr-address.html
+#: public/views/backup.html 
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papier"
 
@@ -186,7 +156,8 @@ 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/walletHome.html
+#: public/views/create.html
+#: public/views/walletHome.html
 msgid "Create"
 msgstr "Créer"
 
@@ -198,22 +169,19 @@ msgstr "Créer un nouveau portefeuille"
 msgid "Create, join or import"
 msgstr "Créer, joindre ou importer"
 
-#: public/views/create.html public/views/createProfile.html
+#: public/views/modals/txp-details.html
+msgid "Created by"
+msgstr "Créée par"
+
+#: public/views/create.html 
+#: public/views/createProfile.html
 msgid "Creating wallet..."
 msgstr "Création du portefeuille..."
 
-#: public/views/modals/address-book.html
-msgid "Creator"
-msgstr "Créateur"
-
-#: public/views/modals/address-book.html
+#: public/views/modals/tx-details.html
 msgid "Date"
 msgstr "Date"
 
-#: public/views/modals/tx-details.html
-msgid "Date:"
-msgstr "Date :"
-
 #: public/views/preferences.html
 msgid "Delete"
 msgstr "Supprimer"
@@ -226,10 +194,6 @@ msgstr "Télécharger la sauvegarde"
 msgid "ENTER"
 msgstr "ENTRER"
 
-#: public/views/modals/address-book.html
-msgid "Empty. Create an alias for your addresses"
-msgstr "Vide. Créez un alias pour vos adresses"
-
 #: public/views/preferences.html
 msgid "Encrypt Private Key"
 msgstr "Chiffrer la clé privée"
@@ -238,11 +202,8 @@ msgstr "Chiffrer la clé privée"
 msgid "Enter your password"
 msgstr "Entrer votre mot de passe"
 
-#: public/views/modals/address-book.html
-msgid "Entry"
-msgstr "Entrée"
-
 #: public/views/modals/paypro.html
+#: public/views/modals/txp-details.html
 msgid "Expires:"
 msgstr "Expire :"
 
@@ -266,7 +227,8 @@ msgstr "Acquisition des transactions..."
 msgid "Global settings"
 msgstr "Paramètres globaux"
 
-#: public/views/create.html public/views/join.html
+#: public/views/create.html 
+#: public/views/join.html
 msgid "Hide"
 msgstr "Masquer"
 
@@ -302,11 +264,13 @@ msgstr "Importer un portefeuille"
 msgid "Importing wallet..."
 msgstr "Importation du portefeuille..."
 
-#: public/views/modals/tx-details.html public/views/modals/txp-details.html
+#: public/views/modals/tx-details.html
+#: public/views/modals/txp-details.html
 msgid "Information"
 msgstr "Information"
 
-#: public/views/create.html public/views/join.html
+#: public/views/create.html 
+#: public/views/join.html
 msgid "John"
 msgstr "John"
 
@@ -322,18 +286,14 @@ msgstr "Joindre un portefeuille partagé"
 msgid "Joining shared wallet..."
 msgstr "Connexion au portefeuille partagé..."
 
-#: public/views/modals/address-book.html
-msgid "Label"
-msgstr "Étiquette "
+#: public/views/preferences.html
+msgid "Langue"
+msgstr ""
 
 #: public/views/importLegacy.html
 msgid "Learn more about Wallet Migration"
 msgstr "En savoir plus sur la migration de portefeuille"
 
-#: public/views/modals/walletSelection.html
-msgid "Loading..."
-msgstr "Chargement..."
-
 #: public/views/paymentUri.html
 msgid "Make a payment to"
 msgstr "Faire un paiement à"
@@ -342,13 +302,15 @@ msgstr "Faire un paiement à"
 msgid "Master extended private key"
 msgstr "Clé privée étendue maîtresse"
 
-#: public/views/includes/copayers.html public/views/modals/copayers.html
+#: public/views/includes/copayers.html 
+#: public/views/modals/copayers.html
 msgid "Me"
 msgstr "Moi"
 
-#: public/views/modals/paypro.html public/views/modals/tx-details.html
-msgid "Merchant Message:"
-msgstr "Message marchand :"
+#: public/views/modals/paypro.html 
+#: public/views/modals/tx-details.html
+msgid "Merchant message"
+msgstr "Message marchand"
 
 #: public/views/paymentUri.html
 msgid "Message"
@@ -378,15 +340,13 @@ msgstr "Aucune propositions de dépense en attente à ce moment."
 msgid "No transactions yet"
 msgstr "Aucune transaction"
 
-#: public/views/send.html public/views/modals/address-book.html
+#: public/views/send.html 
 msgid "Not valid"
 msgstr "Non valide"
 
 #: public/views/send.html
-msgid "Note"
-msgstr "Note"
-
 #: public/views/modals/tx-details.html
+#: public/views/modals/txp-details.html
 msgid "Note:"
 msgstr "Note :"
 
@@ -402,15 +362,14 @@ msgstr "Ok"
 msgid "Opening Wallet..."
 msgstr "Ouverture du portefeuille..."
 
-#: public/views/import.html public/views/importLegacy.html
+#: public/views/import.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"
@@ -424,6 +383,10 @@ msgstr "Coller l'invitation ici"
 msgid "Payment Sent"
 msgstr "Paiement envoyé"
 
+#: public/views/modals/txp-details.html
+msgid "Payment details"
+msgstr "Détails de paiement"
+
 #: public/views/modals/paypro.html
 msgid "Payment protocol request"
 msgstr "Demande de protocole de paiement"
@@ -433,11 +396,8 @@ msgid "Payment to"
 msgstr "Paiement à"
 
 #: public/views/preferencesDeleteWallet.html
-msgid ""
-"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."
+msgid "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"
@@ -447,10 +407,6 @@ msgstr "Portefeuille personnel"
 msgid "Preferences"
 msgstr "Préférences"
 
-#: public/views/modals/scanner.html
-msgid "QR-Scanner"
-msgstr "QR-Scanner"
-
 #: public/views/history.html
 msgid "Received"
 msgstr "Reçu"
@@ -471,12 +427,13 @@ msgstr "Rejeter"
 msgid "Remove transaction"
 msgstr "Supprimer la transaction"
 
-#: public/views/backup.html public/views/includes/password.html
+#: public/views/backup.html 
+#: public/views/includes/password.html
 msgid "Repeat password"
 msgstr "Répéter le mot de passe"
 
-#: public/views/import.html public/views/join.html
-#: public/views/modals/address-book.html
+#: public/views/import.html 
+#: public/views/join.html
 msgid "Required"
 msgstr "Requis"
 
@@ -516,10 +473,6 @@ msgstr "Sélectionner un fichier de sauvegarde"
 msgid "Select a wallet"
 msgstr "Sélectionner un portefeuille"
 
-#: public/views/modals/walletSelection.html
-msgid "Select a wallet to make the payment"
-msgstr "Sélectionner un portefeuille pour faire le paiement"
-
 #: public/views/create.html
 msgid "Select required signatures"
 msgstr "Sélectionner les signatures requises"
@@ -549,7 +502,7 @@ msgid "Set up a Password for your backup"
 msgstr "Définissez un mot de passe pour votre sauvegarde"
 
 #: public/views/includes/password.html
-msgid "Set up a Password"
+msgid "Set up a password"
 msgstr "Définir un mot de passe"
 
 #: public/views/receive.html
@@ -565,15 +518,11 @@ 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."
-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."
+msgid "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/join.html
+#: public/views/create.html 
+#: public/views/join.html
 msgid "Show"
 msgstr "Montrer"
 
@@ -582,18 +531,16 @@ msgid "Sign"
 msgstr "Signer"
 
 #: public/views/modals/tx-details.html
+#: public/views/modals/txp-details.html
 msgid "Signatures"
 msgstr "Signatures"
 
-#: public/views/includes/pin.html
-msgid "Skip"
-msgstr "Passer"
-
 #: public/views/walletHome.html
 msgid "Spend proposals"
 msgstr "Propositions de dépense"
 
-#: public/views/history.html public/views/walletHome.html
+#: public/views/history.html 
+#: public/views/walletHome.html
 msgid "Tap to retry"
 msgstr "Tapez pour réessayer"
 
@@ -602,27 +549,23 @@ 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."
-msgstr ""
-"Ce portefeuille a sa clé privée chiffrée. Exporter une sauvegarde gardera la "
-"clé privée chiffrée lors de la sauvegarde."
+msgid "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."
-msgstr ""
-"Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS). "
-"Vous pouvez le recréer depuis l'information locale."
+msgid "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/includes/transaction.html
+#: public/views/modals/txp-details.html
+msgid "Time"
+msgstr "Temps"
+
+#: public/views/send.html
+#: public/views/includes/transaction.html
+#: public/views/modals/paypro.html
+#: public/views/modals/tx-details.html
+#: public/views/modals/txp-details.html
 msgid "To"
-msgstr "À"
-
-#: public/views/modals/paypro.html public/views/modals/tx-details.html
-msgid "To:"
 msgstr "À :"
 
 #: public/views/walletHome.html
@@ -653,7 +596,8 @@ msgstr "Transaction envoyée !"
 msgid "Trying to reconnnect..."
 msgstr "Tentative de reconnexion..."
 
-#: public/views/history.html public/views/modals/tx-details.html
+#: public/views/history.html 
+#: public/views/modals/tx-details.html
 msgid "Unconfirmed"
 msgstr "Non confirmée"
 
@@ -689,10 +633,6 @@ msgstr "Utiliser le réseau de test"
 msgid "View backup"
 msgstr "Voir la sauvegarde"
 
-#: public/views/modals/address-book.html
-msgid "Visible"
-msgstr "Visible"
-
 #: public/views/receive.html
 msgid "WARNING: Backup needed"
 msgstr "ATTENTION : Sauvegarde nécessaire"
@@ -721,6 +661,10 @@ msgstr "Invitation de portefeuille"
 msgid "Wallet Invitation is not valid!"
 msgstr "L'invitation de portefeuille n'est pas valide !"
 
+#: public/views/includes/clientError.html
+msgid "Wallet Service Error"
+msgstr "Erreur du service de portefeuille"
+
 #: public/views/copayers.html
 msgid "Wallet incomplete and broken"
 msgstr "Portefeuille incomplet et cassé "
@@ -737,11 +681,13 @@ msgstr "Attention !"
 msgid "You do not have any wallet"
 msgstr "Vous n'avez aucun portefeuille"
 
-#: public/views/backup.html public/views/import.html
+#: public/views/backup.html 
+#: public/views/import.html
 msgid "Your backup password"
 msgstr "Votre mot de passe de sauvegarde"
 
-#: public/views/create.html public/views/join.html
+#: public/views/create.html
+#: public/views/join.html
 msgid "Your nickname"
 msgstr "Votre surnom"
 
@@ -753,20 +699,19 @@ msgstr "Votre mot de passe"
 msgid "Your profile password"
 msgstr "Votre mot de passe de profil"
 
-#: public/views/create.html public/views/join.html
+#: public/views/create.html
+#: public/views/join.html
 msgid "advanced options"
 msgstr "options avancées"
 
-#: public/views/modals/qr-address.html
-msgid "change"
-msgstr "change"
-
 #: public/views/send.html
 msgid "in pending transactions"
 msgstr "dans les transactions en attente"
 
-#: public/views/copayers.html public/views/create.html
+#: public/views/copayers.html
+#: public/views/create.html
 #: public/views/walletHome.html
+#: public/views/includes/sidebar.html
 msgid "of"
 msgstr "de"