diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po
index b3440987..334fa8e5 100644
--- a/ihatemoney/translations/fr/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/fr/LC_MESSAGES/messages.po
@@ -7,129 +7,122 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-10-13 21:32+0200\n"
+"POT-Creation-Date: 2018-05-15 21:43+0200\n"
 "PO-Revision-Date: 2011-10-14 23:51+0200\n"
 "Last-Translator: Quentin Roy <royque@gmail.com>\n"
+"Language: fr\n"
 "Language-Team: fr <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: forms.py:22
-msgid "Select all"
-msgstr "Tout cocher"
-
-#: forms.py:22
-msgid "Select none"
-msgstr "Tout décocher"
-
-#: forms.py:61
+#: forms.py:46
 msgid "Project name"
 msgstr "Nom de projet"
 
-#: forms.py:62 forms.py:86 forms.py:102
+#: forms.py:47 forms.py:71 forms.py:88
 msgid "Private code"
 msgstr "Code d'accès"
 
-#: forms.py:63
+#: forms.py:48
 msgid "Email"
 msgstr "Email"
 
-#: forms.py:85 forms.py:101 forms.py:107
+#: forms.py:70 forms.py:87 forms.py:98
 msgid "Project identifier"
 msgstr "Identifiant du projet"
 
-#: forms.py:87
-msgid "Admin password"
-msgstr "Mot de passe administrateur"
-
-#: forms.py:87 templates/send_invites.html:5
+#: forms.py:72
 msgid "Create the project"
 msgstr "Créer le projet"
 
-#: forms.py:92
+#: forms.py:77
 msgid ""
 "The project identifier is used to log in and for the URL of the project. "
 "We tried to generate an identifier for you but a project with this "
 "identifier already exists. Please create a new identifier that you will "
-"be able to remember."
+"be able to remember"
 msgstr ""
-"L'identifiant du projet est utilisé pour se connecter."
-"Nous avons essayé de générer un identifiant mais "
-"celui ci existe déjà. Merci de créer un nouvel identifiant que vous serez"
-" capable de retenir"
 
-#: forms.py:103
+#: forms.py:89 forms.py:94
 msgid "Get in"
 msgstr "Entrer"
 
-#: forms.py:107
+#: forms.py:93
+msgid "Admin password"
+msgstr "Mot de passe administrateur"
+
+#: forms.py:99
+msgid "Send me the code by email"
+msgstr "Envoyez moi le code par email"
+
+#: forms.py:103
+msgid "This project does not exists"
+msgstr "Ce projet n'existe pas"
+
+#: forms.py:108
 msgid "Password mismatch"
 msgstr "Les mots de passe fournis ne sont pas les mêmes."
 
 #: forms.py:109
-msgid "Password confirmation"
-msgstr "Confirmation du mot de passe"
-
-#: forms.py:107
 msgid "Password"
 msgstr "Mot de passe"
 
-#: forms.py:108
-msgid "Send me the code by email"
-msgstr "Envoyez moi le code par email"
+#: forms.py:110
+msgid "Password confirmation"
+msgstr "Confirmation du mot de passe"
 
-#: forms.py:112
-msgid "This project does not exists"
-msgstr "Ce projet n'existe pas"
+#: forms.py:111
+msgid "Reset password"
+msgstr ""
 
-#: forms.py:116
+#: forms.py:115
 msgid "Date"
 msgstr "Date"
 
-#: forms.py:117
+#: forms.py:116
 msgid "What?"
 msgstr "Quoi ?"
 
-#: forms.py:118
+#: forms.py:117
 msgid "Payer"
 msgstr "Payeur"
 
-#: forms.py:119
+#: forms.py:118
 msgid "Amount paid"
 msgstr "Montant"
 
-#: forms.py:120 templates/list_bills.html:103
+#: forms.py:119 templates/forms.html:100 templates/list_bills.html:101
 msgid "For whom?"
 msgstr "Pour qui ?"
 
-#: forms.py:122
+#: forms.py:121
 msgid "Submit"
 msgstr "Valider"
 
-#: forms.py:123
+#: forms.py:122
 msgid "Submit and add a new one"
 msgstr "Valider et ajouter une autre facture"
 
-#: forms.py:149
+#: forms.py:146
 msgid "Bills can't be null"
 msgstr "Le montant d'une facture ne peut pas être nul."
 
-#: forms.py:154
+#: forms.py:151
 msgid "Name"
 msgstr "Nom"
 
-#: forms.py:155
+#: forms.py:152
 msgid "Weight"
 msgstr "Parts"
 
-#: forms.py:155 templates/forms.html:95
+#: forms.py:153 templates/forms.html:123
 msgid "Add"
 msgstr "Ajouter"
 
-#: forms.py:163
+#: forms.py:162
 msgid "User name incorrect"
 msgstr "Nom d'utilisateur incorrect"
 
@@ -137,159 +130,158 @@ msgstr "Nom d'utilisateur incorrect"
 msgid "This project already have this member"
 msgstr "Ce membre existe déjà pour ce projet"
 
-#: forms.py:178
+#: forms.py:183
 msgid "People to notify"
 msgstr "Personnes à prévenir"
 
-#: forms.py:179
+#: forms.py:184
 msgid "Send invites"
 msgstr "Envoyer les invitations"
 
-#: forms.py:185
+#: forms.py:190
 #, python-format
 msgid "The email %(email)s is not valid"
 msgstr "L'email %(email)s est invalide"
 
-#: forms.py:191
-msgid "Start date"
-msgstr "Date de départ"
-
-#: forms.py:192
-msgid "End date"
-msgstr "Date de fin"
-
-#: forms.py:202
+#: forms.py:196
 msgid "What do you want to download ?"
 msgstr "Que voulez-vous télécharger ?"
 
-#: forms.py:205
+#: forms.py:199
 msgid "bills"
 msgstr "factures"
 
-#: forms.py:205
+#: forms.py:199
 msgid "transactions"
 msgstr "remboursements"
 
-#: forms.py:206
+#: forms.py:201
 msgid "Export file format"
 msgstr "Format du fichier d'export"
 
-#: web.py:95
-msgid "You either provided a bad token or no project identifier."
-msgstr "L'identifiant du projet ou le token fourni n'est pas correct."
-
-#: web.py:95
-msgid "This private code is not the right one"
-msgstr "Le code que vous avez entré n'est pas correct"
-
-#: web.py:106
-msgid "This admin password is not the right one. Only %(num)d attempts left."
-msgstr "Le mot de passe administrateur que vous avez entré n'est pas correct. Plus que %(num)d tentatives."
-
-#: web.py:106
+#: web.py:129
 msgid "Too many failed login attempts, please retry later."
 msgstr "Trop d'échecs d'authentification successifs, veuillez réessayer plus tard."
 
-#: web.py:147
+#: web.py:144
+#, python-format
+msgid "This admin password is not the right one. Only %(num)d attempts left."
+msgstr ""
+"Le mot de passe administrateur que vous avez entré n'est pas correct. "
+"Plus que %(num)d tentatives."
+
+#: web.py:167
+msgid "You either provided a bad token or no project identifier."
+msgstr "L'identifiant du projet ou le token fourni n'est pas correct."
+
+#: web.py:195
+msgid "This private code is not the right one"
+msgstr "Le code que vous avez entré n'est pas correct"
+
+#: web.py:242
 #, python-format
 msgid "You have just created '%(project)s' to share your expenses"
 msgstr "Vous venez de créer '%(project)s' pour partager vos dépenses"
 
-#: web.py:165
+#: web.py:260
 #, python-format
 msgid "%(msg_compl)sThe project identifier is %(project)s"
 msgstr "L'identifiant de ce projet est '%(project)s'"
 
-#: web.py:185
+#: web.py:281
 msgid "A link to reset your password has been sent to your email."
 msgstr "Un lien pour changer votre mot de passe vous a été envoyé par mail."
 
-#: web.py:211
+#: web.py:291
+msgid "No token provided"
+msgstr ""
+
+#: web.py:294
+msgid "Invalid token"
+msgstr "Token invalide"
+
+#: web.py:297
+msgid "Unknown project"
+msgstr "Project inconnu"
+
+#: web.py:303
+msgid "Password successfully reset."
+msgstr "Le mot de passe a été changé avec succès."
+
+#: web.py:351
 msgid "Project successfully deleted"
 msgstr "Projet supprimé"
 
-#: web.py:254
+#: web.py:401
 #, python-format
 msgid "You have been invited to share your expenses for %(project)s"
 msgstr "Vous avez été invité à partager vos dépenses pour %(project)s"
 
-#: web.py:259
-#, python-format
-msgid ""No token provided""
-msgstr "Aucun token n'a été fourni."
-
-#: web.py:259
-#, python-format
-msgid "Unknown project"
-msgstr "Project inconnu"
-
-#: web.py:261
-#, python-format
-msgid "Invalid token"
-msgstr "Token invalide"
-
-#: web.py:267
-#, python-format
-msgid "Password successfully reset."
-msgstr "Le mot de passe a été changé avec succès."
-
-#: web.py:261
+#: web.py:408
 msgid "Your invitations have been sent"
 msgstr "Vos invitations ont bien été envoyées"
 
-#: web.py:290
+#: web.py:439
 #, python-format
 msgid "%(member)s had been added"
 msgstr "%(member)s a bien été ajouté"
 
-#: web.py:303
+#: web.py:452
 #, python-format
 msgid "%(name)s is part of this project again"
 msgstr "%(name)s a rejoint le projet"
 
-#: web.py:312
+#: web.py:461
 #, python-format
-msgid "User '%(name)s' has been deactivated"
-msgstr "Le membre '%(name)s' a été désactivé"
+msgid ""
+"User '%(name)s' has been deactivated. It will still appear in the users "
+"list until its balance becomes zero."
+msgstr ""
+"Le membre '%(name)s' a été désactivé. Il continuera d'apparaître jusqu'à "
+"ce que sa balance devienne égale à zéro."
 
-#: web.py:314
+#: web.py:465
 #, python-format
-msgid "User '%(name)s' has been deactivated. It will still appear in the users list until its balance becomes zero."
-msgstr "Le membre '%(name)s' a été désactivé. Il continuera d'apparaître jusqu'à ce que sa balance devienne égale à zéro."
+msgid "User '%(name)s' has been removed"
+msgstr ""
 
-#: web.py:331
+#: web.py:480
+#, python-format
+msgid "User '%(name)s' has been edited"
+msgstr ""
+
+#: web.py:500
 msgid "The bill has been added"
 msgstr "La facture a bien été ajoutée"
 
-#: web.py:351
+#: web.py:520
 msgid "The bill has been deleted"
 msgstr "La facture a été supprimée"
 
-#: web.py:369
+#: web.py:538
 msgid "The bill has been modified"
 msgstr "La facture a été modifiée"
 
-#: templates/add_bill.html:9
+#: templates/add_bill.html:9 templates/edit_member.html:9
 msgid "Back to the list"
 msgstr "Retourner à la liste"
 
+#: templates/admin.html:10
+msgid "Administration tasks are currently disabled."
+msgstr "Les tâches d'administration sont actuellement désactivées."
+
 #: templates/authenticate.html:6
-msgid ""
-"The project you are trying to access do not exist, do you want to"
+msgid "The project you are trying to access do not exist, do you want to"
 msgstr "Le projet auquel vous essayez d'acceder n'existe pas. Souhaitez vous"
 
-#: templates/authenticate.html:7
+#: templates/authenticate.html:8
 msgid "create it"
 msgstr "le créer"
 
-#: templates/authenticate.html:7
+#: templates/authenticate.html:8
 msgid "?"
 msgstr " ?"
 
-#: templates/authenticate.html:7
-msgid "Administration tasks are currently disabled."
-msgstr "Les tâches d'administration sont actuellement désactivées."
-
 #: templates/create_project.html:4
 msgid "Create a new project"
 msgstr "Créer un nouveau projet"
@@ -314,6 +306,20 @@ msgstr "Facture la plus récente"
 msgid "Oldest bill"
 msgstr "Facture la plus ancienne"
 
+#: templates/dashboard.html:5 templates/list_bills.html:101
+msgid "Actions"
+msgstr "Actions"
+
+#: templates/dashboard.html:17 templates/list_bills.html:65
+#: templates/list_bills.html:111
+msgid "edit"
+msgstr "éditer"
+
+#: templates/dashboard.html:18 templates/forms.html:83
+#: templates/list_bills.html:112
+msgid "delete"
+msgstr "supprimer"
+
 #: templates/dashboard.html:25
 msgid "The Dashboard is currently deactivated."
 msgstr "La page d'administration est actuellement désactivée."
@@ -326,60 +332,59 @@ msgstr "c'est sûr ?"
 msgid "Edit this project"
 msgstr "Éditer ce projet"
 
-#: templates/forms.html:23
-msgid "Can't remember the password?"
-msgstr "Vous ne vous souvenez plus du code d'accès ?"
-
-#: templates/forms.html:26
-msgid "Cancel"
-msgstr "Annuler"
-
-#: templates/forms.html:68
-msgid "Edit the project"
-msgstr "Éditer le projet"
-
-#: templates/list_bills.html:70
-msgid "deactivate"
-msgstr "désactiver"
-
-#: templates/forms.html:69 templates/list_bills.html:70
-#: templates/list_bills.html:114
-msgid "delete"
-msgstr "supprimer"
-
-#: templates/forms.html:77
-msgid "Edit this bill"
-msgstr "Éditer cette facture"
-
-#: templates/forms.html:77 templates/list_bills.html:94
-msgid "Add a bill"
-msgstr "Ajouter une facture"
-
-#: templates/forms.html:95
-msgid "Type user name here"
-msgstr "Nouveau participant"
-
-#: templates/forms.html:100
-msgid "Edit this member"
-msgstr "Éditer ce participant"
-
-#: templates/forms.html:102
-msgid "Send the invitations"
-msgstr "Envoyer les invitations"
-
-#: templates/forms.html:103
-msgid "No, thanks"
-msgstr "Non merci"
-
-#: templates/forms.html:136
+#: templates/edit_project.html:15
 msgid "Download this project's data"
 msgstr "Télécharger les données de ce projet"
 
-#: templates/forms.html:136
+#: templates/forms.html:27
+msgid "Can't remember the password?"
+msgstr "Vous ne vous souvenez plus du code d'accès ?"
+
+#: templates/forms.html:30
+msgid "Cancel"
+msgstr "Annuler"
+
+#: templates/forms.html:82
+msgid "Edit the project"
+msgstr "Éditer le projet"
+
+#: templates/forms.html:91
+msgid "Edit this bill"
+msgstr "Éditer cette facture"
+
+#: templates/forms.html:91 templates/list_bills.html:89
+msgid "Add a bill"
+msgstr "Ajouter une facture"
+
+#: templates/forms.html:103
+msgid "Select all"
+msgstr "Tout cocher"
+
+#: templates/forms.html:103
+msgid "Select none"
+msgstr "Tout décocher"
+
+#: templates/forms.html:122
+msgid "Type user name here"
+msgstr "Nouveau participant"
+
+#: templates/forms.html:129
+msgid "Edit this member"
+msgstr "Éditer ce participant"
+
+#: templates/forms.html:145
+msgid "Send the invitations"
+msgstr "Envoyer les invitations"
+
+#: templates/forms.html:146
+msgid "No, thanks"
+msgstr "Non merci"
+
+#: templates/forms.html:157
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/home.html:8
+#: templates/home.html:7
 msgid "Manage your shared <br>expenses, easily"
 msgstr "Gérez vos dépenses<br> partagées, facilement"
 
@@ -387,39 +392,39 @@ msgstr "Gérez vos dépenses<br> partagées, facilement"
 msgid "Try out the demo"
 msgstr "Essayez la démo"
 
-#: templates/home.html:12
+#: templates/home.html:13
 msgid "You're sharing a house?"
 msgstr "Vous êtes en colocation ?"
 
-#: templates/home.html:12
+#: templates/home.html:13
 msgid "Going on holidays with friends?"
 msgstr "Partez en vacances avec des amis ?"
 
-#: templates/home.html:12
+#: templates/home.html:13
 msgid "Simply sharing money with others?"
 msgstr "Ça vous arrive de partager de l'argent avec d'autres ?"
 
-#: templates/home.html:12
+#: templates/home.html:13
 msgid "We can help!"
 msgstr "On peut vous aider !"
 
-#: templates/home.html:24
+#: templates/home.html:21
 msgid "Log to an existing project"
 msgstr "Se connecter à un projet existant"
 
-#: templates/home.html:28
+#: templates/home.html:25
 msgid "log in"
 msgstr "se connecter"
 
-#: templates/home.html:29
+#: templates/home.html:26
 msgid "can't remember your password?"
 msgstr "vous ne vous souvenez plus du code d'accès ?"
 
-#: templates/home.html:36
+#: templates/home.html:34 templates/home.html:42
 msgid "or create a new one"
 msgstr "ou créez en un nouveau"
 
-#: templates/home.html:40
+#: templates/home.html:38
 msgid "let's get started"
 msgstr "c'est parti !"
 
@@ -435,95 +440,91 @@ msgstr ""
 msgid "Account manager"
 msgstr "Gestion de comptes"
 
-#: templates/layout.html:45 templates/settle_bills.html:4
+#: templates/layout.html:39
 msgid "Bills"
 msgstr "Factures"
 
-#: templates/layout.html:46 templates/settle_bills.html:5
+#: templates/layout.html:40
 msgid "Settle"
 msgstr "Remboursements"
 
-#: templates/layout.html:50
+#: templates/layout.html:41
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: templates/layout.html:53
+#: templates/layout.html:48
 msgid "options"
 msgstr "options"
 
-#: templates/layout.html:55
+#: templates/layout.html:50
 msgid "Project settings"
 msgstr "Options du projet"
 
-#: templates/layout.html:59
+#: templates/layout.html:54
 msgid "switch to"
 msgstr "aller à"
 
-#: templates/layout.html:62
+#: templates/layout.html:57
 msgid "Start a new project"
 msgstr "Nouveau projet"
 
-#: templates/layout.html:64
+#: templates/layout.html:59
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: templates/layout.html:92
+#: templates/layout.html:66
+msgid "Dashboard"
+msgstr ""
+
+#: templates/layout.html:89
 msgid "This is a free software"
 msgstr "Ceci est un logiciel libre"
 
-#: templates/layout.html:92
+#: templates/layout.html:89
 msgid "you can contribute and improve it!"
 msgstr "vous pouvez y contribuer et l'améliorer"
 
-#: templates/list_bills.html:74
+#: templates/list_bills.html:63
+msgid "deactivate"
+msgstr "désactiver"
+
+#: templates/list_bills.html:70
 msgid "reactivate"
 msgstr "ré-activer"
 
-#: templates/list_bills.html:88
-msgid "Invite"
-msgstr "Invitez"
-
-#: templates/list_bills.html:88
+#: templates/list_bills.html:82
 msgid "Invite people to join this project!"
 msgstr "Invitez d'autres personnes à rejoindre ce projet !"
 
-#: templates/list_bills.html:89
+#: templates/list_bills.html:83
 msgid "Add a new bill"
 msgstr "Nouvelle facture"
 
-#: templates/list_bills.html:103
+#: templates/list_bills.html:101
 msgid "When?"
 msgstr "Quand ?"
 
-#: templates/list_bills.html:103
+#: templates/list_bills.html:101
 msgid "Who paid?"
 msgstr "Qui a payé ?"
 
-#: templates/list_bills.html:103
+#: templates/list_bills.html:101
 msgid "For what?"
 msgstr "Pour quoi ?"
 
-#: templates/list_bills.html:103 templates/settle_bills.html:31
+#: templates/list_bills.html:101 templates/settle_bills.html:22
 msgid "How much?"
 msgstr "Combien ?"
 
-#: templates/list_bills.html:103
-msgid "Actions"
-msgstr "Actions"
-
-#: templates/list_bills.html:111
+#: templates/list_bills.html:109
 msgid "each"
 msgstr "chacun"
 
-#: templates/list_bills.html:113
-msgid "edit"
-msgstr "éditer"
-
-#: templates/list_bills.html:122
+#: templates/list_bills.html:120
 msgid "Nothing to list yet. You probably want to"
 msgstr "Rien à lister pour l'instant. Vous voulez surement"
 
-#: templates/list_bills.html:122
+#: templates/list_bills.html:120
 msgid "add a bill"
 msgstr "ajouter une facture"
 
@@ -535,15 +536,15 @@ msgstr "Rappel du code d'accès"
 msgid "Your projects"
 msgstr "Vos projets"
 
-#: templates/reset_password.html:2
+#: templates/reset_password.html:7
 msgid "Reset your password"
 msgstr "Changez votre mot de passe"
 
-#: templates/send_invites.html:11
+#: templates/send_invites.html:4
 msgid "Invite people to join this project"
 msgstr "Invitez des personnes à rejoindre ce projet"
 
-#: templates/send_invites.html:12
+#: templates/send_invites.html:5
 msgid ""
 "Specify a (comma separated) list of email adresses you want to notify "
 "about the\n"
@@ -553,33 +554,69 @@ msgstr ""
 "Entrez les addresses des personnes que vous souhaitez inviter, séparées "
 "par des virgules. On s'occupe de leur envoyer un email."
 
-#: templates/send_invites.html:14
-msgid "If you prefer, you can share the project identifier and the shared\n"
-"password by other communication means. Or even directly share the following link:"
-msgstr "Si vous préférez vous pouvez partager l'identifiant du projet et son mot "
-"de passe par un autre moyen de communication. Ou directement partager le lien "
-"suivant :"
+#: templates/send_invites.html:7
+msgid ""
+"If you prefer, you can share the project identifier and the shared\n"
+"password by other communication means. Or even directly share the "
+"following link:"
+msgstr ""
+"Si vous préférez vous pouvez partager l'identifiant du projet et son mot "
+"de passe par un autre moyen de communication. Ou directement partager le "
+"lien suivant :"
 
-#: templates/settle_bills.html:31
+#: templates/settle_bills.html:22
 msgid "Who pays?"
 msgstr "Qui doit payer ?"
 
-#: templates/settle_bills.html:31
+#: templates/settle_bills.html:22
 msgid "To whom?"
 msgstr "Pour qui ?"
 
-#: templates/statistics.html:22
+#: templates/statistics.html:21
 msgid "Who?"
 msgstr "Qui ?"
 
-#: templates/statistics.html:22
+#: templates/statistics.html:21
 msgid "Paid"
 msgstr "A payé"
 
-#: templates/statistics.html:22
+#: templates/statistics.html:21
 msgid "Spent"
 msgstr "A dépensé"
 
-#: templates/statistics.html:22
+#: templates/statistics.html:21
 msgid "Balance"
 msgstr "Solde"
+
+#~ msgid ""
+#~ "The project identifier is used to "
+#~ "log in and for the URL of "
+#~ "the project. We tried to generate "
+#~ "an identifier for you but a "
+#~ "project with this identifier already "
+#~ "exists. Please create a new identifier"
+#~ " that you will be able to "
+#~ "remember."
+#~ msgstr ""
+#~ "L'identifiant du projet est utilisé pour"
+#~ " se connecter.Nous avons essayé de "
+#~ "générer un identifiant mais celui ci "
+#~ "existe déjà. Merci de créer un "
+#~ "nouvel identifiant que vous serez "
+#~ "capable de retenir"
+
+#~ msgid "Start date"
+#~ msgstr "Date de départ"
+
+#~ msgid "End date"
+#~ msgstr "Date de fin"
+
+#~ msgid "\"No token provided\""
+#~ msgstr "Aucun token n'a été fourni."
+
+#~ msgid "User '%(name)s' has been deactivated"
+#~ msgstr "Le membre '%(name)s' a été désactivé"
+
+#~ msgid "Invite"
+#~ msgstr "Invitez"
+