diff --git a/api/acl.py b/api/acl.py
index c2db9862..490b88c7 100644
--- a/api/acl.py
+++ b/api/acl.py
@@ -74,6 +74,6 @@ def can_view(user):
     can = user.has_perm(permission)
     return (
         can,
-        None if can else _("You don't have the right to see this" " application."),
+        None if can else _("You don't have the right to view this application."),
         (permission,),
     )
diff --git a/api/locale/fr/LC_MESSAGES/django.po b/api/locale/fr/LC_MESSAGES/django.po
index b906b937..aba3d217 100644
--- a/api/locale/fr/LC_MESSAGES/django.po
+++ b/api/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-19 23:43+0100\n"
 "PO-Revision-Date: 2019-01-07 01:37+0100\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -31,10 +31,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: api/acl.py:74
-msgid "You don't have the right to see this application."
+#: api/acl.py:77
+msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: api/authentication.py:49
+#: api/authentication.py:47
 msgid "The token has expired."
 msgstr "Le jeton a expiré."
diff --git a/cotisations/forms.py b/cotisations/forms.py
index 6f4a9a45..76db358c 100644
--- a/cotisations/forms.py
+++ b/cotisations/forms.py
@@ -116,7 +116,7 @@ class DiscountForm(Form):
     """
 
     is_relative = forms.BooleanField(
-        label=_("Discount is on percentage."), required=False
+        label=_("Discount is in percentage."), required=False
     )
     discount = forms.DecimalField(
         label=_("Discount"),
@@ -136,7 +136,7 @@ class DiscountForm(Form):
         else:
             amount = discount
         if amount:
-            name = _("{}% discount") if is_relative else _("{}€ discount")
+            name = _("{}% discount") if is_relative else _("{} € discount")
             name = name.format(discount)
             Vente.objects.create(facture=invoice, name=name, prix=-amount, number=1)
 
@@ -184,7 +184,7 @@ class DelArticleForm(FormRevMixin, Form):
 
     articles = forms.ModelMultipleChoiceField(
         queryset=Article.objects.none(),
-        label=_("Available articles"),
+        label=_("Current articles"),
         widget=forms.CheckboxSelectMultiple,
     )
 
@@ -226,7 +226,7 @@ class DelPaiementForm(FormRevMixin, Form):
     # TODO : change paiement to payment
     paiements = forms.ModelMultipleChoiceField(
         queryset=Paiement.objects.none(),
-        label=_("Available payment methods"),
+        label=_("Current payment methods"),
         widget=forms.CheckboxSelectMultiple,
     )
 
@@ -266,7 +266,7 @@ class DelBanqueForm(FormRevMixin, Form):
     # TODO : change banque to bank
     banques = forms.ModelMultipleChoiceField(
         queryset=Banque.objects.none(),
-        label=_("Available banks"),
+        label=_("Current banks"),
         widget=forms.CheckboxSelectMultiple,
     )
 
diff --git a/cotisations/locale/fr/LC_MESSAGES/django.po b/cotisations/locale/fr/LC_MESSAGES/django.po
index 943bb8e7..1d68e1fe 100644
--- a/cotisations/locale/fr/LC_MESSAGES/django.po
+++ b/cotisations/locale/fr/LC_MESSAGES/django.po
@@ -1,5 +1,5 @@
 # Re2o est un logiciel d'administration développé initiallement au rezometz. Il
-# se veut agnostique au réseau considéré, de manière à être installable en
+# se veut agnostique au réseau considéré, de manière à être installable en
 # quelques clics.
 #
 # Copyright © 2018 Maël Kervella
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
 "PO-Revision-Date: 2018-03-31 16:09+0002\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language: fr_FR\n"
@@ -29,33 +29,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cotisations/acl.py:45
+#: cotisations/acl.py:47
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: cotisations/forms.py:66 cotisations/forms.py:298
+#: cotisations/forms.py:70 cotisations/forms.py:296
 msgid "Select a payment method"
 msgstr "Sélectionnez un moyen de paiement"
 
-#: cotisations/forms.py:69 cotisations/models.py:602
+#: cotisations/forms.py:73 cotisations/models.py:676
 msgid "Member"
 msgstr "Adhérent"
 
-#: cotisations/forms.py:71
+#: cotisations/forms.py:74
 msgid "Select the proprietary member"
 msgstr "Sélectionnez l'adhérent propriétaire"
 
-#: cotisations/forms.py:72
+#: cotisations/forms.py:75
 msgid "Validated invoice"
 msgstr "Facture validée"
 
-#: cotisations/forms.py:85
+#: cotisations/forms.py:87
 msgid "A payment method must be specified."
 msgstr "Un moyen de paiement doit être renseigné."
 
-#: cotisations/forms.py:97
+#: cotisations/forms.py:98
 #: cotisations/templates/cotisations/aff_article.html:33
-#: cotisations/templates/cotisations/facture.html:67
+#: cotisations/templates/cotisations/facture.html:64
 msgid "Article"
 msgstr "Article"
 
@@ -65,51 +65,51 @@ msgid "Quantity"
 msgstr "Quantité"
 
 #: cotisations/forms.py:119
-msgid "Discount is on percentage."
+msgid "Discount is in percentage."
 msgstr "La réduction est en pourcentage."
 
-#: cotisations/forms.py:123 cotisations/templates/cotisations/facture.html:78
+#: cotisations/forms.py:122 cotisations/templates/cotisations/facture.html:75
 msgid "Discount"
 msgstr "Réduction"
 
-#: cotisations/forms.py:140
+#: cotisations/forms.py:139
 #, python-format
 msgid "{}% discount"
 msgstr "{}% de réduction"
 
-#: cotisations/forms.py:140
-msgid "{}€ discount"
-msgstr "{}€ de réduction"
+#: cotisations/forms.py:139
+msgid "{} € discount"
+msgstr "{} € de réduction"
 
-#: cotisations/forms.py:179
+#: cotisations/forms.py:176
 msgid "Article name"
 msgstr "Nom de l'article"
 
-#: cotisations/forms.py:189 cotisations/templates/cotisations/sidebar.html:55
-msgid "Available articles"
-msgstr "Articles disponibles"
+#: cotisations/forms.py:187
+msgid "Current articles"
+msgstr "Articles actuels"
 
-#: cotisations/forms.py:217
+#: cotisations/forms.py:216
 msgid "Payment method name"
 msgstr "Nom du moyen de paiement"
 
 #: cotisations/forms.py:229
-msgid "Available payment methods"
-msgstr "Moyens de paiement disponibles"
+msgid "Current payment methods"
+msgstr "Moyens de paiement actuels"
 
-#: cotisations/forms.py:255
+#: cotisations/forms.py:256
 msgid "Bank name"
 msgstr "Nom de la banque"
 
-#: cotisations/forms.py:267
-msgid "Available banks"
-msgstr "Banques disponibles"
+#: cotisations/forms.py:269
+msgid "Current banks"
+msgstr "Banques actuelles"
 
-#: cotisations/forms.py:286
+#: cotisations/forms.py:288
 msgid "Amount"
 msgstr "Montant"
 
-#: cotisations/forms.py:291
+#: cotisations/forms.py:290
 #: cotisations/templates/cotisations/aff_cost_estimate.html:42
 #: cotisations/templates/cotisations/aff_cotisations.html:44
 #: cotisations/templates/cotisations/aff_custom_invoice.html:42
@@ -117,7 +117,7 @@ msgstr "Montant"
 msgid "Payment method"
 msgstr "Moyen de paiement"
 
-#: cotisations/forms.py:312
+#: cotisations/forms.py:314
 #, python-format
 msgid ""
 "Requested amount is too high. Your balance can't exceed "
@@ -126,55 +126,52 @@ msgstr ""
 "Le montant demandé est trop grand. Votre solde ne peut excéder "
 "%(max_online_balance)s €."
 
-#: cotisations/models.py:63
-#: cotisations/templates/cotisations/aff_cost_estimate.html:46
-#: cotisations/templates/cotisations/aff_cotisations.html:48
-#: cotisations/templates/cotisations/aff_custom_invoice.html:46
-#: cotisations/templates/cotisations/control.html:70
-msgid "Date"
-msgstr "Date"
+#: cotisations/models.py:59
+msgid "date"
+msgstr "date"
 
-#: cotisations/models.py:139
+#: cotisations/models.py:130
 msgid "cheque number"
 msgstr "numéro de chèque"
 
-#: cotisations/models.py:144
+#: cotisations/models.py:133
 msgid "validated"
-msgstr "validée"
+msgstr "validé"
 
-#: cotisations/models.py:149
+#: cotisations/models.py:135
 msgid "controlled"
-msgstr "contrôlée"
+msgstr "contrôlé"
 
-#: cotisations/models.py:157
+#: cotisations/models.py:141
 msgid "Can edit the \"controlled\" state"
 msgstr "Peut modifier l'état \"contrôlé\""
 
-#: cotisations/models.py:159
+#: cotisations/models.py:142
 msgid "Can view an invoice object"
 msgstr "Peut voir un objet facture"
 
-#: cotisations/models.py:161
+#: cotisations/models.py:143
 msgid "Can edit all the previous invoices"
 msgstr "Peut modifier toutes les factures précédentes"
 
-#: cotisations/models.py:163 cotisations/models.py:396
+#: cotisations/models.py:145 cotisations/models.py:431 cotisations/views.py:378
+#: cotisations/views.py:573
 msgid "invoice"
 msgstr "facture"
 
-#: cotisations/models.py:164
+#: cotisations/models.py:146
 msgid "invoices"
 msgstr "factures"
 
-#: cotisations/models.py:173
+#: cotisations/models.py:160
 msgid "You don't have the right to edit an invoice."
 msgstr "Vous n'avez pas le droit de modifier une facture."
 
-#: cotisations/models.py:176
+#: cotisations/models.py:168
 msgid "You don't have the right to edit this user's invoices."
 msgstr "Vous n'avez pas le droit de modifier les factures de cet utilisateur."
 
-#: cotisations/models.py:180
+#: cotisations/models.py:177
 msgid ""
 "You don't have the right to edit an invoice already controlled or "
 "invalidated."
@@ -182,15 +179,15 @@ msgstr ""
 "Vous n'avez pas le droit de modifier une facture précédemment contrôlée ou "
 "invalidée."
 
-#: cotisations/models.py:187
+#: cotisations/models.py:192
 msgid "You don't have the right to delete an invoice."
 msgstr "Vous n'avez pas le droit de supprimer une facture."
 
-#: cotisations/models.py:190
+#: cotisations/models.py:200
 msgid "You don't have the right to delete this user's invoices."
 msgstr "Vous n'avez pas le droit de supprimer les factures de cet utilisateur."
 
-#: cotisations/models.py:194
+#: cotisations/models.py:209
 msgid ""
 "You don't have the right to delete an invoice already controlled or "
 "invalidated."
@@ -198,137 +195,137 @@ msgstr ""
 "Vous n'avez pas le droit de supprimer une facture précédemment contrôlée ou "
 "invalidée."
 
-#: cotisations/models.py:202
+#: cotisations/models.py:223
 msgid "You don't have the right to view someone else's invoices history."
 msgstr ""
 "Vous n'avez pas le droit de voir l'historique des factures d'un autre "
 "utilisateur."
 
-#: cotisations/models.py:205
+#: cotisations/models.py:231
 msgid "The invoice has been invalidated."
 msgstr "La facture a été invalidée."
 
-#: cotisations/models.py:217
+#: cotisations/models.py:246
 msgid "You don't have the right to edit the \"controlled\" state."
 msgstr "Vous n'avez pas le droit de modifier le statut \"contrôlé\"."
 
-#: cotisations/models.py:231
-msgid "There are no payment method which you can use."
-msgstr "Il n'y a pas de moyen de paiement que vous puissiez utiliser."
+#: cotisations/models.py:265
+msgid "There are no payment methods that you can use."
+msgstr "Il n'y a pas de moyens de paiement que vous puissiez utiliser."
 
-#: cotisations/models.py:233
-msgid "There are no article that you can buy."
-msgstr "Il n'y a pas d'article que vous puissiez acheter."
+#: cotisations/models.py:271
+msgid "There are no articles that you can buy."
+msgstr "Il n'y a pas d'articles que vous puissiez acheter."
 
-#: cotisations/models.py:295
+#: cotisations/models.py:347
 msgid "Can view a custom invoice object"
 msgstr "Peut voir un objet facture personnalisée"
 
-#: cotisations/models.py:299
-#: cotisations/templates/cotisations/aff_cost_estimate.html:36
-#: cotisations/templates/cotisations/aff_custom_invoice.html:36
-msgid "Recipient"
-msgstr "Destinataire"
+#: cotisations/models.py:349
+msgid "recipient"
+msgstr "destinataire"
 
-#: cotisations/models.py:303
-#: cotisations/templates/cotisations/aff_paiement.html:33
-msgid "Payment type"
-msgstr "Type de paiement"
+#: cotisations/models.py:350
+msgid "payment type"
+msgstr "type de paiement"
 
-#: cotisations/models.py:307
-msgid "Address"
-msgstr "Adresse"
+#: cotisations/models.py:351
+msgid "address"
+msgstr "adresse"
 
-#: cotisations/models.py:310
-#: cotisations/templates/cotisations/aff_custom_invoice.html:54
-msgid "Paid"
-msgstr "Payé"
+#: cotisations/models.py:352
+msgid "paid"
+msgstr "payé"
 
-#: cotisations/models.py:314
-msgid "Remark"
-msgstr "Remarque"
+#: cotisations/models.py:353
+msgid "remark"
+msgstr "remarque"
 
-#: cotisations/models.py:323
+#: cotisations/models.py:358
 msgid "Can view a cost estimate object"
 msgstr "Peut voir un objet devis"
 
-#: cotisations/models.py:326
-msgid "Period of validity"
-msgstr "Période de validité"
+#: cotisations/models.py:361
+msgid "period of validity"
+msgstr "période de validité"
 
-#: cotisations/models.py:363
+#: cotisations/models.py:396
 msgid "You don't have the right to delete a cost estimate."
 msgstr "Vous n'avez pas le droit de supprimer un devis."
 
-#: cotisations/models.py:366
+#: cotisations/models.py:402
 msgid "The cost estimate has an invoice and can't be deleted."
 msgstr "Le devis a une facture et ne peut pas être supprimé."
 
-#: cotisations/models.py:387 cotisations/models.py:608
-#: cotisations/models.py:875
+#: cotisations/models.py:424 cotisations/models.py:682
+#: cotisations/models.py:940
 msgid "Connection"
 msgstr "Connexion"
 
-#: cotisations/models.py:388 cotisations/models.py:609
-#: cotisations/models.py:876
+#: cotisations/models.py:425 cotisations/models.py:683
+#: cotisations/models.py:941
 msgid "Membership"
 msgstr "Adhésion"
 
-#: cotisations/models.py:389 cotisations/models.py:604
-#: cotisations/models.py:610 cotisations/models.py:877
+#: cotisations/models.py:426 cotisations/models.py:678
+#: cotisations/models.py:684 cotisations/models.py:942
 msgid "Both of them"
 msgstr "Les deux"
 
-#: cotisations/models.py:401
+#: cotisations/models.py:435
 msgid "amount"
 msgstr "montant"
 
-#: cotisations/models.py:406
+#: cotisations/models.py:438
 msgid "article"
 msgstr "article"
 
-#: cotisations/models.py:413
+#: cotisations/models.py:441
 msgid "price"
 msgstr "prix"
 
-#: cotisations/models.py:418 cotisations/models.py:627
+#: cotisations/models.py:444 cotisations/models.py:696
 msgid "duration (in months)"
 msgstr "durée (en mois)"
 
-#: cotisations/models.py:426 cotisations/models.py:641
-#: cotisations/models.py:891
+#: cotisations/models.py:450 cotisations/models.py:702
+msgid "duration (in days, will be added to duration in months)"
+msgstr "durée (en jours, sera ajoutée à la durée en mois)"
+
+#: cotisations/models.py:458 cotisations/models.py:716
+#: cotisations/models.py:953
 msgid "subscription type"
 msgstr "type de cotisation"
 
-#: cotisations/models.py:431
+#: cotisations/models.py:463
 msgid "Can view a purchase object"
 msgstr "Peut voir un objet achat"
 
-#: cotisations/models.py:432
+#: cotisations/models.py:464
 msgid "Can edit all the previous purchases"
 msgstr "Peut modifier tous les achats précédents"
 
-#: cotisations/models.py:434 cotisations/models.py:885
+#: cotisations/models.py:466 cotisations/models.py:947
 msgid "purchase"
 msgstr "achat"
 
-#: cotisations/models.py:435
+#: cotisations/models.py:467
 msgid "purchases"
 msgstr "achats"
 
-#: cotisations/models.py:502 cotisations/models.py:665
+#: cotisations/models.py:539 cotisations/models.py:736
 msgid "Duration must be specified for a subscription."
-msgstr "La durée de la cotisation doit être indiquée."
+msgstr "La durée doit être renseignée pour une cotisation."
 
-#: cotisations/models.py:509
-msgid "You don't have the right to edit the purchases."
-msgstr "Vous n'avez pas le droit de modifier les achats."
+#: cotisations/models.py:550
+msgid "You don't have the right to edit a purchase."
+msgstr "Vous n'avez pas le droit de modifier un achat."
 
-#: cotisations/models.py:514
+#: cotisations/models.py:556
 msgid "You don't have the right to edit this user's purchases."
 msgstr "Vous n'avez pas le droit de modifier les achats de cet utilisateur."
 
-#: cotisations/models.py:518
+#: cotisations/models.py:565
 msgid ""
 "You don't have the right to edit a purchase already controlled or "
 "invalidated."
@@ -336,15 +333,15 @@ msgstr ""
 "Vous n'avez pas le droit de modifier un achat précédemment contrôlé ou "
 "invalidé."
 
-#: cotisations/models.py:525
+#: cotisations/models.py:580
 msgid "You don't have the right to delete a purchase."
 msgstr "Vous n'avez pas le droit de supprimer un achat."
 
-#: cotisations/models.py:527
+#: cotisations/models.py:586
 msgid "You don't have the right to delete this user's purchases."
 msgstr "Vous n'avez pas le droit de supprimer les achats de cet utilisateur."
 
-#: cotisations/models.py:530
+#: cotisations/models.py:593
 msgid ""
 "You don't have the right to delete a purchase already controlled or "
 "invalidated."
@@ -352,134 +349,134 @@ msgstr ""
 "Vous n'avez pas le droit de supprimer un achat précédemment contrôlé ou "
 "invalidé."
 
-#: cotisations/models.py:538
+#: cotisations/models.py:609
 msgid "You don't have the right to view someone else's purchase history."
 msgstr ""
 "Vous n'avez pas le droit de voir l'historique des achats d'un autre "
 "utilisateur."
 
-#: cotisations/models.py:603
+#: cotisations/models.py:677
 msgid "Club"
 msgstr "Club"
 
-#: cotisations/models.py:615
+#: cotisations/models.py:687
 msgid "designation"
 msgstr "désignation"
 
-#: cotisations/models.py:621
+#: cotisations/models.py:690
 msgid "unit price"
 msgstr "prix unitaire"
 
-#: cotisations/models.py:633
+#: cotisations/models.py:708
 msgid "type of users concerned"
 msgstr "type d'utilisateurs concernés"
 
-#: cotisations/models.py:645 cotisations/models.py:756
+#: cotisations/models.py:719 cotisations/models.py:820
 msgid "is available for every user"
 msgstr "est disponible pour chaque utilisateur"
 
-#: cotisations/models.py:652
+#: cotisations/models.py:726
 msgid "Can view an article object"
 msgstr "Peut voir un objet article"
 
-#: cotisations/models.py:653
+#: cotisations/models.py:727
 msgid "Can buy every article"
 msgstr "Peut acheter chaque article"
 
-#: cotisations/models.py:661
-msgid "Balance is a reserved article name."
+#: cotisations/models.py:734
+msgid "Solde is a reserved article name."
 msgstr "Solde est un nom d'article réservé."
 
-#: cotisations/models.py:686
+#: cotisations/models.py:759
 msgid "You can't buy this article."
 msgstr "Vous ne pouvez pas acheter cet article."
 
-#: cotisations/models.py:731
+#: cotisations/models.py:800
 msgid "Can view a bank object"
 msgstr "Peut voir un objet banque"
 
-#: cotisations/models.py:733
+#: cotisations/models.py:801
 msgid "bank"
 msgstr "banque"
 
-#: cotisations/models.py:734
+#: cotisations/models.py:802
 msgid "banks"
 msgstr "banques"
 
-#: cotisations/models.py:752
+#: cotisations/models.py:818
 msgid "method"
 msgstr "moyen"
 
-#: cotisations/models.py:761
+#: cotisations/models.py:825
 msgid "is user balance"
 msgstr "est solde utilisateur"
 
-#: cotisations/models.py:762
+#: cotisations/models.py:826
 msgid "There should be only one balance payment method."
 msgstr "Il ne devrait y avoir qu'un moyen de paiement solde."
 
-#: cotisations/models.py:768
+#: cotisations/models.py:832
 msgid "Can view a payment method object"
 msgstr "Peut voir un objet moyen de paiement"
 
-#: cotisations/models.py:769
+#: cotisations/models.py:833
 msgid "Can use every payment method"
 msgstr "Peut utiliser chaque moyen de paiement"
 
-#: cotisations/models.py:771
+#: cotisations/models.py:835
 msgid "payment method"
 msgstr "moyen de paiement"
 
-#: cotisations/models.py:772
+#: cotisations/models.py:836
 msgid "payment methods"
 msgstr "moyens de paiement"
 
-#: cotisations/models.py:810 cotisations/payment_methods/comnpay/views.py:63
+#: cotisations/models.py:875 cotisations/payment_methods/comnpay/views.py:62
 #, python-format
 msgid "The subscription of %(member_name)s was extended to %(end_date)s."
 msgstr "La cotisation de %(member_name)s a été étendue au %(end_date)s."
 
-#: cotisations/models.py:820
+#: cotisations/models.py:885
 msgid "The invoice was created."
 msgstr "La facture a été créée."
 
-#: cotisations/models.py:841
+#: cotisations/models.py:905
 msgid "You can't use this payment method."
 msgstr "Vous ne pouvez pas utiliser ce moyen de paiement."
 
-#: cotisations/models.py:859
-msgid "No custom payment method."
-msgstr "Pas de moyen de paiement personnalisé."
+#: cotisations/models.py:924
+msgid "No custom payment methods."
+msgstr "Pas de moyens de paiement personnalisés."
 
-#: cotisations/models.py:894
+#: cotisations/models.py:955
 msgid "start date"
 msgstr "date de début"
 
-#: cotisations/models.py:897
+#: cotisations/models.py:956
 msgid "end date"
 msgstr "date de fin"
 
-#: cotisations/models.py:902
+#: cotisations/models.py:960
 msgid "Can view a subscription object"
 msgstr "Peut voir un objet cotisation"
 
-#: cotisations/models.py:903
+#: cotisations/models.py:961
 msgid "Can edit the previous subscriptions"
 msgstr "Peut modifier les cotisations précédentes"
 
-#: cotisations/models.py:905
+#: cotisations/models.py:963
 msgid "subscription"
 msgstr "cotisation"
 
-#: cotisations/models.py:906
+#: cotisations/models.py:964
 msgid "subscriptions"
 msgstr "cotisations"
 
-#: cotisations/models.py:910
+#: cotisations/models.py:970
 msgid "You don't have the right to edit a subscription."
 msgstr "Vous n'avez pas le droit de modifier une cotisation."
 
-#: cotisations/models.py:914
+#: cotisations/models.py:979
 msgid ""
 "You don't have the right to edit a subscription already controlled or "
 "invalidated."
@@ -487,11 +484,11 @@ msgstr ""
 "Vous n'avez pas le droit de modifier une cotisation précédemment contrôlée "
 "ou invalidée."
 
-#: cotisations/models.py:921
+#: cotisations/models.py:991
 msgid "You don't have the right to delete a subscription."
 msgstr "Vous n'avez pas le droit de supprimer une cotisation."
 
-#: cotisations/models.py:924
+#: cotisations/models.py:998
 msgid ""
 "You don't have the right to delete a subscription already controlled or "
 "invalidated."
@@ -499,7 +496,7 @@ msgstr ""
 "Vous n'avez pas le droit de supprimer une cotisation précédemment contrôlée "
 "ou invalidée."
 
-#: cotisations/models.py:932
+#: cotisations/models.py:1014
 msgid "You don't have the right to view someone else's subscription history."
 msgstr ""
 "Vous n'avez pas le droit de voir l'historique des cotisations d'un autre "
@@ -510,44 +507,44 @@ msgid "user balance"
 msgstr "solde utilisateur"
 
 #: cotisations/payment_methods/balance/models.py:47
-msgid "Minimum balance"
-msgstr "Solde minimum"
+msgid "minimum balance"
+msgstr "solde minimum"
 
-#: cotisations/payment_methods/balance/models.py:48
+#: cotisations/payment_methods/balance/models.py:49
 msgid ""
 "The minimal amount of money allowed for the balance at the end of a payment. "
-"You can specify negative amount."
+"You can specify a negative amount."
 msgstr ""
 "Le montant minimal d'argent autorisé pour le solde à la fin d'un paiement. "
 "Vous pouvez renseigner un montant négatif."
 
 #: cotisations/payment_methods/balance/models.py:57
-msgid "Maximum balance"
-msgstr "Solde maximum"
+msgid "maximum balance"
+msgstr "solde maximum"
 
 #: cotisations/payment_methods/balance/models.py:58
 msgid "The maximal amount of money allowed for the balance."
 msgstr "Le montant maximal d'argent autorisé pour le solde."
 
 #: cotisations/payment_methods/balance/models.py:66
-msgid "Allow user to credit their balance"
-msgstr "Autorise l'utilisateur à créditer son solde"
+msgid "allow user to credit their balance"
+msgstr "autoriser l'utilisateur à créditer son solde"
 
-#: cotisations/payment_methods/balance/models.py:79
-#: cotisations/payment_methods/balance/models.py:110
+#: cotisations/payment_methods/balance/models.py:76
+#: cotisations/payment_methods/balance/models.py:99
 msgid "Your balance is too low for this operation."
 msgstr "Votre solde est trop bas pour cette opération."
 
-#: cotisations/payment_methods/balance/models.py:97
+#: cotisations/payment_methods/balance/models.py:86
 #: cotisations/validators.py:20
 msgid "There is already a payment method for user balance."
-msgstr "Il y a déjà un moyen de paiement pour le solde utilisateur."
+msgstr "Il y a déjà un moyen de paiement pour le solde utilisateur."
 
 #: cotisations/payment_methods/cheque/models.py:36
-msgid "Cheque"
-msgstr "Chèque"
+msgid "cheque"
+msgstr "chèque"
 
-#: cotisations/payment_methods/cheque/views.py:47
+#: cotisations/payment_methods/cheque/views.py:45
 msgid "You can't pay this invoice with a cheque."
 msgstr "Vous ne pouvez pas payer cette facture avec un chèque."
 
@@ -555,32 +552,32 @@ msgstr "Vous ne pouvez pas payer cette facture avec un chèque."
 msgid "ComNpay"
 msgstr "ComNpay"
 
-#: cotisations/payment_methods/comnpay/models.py:51
+#: cotisations/payment_methods/comnpay/models.py:48
 msgid "ComNpay VAT Number"
 msgstr "Numéro de TVA de ComNpay"
 
-#: cotisations/payment_methods/comnpay/models.py:57
+#: cotisations/payment_methods/comnpay/models.py:51
 msgid "ComNpay secret key"
 msgstr "Clé secrète de ComNpay"
 
-#: cotisations/payment_methods/comnpay/models.py:60
-msgid "Minimum payment"
-msgstr "Paiement minimum"
+#: cotisations/payment_methods/comnpay/models.py:54
+msgid "minimum payment"
+msgstr "paiement minimum"
 
-#: cotisations/payment_methods/comnpay/models.py:61
-msgid "The minimal amount of money you have to use when paying with ComNpay"
+#: cotisations/payment_methods/comnpay/models.py:56
+msgid "The minimal amount of money you have to use when paying with ComNpay."
 msgstr ""
-"Le montant minimal d'agent que vous devez utiliser en payant avec ComNpay"
+"Le montant minimal d'argent que vous devez utiliser en payant avec ComNpay."
 
-#: cotisations/payment_methods/comnpay/models.py:69
-msgid "Production mode enabled (production URL, instead of homologation)"
-msgstr "Mode production activé (URL de production, au lieu d'homologation)"
+#: cotisations/payment_methods/comnpay/models.py:66
+msgid "production mode enabled (production URL, instead of homologation)"
+msgstr "mode production activé (URL de production, au lieu d'homologation)"
 
-#: cotisations/payment_methods/comnpay/models.py:102
+#: cotisations/payment_methods/comnpay/models.py:101
 msgid "Pay invoice number "
 msgstr "Payer la facture numéro "
 
-#: cotisations/payment_methods/comnpay/models.py:114
+#: cotisations/payment_methods/comnpay/models.py:115
 msgid ""
 "In order to pay your invoice with ComNpay, the price must be greater than {} "
 "€."
@@ -592,11 +589,11 @@ msgstr ""
 msgid "The payment of %(amount)s € was accepted."
 msgstr "Le paiement de %(amount)s € a été accepté."
 
-#: cotisations/payment_methods/comnpay/views.py:84
+#: cotisations/payment_methods/comnpay/views.py:80
 msgid "The payment was refused."
 msgstr "Le paiment a été refusé."
 
-#: cotisations/payment_methods/forms.py:60
+#: cotisations/payment_methods/forms.py:59
 msgid "Special payment method"
 msgstr "Moyen de paiement spécial"
 
@@ -608,15 +605,23 @@ msgstr ""
 "Attention : vous ne pourrez pas changer le moyen de paiement plus tard. Mais "
 "vous pourrez modifier les autres options."
 
-#: cotisations/payment_methods/forms.py:72
-msgid "no"
-msgstr "non"
+#: cotisations/payment_methods/forms.py:74
+msgid "No"
+msgstr "Non"
 
-#: cotisations/payment_methods/note_kfet/forms.py:32
-msgid "pseudo note"
-msgstr "pseudo note"
+#: cotisations/payment_methods/free/models.py:36
+msgid "Free payment"
+msgstr "Paiement gratuit"
 
-#: cotisations/payment_methods/note_kfet/forms.py:35
+#: cotisations/payment_methods/free/models.py:54
+msgid "You can't pay this invoice for free."
+msgstr "Vous ne pouvez pas payer cette facture gratuitement."
+
+#: cotisations/payment_methods/note_kfet/forms.py:33
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: cotisations/payment_methods/note_kfet/forms.py:34
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -624,15 +629,15 @@ msgstr "Mot de passe"
 msgid "NoteKfet"
 msgstr "NoteKfet"
 
-#: cotisations/payment_methods/note_kfet/models.py:50
+#: cotisations/payment_methods/note_kfet/models.py:48
 msgid "server"
 msgstr "serveur"
 
-#: cotisations/payment_methods/note_kfet/views.py:60
+#: cotisations/payment_methods/note_kfet/views.py:58
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: cotisations/payment_methods/note_kfet/views.py:88
+#: cotisations/payment_methods/note_kfet/views.py:87
 msgid "The payment with note was done."
 msgstr "Le paiement par note a été effectué."
 
@@ -649,10 +654,15 @@ msgid "Duration (in months)"
 msgstr "Durée (en mois)"
 
 #: cotisations/templates/cotisations/aff_article.html:37
+msgid "Duration (in days)"
+msgstr "Durée (en jours)"
+
+#: cotisations/templates/cotisations/aff_article.html:38
 msgid "Concerned users"
 msgstr "Utilisateurs concernés"
 
-#: cotisations/templates/cotisations/aff_article.html:38
+#: cotisations/templates/cotisations/aff_article.html:39
+#: cotisations/templates/cotisations/aff_paiement.html:34
 msgid "Available for everyone"
 msgstr "Disponible pour tous"
 
@@ -660,6 +670,11 @@ msgstr "Disponible pour tous"
 msgid "Bank"
 msgstr "Banque"
 
+#: cotisations/templates/cotisations/aff_cost_estimate.html:36
+#: cotisations/templates/cotisations/aff_custom_invoice.html:36
+msgid "Recipient"
+msgstr "Destinataire"
+
 #: cotisations/templates/cotisations/aff_cost_estimate.html:39
 #: cotisations/templates/cotisations/aff_cotisations.html:41
 #: cotisations/templates/cotisations/aff_custom_invoice.html:39
@@ -675,6 +690,13 @@ msgstr "Désignation"
 msgid "Total price"
 msgstr "Prix total"
 
+#: cotisations/templates/cotisations/aff_cost_estimate.html:46
+#: cotisations/templates/cotisations/aff_cotisations.html:48
+#: cotisations/templates/cotisations/aff_custom_invoice.html:46
+#: cotisations/templates/cotisations/control.html:70
+msgid "Date"
+msgstr "Date"
+
 #: cotisations/templates/cotisations/aff_cost_estimate.html:50
 msgid "Validity"
 msgstr "Validité"
@@ -713,11 +735,15 @@ msgstr "Facture invalidée"
 
 #: cotisations/templates/cotisations/aff_cotisations.html:88
 msgid "Voucher"
-msgstr ""
+msgstr "Reçu"
 
-#: cotisations/templates/cotisations/aff_paiement.html:34
-msgid "Is available for everyone"
-msgstr "Est disponible pour tous"
+#: cotisations/templates/cotisations/aff_custom_invoice.html:54
+msgid "Paid"
+msgstr "Payé"
+
+#: cotisations/templates/cotisations/aff_paiement.html:33
+msgid "Payment type"
+msgstr "Type de paiement"
 
 #: cotisations/templates/cotisations/aff_paiement.html:35
 msgid "Custom payment method"
@@ -736,13 +762,13 @@ msgid "Profile"
 msgstr "Profil"
 
 #: cotisations/templates/cotisations/control.html:48
-msgid "Last name"
-msgstr "Nom"
-
-#: cotisations/templates/cotisations/control.html:52
 msgid "First name"
 msgstr "Prénom"
 
+#: cotisations/templates/cotisations/control.html:52
+msgid "Surname"
+msgstr "Nom"
+
 #: cotisations/templates/cotisations/control.html:60
 msgid "User ID"
 msgstr "ID utilisateur"
@@ -755,10 +781,12 @@ msgstr "Validé"
 msgid "Controlled"
 msgstr "Contrôlé"
 
-#: cotisations/templates/cotisations/control.html:107 cotisations/views.py:642
-#: cotisations/views.py:729 cotisations/views.py:809
-msgid "Edit"
-msgstr "Modifier"
+#: cotisations/templates/cotisations/control.html:107
+#: cotisations/templates/cotisations/delete.html:38
+#: cotisations/templates/cotisations/edit_facture.html:64
+#: cotisations/views.py:168 cotisations/views.py:222 cotisations/views.py:278
+msgid "Confirm"
+msgstr "Confirmer"
 
 #: cotisations/templates/cotisations/delete.html:29
 msgid "Deletion of subscriptions"
@@ -767,18 +795,12 @@ msgstr "Suppression de cotisations"
 #: cotisations/templates/cotisations/delete.html:36
 #, python-format
 msgid ""
-"Warning: are you sure you really want to delete this %(object_name)s object "
+"Warning: are you sure you really want to delete this %(objet_name)s object "
 "( %(objet)s )?"
 msgstr ""
-"Attention: voulez-vous vraiment supprimer cet objet %(object_name)s  "
+"Attention: voulez-vous vraiment supprimer cet objet %(objet_name)s  "
 "( %(objet)s ) ?"
 
-#: cotisations/templates/cotisations/delete.html:38
-#: cotisations/templates/cotisations/edit_facture.html:64
-#: cotisations/views.py:178 cotisations/views.py:229 cotisations/views.py:281
-msgid "Confirm"
-msgstr "Confirmer"
-
 #: cotisations/templates/cotisations/edit_facture.html:31
 #: cotisations/templates/cotisations/facture.html:30
 msgid "Creation and editing of invoices"
@@ -789,8 +811,9 @@ msgid "Edit invoice"
 msgstr "Modifier la facture"
 
 #: cotisations/templates/cotisations/edit_facture.html:45
-#: cotisations/templates/cotisations/facture.html:62
+#: cotisations/templates/cotisations/facture.html:59
 #: cotisations/templates/cotisations/index_article.html:30
+#: cotisations/templates/cotisations/sidebar.html:55
 msgid "Articles"
 msgstr "Articles"
 
@@ -808,11 +831,11 @@ msgstr "Solde maximum autorisé : %(max_balance)s €"
 msgid "Current balance: %(balance)s €"
 msgstr "Solde actuel : %(balance)s €"
 
-#: cotisations/templates/cotisations/facture.html:76
+#: cotisations/templates/cotisations/facture.html:73
 msgid "Add an extra article"
 msgstr "Ajouter un article supplémentaire"
 
-#: cotisations/templates/cotisations/facture.html:82
+#: cotisations/templates/cotisations/facture.html:79
 msgid "Total price: <span id=\"total_price\">0,00</span> €"
 msgstr "Prix total : <span id=\"total_price\">0,00</span> €"
 
@@ -826,16 +849,16 @@ msgid "Subscriptions"
 msgstr "Cotisations"
 
 #: cotisations/templates/cotisations/index_article.html:33
-msgid "List of article types"
-msgstr "Liste des types d'article"
+msgid "List of articles"
+msgstr "Liste des articles"
 
 #: cotisations/templates/cotisations/index_article.html:36
-msgid "Add an article type"
-msgstr "Ajouter un type d'article"
+msgid "Add an article"
+msgstr "Ajouter un article"
 
 #: cotisations/templates/cotisations/index_article.html:40
-msgid "Delete one or several article types"
-msgstr "Supprimer un ou plusieurs types d'article"
+msgid "Delete one or several articles"
+msgstr "Supprimer un ou plusieurs articles"
 
 #: cotisations/templates/cotisations/index_banque.html:30
 #: cotisations/templates/cotisations/sidebar.html:60
@@ -898,7 +921,7 @@ msgstr "Rechargement de solde"
 msgid "Pay %(amount)s €"
 msgstr "Payer %(amount)s €"
 
-#: cotisations/templates/cotisations/payment.html:42 cotisations/views.py:1051
+#: cotisations/templates/cotisations/payment.html:42 cotisations/views.py:1028
 msgid "Pay"
 msgstr "Payer"
 
@@ -910,138 +933,154 @@ msgstr "Créer une facture"
 msgid "Control the invoices"
 msgstr "Contrôler les factures"
 
-#: cotisations/views.py:164
+#: cotisations/views.py:155
 msgid "You need to choose at least one article."
 msgstr "Vous devez choisir au moins un article."
 
-#: cotisations/views.py:223
+#: cotisations/views.py:169
+msgid "New invoice"
+msgstr "Nouvelle facture"
+
+#: cotisations/views.py:216
 msgid "The cost estimate was created."
 msgstr "Le devis a été créé."
 
-#: cotisations/views.py:233 cotisations/views.py:534
-msgid "Cost estimate"
-msgstr "Devis"
+#: cotisations/views.py:226
+msgid "New cost estimate"
+msgstr "Nouveau devis"
 
-#: cotisations/views.py:275
+#: cotisations/views.py:272
 msgid "The custom invoice was created."
 msgstr "La facture personnalisée a été créée."
 
-#: cotisations/views.py:364 cotisations/views.py:467
+#: cotisations/views.py:282
+msgid "New custom invoice"
+msgstr "Nouvelle facture personnalisée"
+
+#: cotisations/views.py:357 cotisations/views.py:438
 msgid "The invoice was edited."
 msgstr "La facture a été modifiée."
 
-#: cotisations/views.py:384 cotisations/views.py:589
+#: cotisations/views.py:375 cotisations/views.py:570
 msgid "The invoice was deleted."
 msgstr "La facture a été supprimée."
 
-#: cotisations/views.py:389 cotisations/views.py:594
-msgid "Invoice"
-msgstr "Facture"
-
-#: cotisations/views.py:418
+#: cotisations/views.py:398
 msgid "The cost estimate was edited."
 msgstr "Le devis a été modifié."
 
-#: cotisations/views.py:425
+#: cotisations/views.py:405
 msgid "Edit cost estimate"
 msgstr "Modifier le devis"
 
-#: cotisations/views.py:437
+#: cotisations/views.py:419
 msgid "An invoice was successfully created from your cost estimate."
 msgstr "Une facture a bien été créée à partir de votre devis."
 
-#: cotisations/views.py:529
+#: cotisations/views.py:445
+msgid "Edit custom invoice"
+msgstr "Modifier la facture personnalisée"
+
+#: cotisations/views.py:507
 msgid "The cost estimate was deleted."
 msgstr "Le devis a été supprimé."
 
-#: cotisations/views.py:615
+#: cotisations/views.py:510
+msgid "cost estimate"
+msgstr "devis"
+
+#: cotisations/views.py:594
 msgid "The article was created."
 msgstr "L'article a été créé."
 
-#: cotisations/views.py:620 cotisations/views.py:693 cotisations/views.py:786
+#: cotisations/views.py:599 cotisations/views.py:673 cotisations/views.py:767
 msgid "Add"
 msgstr "Ajouter"
 
-#: cotisations/views.py:621
+#: cotisations/views.py:600
 msgid "New article"
 msgstr "Nouvel article"
 
-#: cotisations/views.py:637
+#: cotisations/views.py:617
 msgid "The article was edited."
 msgstr "L'article a été modifié."
 
-#: cotisations/views.py:643
+#: cotisations/views.py:622 cotisations/views.py:705 cotisations/views.py:791
+msgid "Edit"
+msgstr "Modifier"
+
+#: cotisations/views.py:623
 msgid "Edit article"
 msgstr "Modifier l'article"
 
-#: cotisations/views.py:659
+#: cotisations/views.py:640
 msgid "The articles were deleted."
 msgstr "Les articles ont été supprimés."
 
-#: cotisations/views.py:664 cotisations/views.py:764 cotisations/views.py:844
+#: cotisations/views.py:645 cotisations/views.py:744 cotisations/views.py:829
 msgid "Delete"
 msgstr "Supprimer"
 
-#: cotisations/views.py:665
+#: cotisations/views.py:646
 msgid "Delete article"
 msgstr "Supprimer l'article"
 
-#: cotisations/views.py:687
+#: cotisations/views.py:667
 msgid "The payment method was created."
 msgstr "Le moyen de paiment a été créé."
 
-#: cotisations/views.py:694
+#: cotisations/views.py:674
 msgid "New payment method"
 msgstr "Nouveau moyen de paiement"
 
-#: cotisations/views.py:723
+#: cotisations/views.py:699
 msgid "The payment method was edited."
 msgstr "Le moyen de paiment a été modifié."
 
-#: cotisations/views.py:730
+#: cotisations/views.py:706
 msgid "Edit payment method"
 msgstr "Modifier le moyen de paiement"
 
-#: cotisations/views.py:749
+#: cotisations/views.py:728
 #, python-format
 msgid "The payment method %(method_name)s was deleted."
 msgstr "Le moyen de paiement %(method_name)s a été supprimé."
 
-#: cotisations/views.py:756
+#: cotisations/views.py:735
 #, python-format
 msgid ""
-"The payment method %(method_name)s can't be deleted                     "
-"because there are invoices using it."
+"The payment method %(method_name)s can't be deleted because there are "
+"invoices using it."
 msgstr ""
 "Le moyen de paiement %(method_name)s ne peut pas être supprimé car il y a "
 "des factures qui l'utilisent."
 
-#: cotisations/views.py:765
+#: cotisations/views.py:745
 msgid "Delete payment method"
 msgstr "Supprimer le moyen de paiement"
 
-#: cotisations/views.py:781
+#: cotisations/views.py:762
 msgid "The bank was created."
 msgstr "La banque a été créée."
 
-#: cotisations/views.py:787
+#: cotisations/views.py:768
 msgid "New bank"
 msgstr "Nouvelle banque"
 
-#: cotisations/views.py:804
+#: cotisations/views.py:786
 msgid "The bank was edited."
 msgstr "La banque a été modifiée."
 
-#: cotisations/views.py:810
+#: cotisations/views.py:792
 msgid "Edit bank"
 msgstr "Modifier la banque"
 
-#: cotisations/views.py:829
+#: cotisations/views.py:814
 #, python-format
 msgid "The bank %(bank_name)s was deleted."
 msgstr "La banque %(bank_name)s a été supprimée."
 
-#: cotisations/views.py:836
+#: cotisations/views.py:820
 #, python-format
 msgid ""
 "The bank %(bank_name)s can't be deleted because there are invoices using it."
@@ -1049,22 +1088,22 @@ msgstr ""
 "La banque %(bank_name)s ne peut pas être supprimée car il y a des factures "
 "qui l'utilisent."
 
-#: cotisations/views.py:845
+#: cotisations/views.py:830
 msgid "Delete bank"
 msgstr "Supprimer la banque"
 
-#: cotisations/views.py:881
+#: cotisations/views.py:864
 msgid "Your changes have been properly taken into account."
 msgstr "Vos modifications ont correctement été prises en compte."
 
-#: cotisations/views.py:1017
+#: cotisations/views.py:996
 msgid "You are not allowed to credit your balance."
-msgstr "Vous n'êtes pas autorisés à créditer votre solde."
+msgstr "Vous n'êtes pas autorisé à créditer votre solde."
 
-#: cotisations/views.py:1050
+#: cotisations/views.py:1027
 msgid "Refill your balance"
 msgstr "Recharger votre solde"
 
-#: cotisations/views.py:1068
+#: cotisations/views.py:1046
 msgid "Could not find a voucher for that invoice."
-msgstr ""
+msgstr "Impossible de trouver un reçu pour cette facture."
diff --git a/cotisations/migrations/0042_auto_20191120_0159.py b/cotisations/migrations/0042_auto_20191120_0159.py
new file mode 100644
index 00000000..b9e5b356
--- /dev/null
+++ b/cotisations/migrations/0042_auto_20191120_0159.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-11-20 00:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cotisations', '0041_auto_20191103_2131'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='chequepayment',
+            options={'verbose_name': 'cheque'},
+        ),
+        migrations.AlterField(
+            model_name='balancepayment',
+            name='credit_balance_allowed',
+            field=models.BooleanField(default=False, verbose_name='allow user to credit their balance'),
+        ),
+        migrations.AlterField(
+            model_name='balancepayment',
+            name='maximum_balance',
+            field=models.DecimalField(blank=True, decimal_places=2, default=50, help_text='The maximal amount of money allowed for the balance.', max_digits=5, null=True, verbose_name='maximum balance'),
+        ),
+        migrations.AlterField(
+            model_name='balancepayment',
+            name='minimum_balance',
+            field=models.DecimalField(decimal_places=2, default=0, help_text='The minimal amount of money allowed for the balance at the end of a payment. You can specify a negative amount.', max_digits=5, verbose_name='minimum balance'),
+        ),
+        migrations.AlterField(
+            model_name='baseinvoice',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='date'),
+        ),
+        migrations.AlterField(
+            model_name='comnpaypayment',
+            name='minimum_payment',
+            field=models.DecimalField(decimal_places=2, default=1, help_text='The minimal amount of money you have to use when paying with ComNpay.', max_digits=5, verbose_name='minimum payment'),
+        ),
+        migrations.AlterField(
+            model_name='comnpaypayment',
+            name='production',
+            field=models.BooleanField(default=True, verbose_name='production mode enabled (production URL, instead of homologation)'),
+        ),
+        migrations.AlterField(
+            model_name='costestimate',
+            name='validity',
+            field=models.DurationField(help_text='DD HH:MM:SS', verbose_name='period of validity'),
+        ),
+        migrations.AlterField(
+            model_name='custominvoice',
+            name='address',
+            field=models.CharField(max_length=255, verbose_name='address'),
+        ),
+        migrations.AlterField(
+            model_name='custominvoice',
+            name='paid',
+            field=models.BooleanField(default=False, verbose_name='paid'),
+        ),
+        migrations.AlterField(
+            model_name='custominvoice',
+            name='payment',
+            field=models.CharField(max_length=255, verbose_name='payment type'),
+        ),
+        migrations.AlterField(
+            model_name='custominvoice',
+            name='recipient',
+            field=models.CharField(max_length=255, verbose_name='recipient'),
+        ),
+        migrations.AlterField(
+            model_name='custominvoice',
+            name='remark',
+            field=models.TextField(blank=True, null=True, verbose_name='remark'),
+        ),
+    ]
diff --git a/cotisations/models.py b/cotisations/models.py
index 5cab9212..c2d23171 100644
--- a/cotisations/models.py
+++ b/cotisations/models.py
@@ -56,7 +56,7 @@ from cotisations.validators import check_no_balance
 
 
 class BaseInvoice(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
-    date = models.DateTimeField(auto_now_add=True, verbose_name=_("Date"))
+    date = models.DateTimeField(auto_now_add=True, verbose_name=_("date"))
 
     # TODO : change prix to price
     def prix(self):
@@ -138,7 +138,7 @@ class Facture(BaseInvoice):
         abstract = False
         permissions = (
             # TODO : change facture to invoice
-            ("change_facture_control", _('Can edit the "controlled" state')),
+            ("change_facture_control", _("Can edit the \"controlled\" state")),
             ("view_facture", _("Can view an invoice object")),
             ("change_all_facture", _("Can edit all the previous invoices")),
         )
@@ -174,8 +174,8 @@ class Facture(BaseInvoice):
             return (
                 False,
                 _(
-                    "You don't have the right to edit an invoice "
-                    "already controlled or invalidated."
+                    "You don't have the right to edit an invoice"
+                    " already controlled or invalidated."
                 ),
                 ("cotisations.change_all_facture",),
             )
@@ -206,8 +206,8 @@ class Facture(BaseInvoice):
             return (
                 False,
                 _(
-                    "You don't have the right to delete an invoice "
-                    "already controlled or invalidated."
+                    "You don't have the right to delete an invoice"
+                    " already controlled or invalidated."
                 ),
                 ("cotisations.change_all_facture",),
             )
@@ -220,8 +220,8 @@ class Facture(BaseInvoice):
                 return (
                     False,
                     _(
-                        "You don't have the right to view someone else's "
-                        "invoices history."
+                        "You don't have the right to view someone else's"
+                        " invoices history."
                     ),
                     ("cotisations.view_facture",),
                 )
@@ -243,7 +243,7 @@ class Facture(BaseInvoice):
         can = user_request.has_perm("cotisations.change_facture_control")
         return (
             can,
-            _('You don\'t have the right to edit the "controlled" state.')
+            _("You don't have the right to edit the \"controlled\" state.")
             if not can
             else None,
             ("cotisations.change_facture_control",),
@@ -262,13 +262,13 @@ class Facture(BaseInvoice):
         if len(Paiement.find_allowed_payments(user_request)) <= 0:
             return (
                 False,
-                _("There are no payment method which you can use."),
+                _("There are no payment methods that you can use."),
                 ("cotisations.add_facture",),
             )
         if len(Article.find_allowed_articles(user_request, user_request)) <= 0:
             return (
                 False,
-                _("There are no article that you can buy."),
+                _("There are no articles that you can buy."),
                 ("cotisations.add_facture",),
             )
         return True, None, None
@@ -346,11 +346,11 @@ class CustomInvoice(BaseInvoice):
     class Meta:
         permissions = (("view_custominvoice", _("Can view a custom invoice object")),)
 
-    recipient = models.CharField(max_length=255, verbose_name=_("Recipient"))
-    payment = models.CharField(max_length=255, verbose_name=_("Payment type"))
-    address = models.CharField(max_length=255, verbose_name=_("Address"))
-    paid = models.BooleanField(verbose_name=_("Paid"), default=False)
-    remark = models.TextField(verbose_name=_("Remark"), blank=True, null=True)
+    recipient = models.CharField(max_length=255, verbose_name=_("recipient"))
+    payment = models.CharField(max_length=255, verbose_name=_("payment type"))
+    address = models.CharField(max_length=255, verbose_name=_("address"))
+    paid = models.BooleanField(verbose_name=_("paid"), default=False)
+    remark = models.TextField(verbose_name=_("remark"), blank=True, null=True)
 
 
 class CostEstimate(CustomInvoice):
@@ -358,7 +358,7 @@ class CostEstimate(CustomInvoice):
         permissions = (("view_costestimate", _("Can view a cost estimate object")),)
 
     validity = models.DurationField(
-        verbose_name=_("Period of validity"), help_text="DD HH:MM:SS"
+        verbose_name=_("period of validity"), help_text="DD HH:MM:SS"
     )
     final_invoice = models.ForeignKey(
         CustomInvoice,
@@ -547,7 +547,7 @@ class Vente(RevMixin, AclMixin, models.Model):
         if not user_request.has_perm("cotisations.change_vente"):
             return (
                 False,
-                _("You don't have the right to edit the purchases."),
+                _("You don't have the right to edit a purchase."),
                 ("cotisations.change_vente",),
             )
         elif not (user_request.has_perm("cotisations.change_all_facture") or user_can):
@@ -562,8 +562,8 @@ class Vente(RevMixin, AclMixin, models.Model):
             return (
                 False,
                 _(
-                    "You don't have the right to edit a purchase "
-                    "already controlled or invalidated."
+                    "You don't have the right to edit a purchase"
+                    " already controlled or invalidated."
                 ),
                 ("cotisations.change_all_vente",),
             )
@@ -590,8 +590,8 @@ class Vente(RevMixin, AclMixin, models.Model):
             return (
                 False,
                 _(
-                    "You don't have the right to delete a purchase "
-                    "already controlled or invalidated."
+                    "You don't have the right to delete a purchase"
+                    " already controlled or invalidated."
                 ),
                 None,
             )
@@ -606,8 +606,8 @@ class Vente(RevMixin, AclMixin, models.Model):
             return (
                 False,
                 _(
-                    "You don't have the right to view someone "
-                    "else's purchase history."
+                    "You don't have the right to view someone"
+                    " else's purchase history."
                 ),
                 ("cotisations.view_vente",),
             )
@@ -731,7 +731,7 @@ class Article(RevMixin, AclMixin, models.Model):
 
     def clean(self):
         if self.name.lower() == "solde":
-            raise ValidationError(_("Balance is a reserved article name."))
+            raise ValidationError(_("Solde is a reserved article name."))
         if self.type_cotisation and not (self.duration or self.duration_days):
             raise ValidationError(_("Duration must be specified for a subscription."))
 
@@ -921,7 +921,7 @@ class Paiement(RevMixin, AclMixin, models.Model):
         p = find_payment_method(self)
         if p is not None:
             return p._meta.verbose_name
-        return _("No custom payment method.")
+        return _("No custom payment methods.")
 
 
 class Cotisation(RevMixin, AclMixin, models.Model):
@@ -976,8 +976,8 @@ class Cotisation(RevMixin, AclMixin, models.Model):
             return (
                 False,
                 _(
-                    "You don't have the right to edit a subscription "
-                    "already controlled or invalidated."
+                    "You don't have the right to edit a subscription"
+                    " already controlled or invalidated."
                 ),
                 ("cotisations.change_all_cotisation",),
             )
@@ -995,8 +995,8 @@ class Cotisation(RevMixin, AclMixin, models.Model):
             return (
                 False,
                 _(
-                    "You don't have the right to delete a subscription "
-                    "already controlled or invalidated."
+                    "You don't have the right to delete a subscription"
+                    " already controlled or invalidated."
                 ),
                 None,
             )
@@ -1011,8 +1011,8 @@ class Cotisation(RevMixin, AclMixin, models.Model):
             return (
                 False,
                 _(
-                    "You don't have the right to view someone else's "
-                    "subscription history."
+                    "You don't have the right to view someone else's"
+                    " subscription history."
                 ),
                 ("cotisations.view_cotisation",),
             )
diff --git a/cotisations/payment_methods/balance/models.py b/cotisations/payment_methods/balance/models.py
index a252affb..afa43c48 100644
--- a/cotisations/payment_methods/balance/models.py
+++ b/cotisations/payment_methods/balance/models.py
@@ -44,18 +44,17 @@ class BalancePayment(PaymentMethodMixin, models.Model):
         editable=False,
     )
     minimum_balance = models.DecimalField(
-        verbose_name=_("Minimum balance"),
+        verbose_name=_("minimum balance"),
         help_text=_(
-            "The minimal amount of money allowed for the balance"
-            " at the end of a payment. You can specify negative "
-            "amount."
+            "The minimal amount of money allowed for the balance at the end"
+            " of a payment. You can specify a negative amount."
         ),
         max_digits=5,
         decimal_places=2,
         default=0,
     )
     maximum_balance = models.DecimalField(
-        verbose_name=_("Maximum balance"),
+        verbose_name=_("maximum balance"),
         help_text=_("The maximal amount of money allowed for the balance."),
         max_digits=5,
         decimal_places=2,
@@ -64,7 +63,7 @@ class BalancePayment(PaymentMethodMixin, models.Model):
         null=True,
     )
     credit_balance_allowed = models.BooleanField(
-        verbose_name=_("Allow user to credit their balance"), default=False
+        verbose_name=_("allow user to credit their balance"), default=False
     )
 
     def end_payment(self, invoice, request):
diff --git a/cotisations/payment_methods/cheque/models.py b/cotisations/payment_methods/cheque/models.py
index 53acef6a..62479f22 100644
--- a/cotisations/payment_methods/cheque/models.py
+++ b/cotisations/payment_methods/cheque/models.py
@@ -33,7 +33,7 @@ class ChequePayment(PaymentMethodMixin, models.Model):
     """
 
     class Meta:
-        verbose_name = _("Cheque")
+        verbose_name = _("cheque")
 
     payment = models.OneToOneField(
         Paiement,
diff --git a/cotisations/payment_methods/comnpay/models.py b/cotisations/payment_methods/comnpay/models.py
index ff35650c..2c46f685 100644
--- a/cotisations/payment_methods/comnpay/models.py
+++ b/cotisations/payment_methods/comnpay/models.py
@@ -51,9 +51,10 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
         max_length=255, null=True, blank=True, verbose_name=_("ComNpay secret key")
     )
     minimum_payment = models.DecimalField(
-        verbose_name=_("Minimum payment"),
+        verbose_name=_("minimum payment"),
         help_text=_(
-            "The minimal amount of money you have to use when paying" " with ComNpay"
+            "The minimal amount of money you have to use when paying with"
+            " ComNpay."
         ),
         max_digits=5,
         decimal_places=2,
@@ -62,7 +63,7 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
     production = models.BooleanField(
         default=True,
         verbose_name=_(
-            "Production mode enabled (production URL, instead of homologation)"
+            "production mode enabled (production URL, instead of homologation)"
         ),
     )
 
diff --git a/cotisations/payment_methods/forms.py b/cotisations/payment_methods/forms.py
index fdcd50b8..a6bac3ed 100644
--- a/cotisations/payment_methods/forms.py
+++ b/cotisations/payment_methods/forms.py
@@ -58,9 +58,9 @@ class PaymentMethodForm(forms.Form):
     payment_method = forms.ChoiceField(
         label=_("Special payment method"),
         help_text=_(
-            "Warning: you will not be able to change the payment "
-            "method later. But you will be allowed to edit the other "
-            "options."
+            "Warning: you will not be able to change the payment"
+            " method later. But you will be allowed to edit the other"
+            " options."
         ),
         required=False,
     )
@@ -71,7 +71,7 @@ class PaymentMethodForm(forms.Form):
         self.fields["payment_method"].choices = [
             (i, p.NAME) for (i, p) in enumerate(PAYMENT_METHODS)
         ]
-        self.fields["payment_method"].choices.insert(0, ("", _("no")))
+        self.fields["payment_method"].choices.insert(0, ("", _("No")))
         self.fields["payment_method"].widget.attrs = {"id": "paymentMethodSelect"}
         self.templates = [
             forms.modelform_factory(p.PaymentMethod, fields="__all__")(prefix=prefix)
diff --git a/cotisations/payment_methods/free/models.py b/cotisations/payment_methods/free/models.py
index b64744fe..39a3aa80 100644
--- a/cotisations/payment_methods/free/models.py
+++ b/cotisations/payment_methods/free/models.py
@@ -51,4 +51,4 @@ class FreePayment(PaymentMethodMixin, models.Model):
         """Checks that the price meets the requirement to be paid with user
         balance.
         """
-        return (price == 0, _("You cannot validate this invoice for free."))
+        return (price == 0, _("You can't pay this invoice for free."))
diff --git a/cotisations/payment_methods/note_kfet/forms.py b/cotisations/payment_methods/note_kfet/forms.py
index 098315b7..7d82b93f 100644
--- a/cotisations/payment_methods/note_kfet/forms.py
+++ b/cotisations/payment_methods/note_kfet/forms.py
@@ -30,5 +30,5 @@ class NoteCredentialForm(forms.Form):
     object.
     """
 
-    login = forms.CharField(label=_("pseudo note"))
+    login = forms.CharField(label=_("Username"))
     password = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html
index edd485f1..6043da67 100644
--- a/cotisations/templates/cotisations/aff_paiement.html
+++ b/cotisations/templates/cotisations/aff_paiement.html
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <thead>
         <tr>
             <th>{% trans "Payment type" %}</th>
-            <th>{% trans "Is available for everyone" %}</th>
+            <th>{% trans "Available for everyone" %}</th>
             <th>{% trans "Custom payment method" %}</th>
             <th></th>
         </tr>
diff --git a/cotisations/templates/cotisations/control.html b/cotisations/templates/cotisations/control.html
index b199ba2d..497de6f4 100644
--- a/cotisations/templates/cotisations/control.html
+++ b/cotisations/templates/cotisations/control.html
@@ -45,12 +45,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <tr>
                 <th>{% trans "Profile" %}</th>
                 <th>
-                    {% trans "Last name" as tr_last_name %}
-                    {% include 'buttons/sort.html' with prefix='control' col='name' text=tr_last_name %}
+                    {% trans "First name" as tr_first_name %}
+                    {% include 'buttons/sort.html' with prefix='control' col='name' text=tr_first_name %}
                 </th>
                 <th>
-                    {% trans "First name" as tr_first_name %}
-                    {% include 'buttons/sort.html' with prefix='control' col='surname' text=tr_first_name %}
+                    {% trans "Surname" as tr_surname %}
+                    {% include 'buttons/sort.html' with prefix='control' col='surname' text=tr_surname %}
                 </th>
                 <th>
                     {% trans "Invoice ID" as tr_invoice_id %}
@@ -104,8 +104,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </tr>
         {% endfor %}
     </table>
-    {% trans "Edit" as tr_edit %}
-    {% bootstrap_button tr_edit button_type='submit' icon='ok' button_class='btn-success' %}
+    {% trans "Confirm" as tr_confirm %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}
diff --git a/cotisations/templates/cotisations/delete.html b/cotisations/templates/cotisations/delete.html
index 483dd218..e6f1b362 100644
--- a/cotisations/templates/cotisations/delete.html
+++ b/cotisations/templates/cotisations/delete.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     <h4>
-        {% blocktrans %}Warning: are you sure you really want to delete this {{ object_name }} object ( {{ objet }} )?{% endblocktrans %}
+        {% blocktrans %}Warning: are you sure you really want to delete this {{ objet_name }} object ( {{ objet }} )?{% endblocktrans %}
     </h4>
     {% trans "Confirm" as tr_confirm %}
     {% bootstrap_button tr_confirm button_type='submit' icon='trash' button_class='btn-danger' %}
diff --git a/cotisations/templates/cotisations/email_invoice b/cotisations/templates/cotisations/email_invoice
index 8d6b2cc2..01f80225 100644
--- a/cotisations/templates/cotisations/email_invoice
+++ b/cotisations/templates/cotisations/email_invoice
@@ -6,17 +6,17 @@ Nous vous remercions pour votre achat auprès de {{asso_name}} et nous vous en j
 
 En cas de question, n’hésitez pas à nous contacter par mail à {{contact_mail}}.
 
-Cordialement,
-L’équipe de {{asso_name}}
+Respectueusement,
+L’équipe de {{asso_name}}.
 
 
 === English version ===
 
-Dear {{name}},
+Hello {{name}},
 
-Thank you for your purchase. Here is your invoice.
+Thank you for your purchase at {{asso_name}}. Here is your invoice.
 
-Should you need extra information, you can email us at {{contact_mail}}.
+Should you need extra information, do not hesitate to email us at {{contact_mail}}.
 
-Best regards,
-	{{ asso_name }}'s team
+Regards,
+The {{ asso_name }} team.
diff --git a/cotisations/templates/cotisations/email_subscription_accepted b/cotisations/templates/cotisations/email_subscription_accepted
index bd1c7628..cb0eb760 100644
--- a/cotisations/templates/cotisations/email_subscription_accepted
+++ b/cotisations/templates/cotisations/email_subscription_accepted
@@ -6,17 +6,18 @@ Vous trouverez en pièce jointe un reçu.
 
 Pour nous faire part de toute remarque, suggestion ou problème vous pouvez nous envoyer un mail à {{asso_email}}.
 
-À bientôt,
+Respectueusement,
 L'équipe de {{asso_name}}.
 
 ---
 
+Hello {{name}}!
+
 Your subscription to {{asso_name}} has just been accepted. You are now a full member of {{asso_name}} until {{ date_end|date:"d/m/Y" }}.
 
 You will find with this email a subscription voucher.
 
-For any information, suggestion or problem, you can contact us via email at
-{{asso_email}}.
+To express any comment, suggestion or problem, you can send us an email to {{asso_email}}.
 
 Regards,
 The {{asso_name}} team.
diff --git a/cotisations/templates/cotisations/index_article.html b/cotisations/templates/cotisations/index_article.html
index 8adc7639..1a4c3c8d 100644
--- a/cotisations/templates/cotisations/index_article.html
+++ b/cotisations/templates/cotisations/index_article.html
@@ -30,14 +30,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Articles" %}{% endblock %}
 
 {% block content %}
-    <h2>{% trans "List of article types" %}</h2>
+    <h2>{% trans "List of articles" %}</h2>
     {% can_create Article %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-article' %}">
-        <i class="fa fa-cart-plus"></i> {% trans "Add an article type" %}
+        <i class="fa fa-plus"></i> {% trans "Add an article" %}
     </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'cotisations:del-article' %}">
-        <i class="fa fa-trash"></i> {% trans "Delete one or several article types" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several articles" %}
     </a>
     {% include 'cotisations/aff_article.html' with  article_list=article_list %}
 {% endblock %}
diff --git a/cotisations/templates/cotisations/index_banque.html b/cotisations/templates/cotisations/index_banque.html
index a497198f..c653acfd 100644
--- a/cotisations/templates/cotisations/index_banque.html
+++ b/cotisations/templates/cotisations/index_banque.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of banks" %}</h2>
     {% can_create Banque %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-banque' %}">
-        <i class="fa fa-cart-plus"></i> {% trans "Add a bank" %}
+        <i class="fa fa-plus"></i> {% trans "Add a bank" %}
     </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'cotisations:del-banque' %}">
diff --git a/cotisations/templates/cotisations/index_paiement.html b/cotisations/templates/cotisations/index_paiement.html
index b76dec65..1411add0 100644
--- a/cotisations/templates/cotisations/index_paiement.html
+++ b/cotisations/templates/cotisations/index_paiement.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of payment methods" %}</h2>
     {% can_create Paiement %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-paiement' %}">
-        <i class="fa fa-cart-plus"></i> {% trans "Add a payment method" %}
+        <i class="fa fa-plus"></i> {% trans "Add a payment method" %}
     </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'cotisations:del-paiement' %}">
diff --git a/cotisations/templates/cotisations/sidebar.html b/cotisations/templates/cotisations/sidebar.html
index 96a674f9..8e69a8c9 100644
--- a/cotisations/templates/cotisations/sidebar.html
+++ b/cotisations/templates/cotisations/sidebar.html
@@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% acl_end %}
     {% can_view_all Article %}
     <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index-article' %}">
-        <i class="fa fa-list-ul"></i> {% trans "Available articles" %}
+        <i class="fa fa-list-ul"></i> {% trans "Articles" %}
     </a>
     {% acl_end %}
     {% can_view_all Banque %}
diff --git a/cotisations/tex.py b/cotisations/tex.py
index 6872ac6a..2930fffe 100644
--- a/cotisations/tex.py
+++ b/cotisations/tex.py
@@ -36,7 +36,6 @@ from django.template.loader import get_template
 from django.http import HttpResponse
 from django.conf import settings
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
 
 from re2o.mixins import AclMixin, RevMixin
 from preferences.models import CotisationsOption
diff --git a/cotisations/views.py b/cotisations/views.py
index 4510aff9..562326e3 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -166,6 +166,7 @@ def new_facture(request, user, userid):
             "articlelist": article_list,
             "balance": balance,
             "action_name": _("Confirm"),
+            "title": _("New invoice"),
         },
         "cotisations/facture.html",
         request,
@@ -222,7 +223,7 @@ def new_cost_estimate(request):
             "articlesformset": articles_formset,
             "articlelist": articles,
             "discount_form": discount_form,
-            "title": _("Cost estimate"),
+            "title": _("New cost estimate"),
         },
         "cotisations/facture.html",
         request,
@@ -278,6 +279,7 @@ def new_custom_invoice(request):
             "articlesformset": articles_formset,
             "articlelist": articles,
             "discount_form": discount_form,
+            "title": _("New custom invoice"),
         },
         "cotisations/facture.html",
         request,
@@ -373,7 +375,7 @@ def del_facture(request, facture, **_kwargs):
         messages.success(request, _("The invoice was deleted."))
         return redirect(reverse("cotisations:index"))
     return form(
-        {"objet": facture, "objet_name": _("Invoice")},
+        {"objet": facture, "objet_name": _("invoice")},
         "cotisations/delete.html",
         request,
     )
@@ -437,7 +439,11 @@ def edit_custom_invoice(request, invoice, **kwargs):
         return redirect(reverse("cotisations:index-custom-invoice"))
 
     return form(
-        {"factureform": invoice_form, "venteform": purchase_form},
+        {
+            "factureform": invoice_form,
+            "venteform": purchase_form,
+            "title": _("Edit custom invoice"),
+        },
         "cotisations/edit_facture.html",
         request,
     )
@@ -501,7 +507,7 @@ def del_cost_estimate(request, estimate, **_kwargs):
         messages.success(request, _("The cost estimate was deleted."))
         return redirect(reverse("cotisations:index-cost-estimate"))
     return form(
-        {"objet": estimate, "objet_name": _("Cost estimate")},
+        {"objet": estimate, "objet_name": _("cost estimate")},
         "cotisations/delete.html",
         request,
     )
@@ -564,7 +570,7 @@ def del_custom_invoice(request, invoice, **_kwargs):
         messages.success(request, _("The invoice was deleted."))
         return redirect(reverse("cotisations:index-custom-invoice"))
     return form(
-        {"objet": invoice, "objet_name": _("Invoice")},
+        {"objet": invoice, "objet_name": _("invoice")},
         "cotisations/delete.html",
         request,
     )
@@ -588,7 +594,11 @@ def add_article(request):
         messages.success(request, _("The article was created."))
         return redirect(reverse("cotisations:index-article"))
     return form(
-        {"factureform": article, "action_name": _("Add"), "title": _("New article")},
+        {
+            "factureform": article,
+            "action_name": _("Add"),
+            "title": _("New article"),
+        },
         "cotisations/facture.html",
         request,
     )
@@ -607,7 +617,11 @@ def edit_article(request, article_instance, **_kwargs):
             messages.success(request, _("The article was edited."))
         return redirect(reverse("cotisations:index-article"))
     return form(
-        {"factureform": article, "action_name": _("Edit"), "title": _("Edit article")},
+        {
+            "factureform": article,
+            "action_name": _("Edit"),
+            "title": _("Edit article"),
+        },
         "cotisations/facture.html",
         request,
     )
@@ -718,8 +732,8 @@ def del_paiement(request, instances):
                 messages.error(
                     request,
                     _(
-                        "The payment method %(method_name)s can't be deleted \
-                    because there are invoices using it."
+                        "The payment method %(method_name)s can't be deleted"
+                        " because there are invoices using it."
                     )
                     % {"method_name": payment_del},
                 )
@@ -748,7 +762,11 @@ def add_banque(request):
         messages.success(request, _("The bank was created."))
         return redirect(reverse("cotisations:index-banque"))
     return form(
-        {"factureform": bank, "action_name": _("Add"), "title": _("New bank")},
+        {
+            "factureform": bank,
+            "action_name": _("Add"),
+            "title": _("New bank"),
+        },
         "cotisations/facture.html",
         request,
     )
@@ -768,7 +786,11 @@ def edit_banque(request, banque_instance, **_kwargs):
             messages.success(request, _("The bank was edited."))
         return redirect(reverse("cotisations:index-banque"))
     return form(
-        {"factureform": bank, "action_name": _("Edit"), "title": _("Edit bank")},
+        {
+            "factureform": bank,
+            "action_name": _("Edit"),
+            "title": _("Edit bank"),
+        },
         "cotisations/facture.html",
         request,
     )
@@ -802,7 +824,11 @@ def del_banque(request, instances):
                 )
         return redirect(reverse("cotisations:index-banque"))
     return form(
-        {"factureform": bank, "action_name": _("Delete"), "title": _("Delete bank")},
+        {
+            "factureform": bank,
+            "action_name": _("Delete"),
+            "title": _("Delete bank"),
+        },
         "cotisations/facture.html",
         request,
     )
@@ -833,7 +859,7 @@ def control(request):
     )
     if control_invoices_form.is_valid():
         control_invoices_form.save()
-        reversion.set_comment("Controle")
+        reversion.set_comment("Control")
         messages.success(
             request, _("Your changes have been properly taken into account.")
         )
diff --git a/logs/acl.py b/logs/acl.py
index f6be8183..42000ea8 100644
--- a/logs/acl.py
+++ b/logs/acl.py
@@ -41,6 +41,7 @@ def can_view(user):
     can = user.has_module_perms("admin")
     return (
         can,
-        None if can else _("You don't have the right to view this" " application."),
+        None if can else _("You don't have the right to view this"
+                           " application."),
         "admin",
     )
diff --git a/logs/locale/fr/LC_MESSAGES/django.po b/logs/locale/fr/LC_MESSAGES/django.po
index 8691c5b7..f04f6bef 100644
--- a/logs/locale/fr/LC_MESSAGES/django.po
+++ b/logs/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-19 23:43+0100\n"
 "PO-Revision-Date: 2018-06-23 16:01+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,7 +30,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: logs/acl.py:42
+#: logs/acl.py:44
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
@@ -121,8 +121,8 @@ msgid "%(username)s has sold %(number)sx %(name)s"
 msgstr "%(username)s a vendu %(number)sx %(name)s"
 
 #: logs/templates/logs/aff_summary.html:116
-msgid " to"
-msgstr " à"
+msgid "to"
+msgstr "à"
 
 #: logs/templates/logs/aff_summary.html:119
 #, python-format
@@ -159,7 +159,7 @@ msgid "Statistics"
 msgstr "Statistiques"
 
 #: logs/templates/logs/index.html:32 logs/templates/logs/stats_logs.html:32
-#: logs/views.py:422
+#: logs/views.py:400
 msgid "Actions performed"
 msgstr "Actions effectuées"
 
@@ -183,7 +183,7 @@ msgstr "Base de données"
 msgid "Wiring actions"
 msgstr "Actions de câblage"
 
-#: logs/templates/logs/sidebar.html:53 logs/views.py:344
+#: logs/templates/logs/sidebar.html:53
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -199,161 +199,126 @@ msgstr "Statistiques sur la base de données"
 msgid "Statistics about users"
 msgstr "Statistiques sur les utilisateurs"
 
-#: logs/views.py:194
+#: logs/views.py:175
 msgid "Nonexistent revision."
 msgstr "Révision inexistante."
 
-#: logs/views.py:197
+#: logs/views.py:178
 msgid "The action was deleted."
 msgstr "L'action a été supprimée."
 
-#: logs/views.py:230
+#: logs/views.py:219
 msgid "Category"
 msgstr "Catégorie"
 
-#: logs/views.py:231
+#: logs/views.py:220
 msgid "Number of users (members and clubs)"
 msgstr "Nombre d'utilisateurs (adhérents et clubs)"
 
-#: logs/views.py:232
+#: logs/views.py:221
 msgid "Number of members"
 msgstr "Nombre d'adhérents"
 
-#: logs/views.py:233
+#: logs/views.py:222
 msgid "Number of clubs"
 msgstr "Nombre de clubs"
 
-#: logs/views.py:237
+#: logs/views.py:226
 msgid "Activated users"
 msgstr "Utilisateurs activés"
 
-#: logs/views.py:245
+#: logs/views.py:232
 msgid "Disabled users"
 msgstr "Utilisateurs désactivés"
 
-#: logs/views.py:253
+#: logs/views.py:238
 msgid "Archived users"
 msgstr "Utilisateurs archivés"
 
-#: logs/views.py:261
-#, fuzzy
-#| msgid "Archived users"
-msgid "Full Archived users"
-msgstr "Utilisateurs archivés"
+#: logs/views.py:244
+msgid "Fully archived users"
+msgstr "Utilisateurs complètement archivés"
 
-#: logs/views.py:269
+#: logs/views.py:254
 msgid "Not yet active users"
 msgstr "Utilisateurs pas encore actifs"
 
-#: logs/views.py:277
+#: logs/views.py:264
 msgid "Contributing members"
 msgstr "Adhérents cotisants"
 
-#: logs/views.py:283
+#: logs/views.py:270
 msgid "Users benefiting from a connection"
 msgstr "Utilisateurs bénéficiant d'une connexion"
 
-#: logs/views.py:289
+#: logs/views.py:276
 msgid "Banned users"
 msgstr "Utilisateurs bannis"
 
-#: logs/views.py:295
+#: logs/views.py:282
 msgid "Users benefiting from a free connection"
 msgstr "Utilisateurs bénéficiant d'une connexion gratuite"
 
-#: logs/views.py:301
+#: logs/views.py:288
 msgid "Active interfaces (with access to the network)"
 msgstr "Interfaces actives (ayant accès au réseau)"
 
-#: logs/views.py:311
+#: logs/views.py:302
 msgid "Active interfaces assigned IPv4"
 msgstr "Interfaces actives assignées IPv4"
 
-#: logs/views.py:324
+#: logs/views.py:319
 msgid "IP range"
 msgstr "Plage d'IP"
 
-#: logs/views.py:325
+#: logs/views.py:320
 msgid "VLAN"
 msgstr "VLAN"
 
-#: logs/views.py:326
+#: logs/views.py:321
 msgid "Total number of IP addresses"
 msgstr "Nombre total d'adresses IP"
 
-#: logs/views.py:327
+#: logs/views.py:322
 msgid "Number of assigned IP addresses"
-msgstr "Nombre d'adresses IP non assignées"
+msgstr "Nombre d'adresses IP assignées"
 
-#: logs/views.py:328
+#: logs/views.py:323
 msgid "Number of IP address assigned to an activated machine"
 msgstr "Nombre d'adresses IP assignées à une machine activée"
 
-#: logs/views.py:329
-msgid "Number of nonassigned IP addresses"
+#: logs/views.py:324
+msgid "Number of unassigned IP addresses"
 msgstr "Nombre d'adresses IP non assignées"
 
-#: logs/views.py:356
-msgid "Subscriptions"
-msgstr "Cotisations"
+#: logs/views.py:339
+msgid "Users (members and clubs)"
+msgstr "Utilisateurs (adhérents et clubs)"
 
-#: logs/views.py:378 logs/views.py:439
-msgid "Machines"
-msgstr "Machines"
-
-#: logs/views.py:405
+#: logs/views.py:385
 msgid "Topology"
 msgstr "Topologie"
 
-#: logs/views.py:424
+#: logs/views.py:401
 msgid "Number of actions"
 msgstr "Nombre d'actions"
 
-#: logs/views.py:438 logs/views.py:456 logs/views.py:461 logs/views.py:466
-#: logs/views.py:481
-msgid "User"
-msgstr "Utilisateur"
-
-#: logs/views.py:442
-msgid "Invoice"
-msgstr "Facture"
-
-#: logs/views.py:445
-msgid "Ban"
-msgstr "Bannissement"
-
-#: logs/views.py:448
-msgid "Whitelist"
-msgstr "Accès gracieux"
-
-#: logs/views.py:451
-msgid "Rights"
-msgstr "Droits"
+#: logs/views.py:426
+msgid "rights"
+msgstr "droits"
 
 #: logs/views.py:455
-msgid "School"
-msgstr "Établissement"
+msgid "actions"
+msgstr "actions"
 
-#: logs/views.py:460
-msgid "Payment method"
-msgstr "Moyen de paiement"
-
-#: logs/views.py:465
-msgid "Bank"
-msgstr "Banque"
-
-#: logs/views.py:482
-msgid "Action"
-msgstr "Action"
-
-#: logs/views.py:513
+#: logs/views.py:486
 msgid "No model found."
 msgstr "Aucun modèle trouvé."
 
-#: logs/views.py:519
+#: logs/views.py:492
 msgid "Nonexistent entry."
 msgstr "Entrée inexistante."
 
-#: logs/views.py:526
+#: logs/views.py:499
 msgid "You don't have the right to access this menu."
 msgstr "Vous n'avez pas le droit d'accéder à ce menu."
diff --git a/logs/templates/logs/aff_summary.html b/logs/templates/logs/aff_summary.html
index 7205bc6a..31834a2d 100644
--- a/logs/templates/logs/aff_summary.html
+++ b/logs/templates/logs/aff_summary.html
@@ -113,7 +113,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% blocktrans with username=v.username number=v.version.object.number name=v.version.object.name %}{{ username }} has sold {{ number }}x {{ name }}{% endblocktrans %}
                 {% with invoice=v.version.object.facture %}
                 {% if invoice|is_facture %}
-                {% trans " to" %}
+                {% trans "to" %}
                 <a href="{% url 'users:profil' v.version.object.facture.facture.user_id %}">{{ v.version.object.facture.facture.user.get_username }}</a>
                 {% if v.version.object.iscotisation %}
                     (<i>{% blocktrans with duration=v.version.object.duration %}+{{ duration }} months{% endblocktrans %}</i>)
diff --git a/logs/views.py b/logs/views.py
index be71f7cc..7c509134 100644
--- a/logs/views.py
+++ b/logs/views.py
@@ -241,7 +241,7 @@ def stats_general(request):
                     Club.objects.filter(state=Club.STATE_ARCHIVE).count(),
                 ],
                 "full_archive_users": [
-                    _("Full Archived users"),
+                    _("Fully archived users"),
                     User.objects.filter(state=User.STATE_FULL_ARCHIVE).count(),
                     (
                         Adherent.objects.filter(
@@ -321,7 +321,7 @@ def stats_general(request):
                 _("Total number of IP addresses"),
                 _("Number of assigned IP addresses"),
                 _("Number of IP address assigned to an activated machine"),
-                _("Number of nonassigned IP addresses"),
+                _("Number of unassigned IP addresses"),
             ],
             ip_dict,  # Data already prepared
         ],
@@ -336,7 +336,7 @@ def stats_models(request):
     nombre d'users, d'écoles, de droits, de bannissements,
     de factures, de ventes, de banque, de machines, etc"""
     stats = {
-        _("Users"): {
+        _("Users (members and clubs)"): {
             "users": [User._meta.verbose_name, User.objects.count()],
             "adherents": [Adherent._meta.verbose_name, Adherent.objects.count()],
             "clubs": [Club._meta.verbose_name, Club.objects.count()],
@@ -350,14 +350,14 @@ def stats_models(request):
             "ban": [Ban._meta.verbose_name, Ban.objects.count()],
             "whitelist": [Whitelist._meta.verbose_name, Whitelist.objects.count()],
         },
-        _("Subscriptions"): {
+        Cotisation._meta.verbose_name_plural.title(): {
             "factures": [Facture._meta.verbose_name, Facture.objects.count()],
             "vente": [Vente._meta.verbose_name, Vente.objects.count()],
             "cotisation": [Cotisation._meta.verbose_name, Cotisation.objects.count()],
             "article": [Article._meta.verbose_name, Article.objects.count()],
             "banque": [Banque._meta.verbose_name, Banque.objects.count()],
         },
-        _("Machines"): {
+        Machine._meta.verbose_name_plural.title(): {
             "machine": [Machine._meta.verbose_name, Machine.objects.count()],
             "typemachine": [
                 MachineType._meta.verbose_name,
@@ -412,31 +412,31 @@ def stats_users(request):
     de moyens de paiements par user, de banque par user,
     de bannissement par user, etc"""
     stats = {
-        _("User"): {
-            _("Machines"): User.objects.annotate(num=Count("machine")).order_by("-num")[
+        User._meta.verbose_name: {
+            Machine._meta.verbose_name_plural: User.objects.annotate(num=Count("machine")).order_by("-num")[
                 :10
             ],
-            _("Invoice"): User.objects.annotate(num=Count("facture")).order_by("-num")[
+            Facture._meta.verbose_name_plural: User.objects.annotate(num=Count("facture")).order_by("-num")[
                 :10
             ],
-            _("Ban"): User.objects.annotate(num=Count("ban")).order_by("-num")[:10],
-            _("Whitelist"): User.objects.annotate(num=Count("whitelist")).order_by(
+            Ban._meta.verbose_name_plural: User.objects.annotate(num=Count("ban")).order_by("-num")[:10],
+            Whitelist._meta.verbose_name_plural: User.objects.annotate(num=Count("whitelist")).order_by(
                 "-num"
             )[:10],
-            _("Rights"): User.objects.annotate(num=Count("groups")).order_by("-num")[
+            _("rights"): User.objects.annotate(num=Count("groups")).order_by("-num")[
                 :10
             ],
         },
-        _("School"): {
-            _("User"): School.objects.annotate(num=Count("user")).order_by("-num")[:10]
+        School._meta.verbose_name: {
+            User._meta.verbose_name_plural: School.objects.annotate(num=Count("user")).order_by("-num")[:10]
         },
-        _("Payment method"): {
-            _("User"): Paiement.objects.annotate(num=Count("facture")).order_by("-num")[
+        Paiement._meta.verbose_name: {
+            User._meta.verbose_name_plural: Paiement.objects.annotate(num=Count("facture")).order_by("-num")[
                 :10
             ]
         },
-        _("Bank"): {
-            _("User"): Banque.objects.annotate(num=Count("facture")).order_by("-num")[
+        Banque._meta.verbose_name: {
+            User._meta.verbose_name_plural: Banque.objects.annotate(num=Count("facture")).order_by("-num")[
                 :10
             ]
         },
@@ -451,8 +451,8 @@ def stats_actions(request):
     utilisateurs.
     Affiche le nombre de modifications aggrégées par utilisateurs"""
     stats = {
-        _("User"): {
-            _("Action"): User.objects.annotate(num=Count("revision")).order_by("-num")[
+        User._meta.verbose_name: {
+            _("actions"): User.objects.annotate(num=Count("revision")).order_by("-num")[
                 :40
             ]
         }
diff --git a/machines/acl.py b/machines/acl.py
index 55b48145..1989a788 100644
--- a/machines/acl.py
+++ b/machines/acl.py
@@ -41,6 +41,7 @@ def can_view(user):
     can = user.has_module_perms("machines")
     return (
         can,
-        None if can else _("You don't have the right to view this" " application."),
+        None if can else _("You don't have the right to view this"
+                           " application."),
         ("machines",),
     )
diff --git a/machines/locale/fr/LC_MESSAGES/django.po b/machines/locale/fr/LC_MESSAGES/django.po
index a2422759..049c01ad 100644
--- a/machines/locale/fr/LC_MESSAGES/django.po
+++ b/machines/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
 "PO-Revision-Date: 2018-06-23 16:35+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,7 +30,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: machines/acl.py:42
+#: machines/acl.py:44
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
@@ -67,123 +67,123 @@ msgstr "Type de machine à ajouter"
 msgid "Related IP type"
 msgstr "Type d'IP relié"
 
-#: machines/forms.py:207
+#: machines/forms.py:208
 msgid "Current machine types"
 msgstr "Types de machines actuels"
 
-#: machines/forms.py:231
+#: machines/forms.py:232
 msgid "IP type to add"
 msgstr "Type d'IP à ajouter"
 
-#: machines/forms.py:249
+#: machines/forms.py:260
 msgid "Current IP types"
 msgstr "Types d'IP actuels"
 
-#: machines/forms.py:272
+#: machines/forms.py:283
 msgid "Extension to add"
 msgstr "Extension à ajouter"
 
-#: machines/forms.py:273 machines/templates/machines/aff_extension.html:37
+#: machines/forms.py:284 machines/templates/machines/aff_extension.html:37
 msgid "A record origin"
 msgstr "Enregistrement A origin"
 
-#: machines/forms.py:274 machines/templates/machines/aff_extension.html:39
+#: machines/forms.py:285 machines/templates/machines/aff_extension.html:39
 msgid "AAAA record origin"
 msgstr "Enregistrement AAAA origin"
 
-#: machines/forms.py:275
+#: machines/forms.py:286
 msgid "SOA record to use"
 msgstr "Enregistrement SOA à utiliser"
 
-#: machines/forms.py:276
+#: machines/forms.py:287
 msgid "Sign with DNSSEC"
 msgstr "Signer avec DNSSEC"
 
-#: machines/forms.py:283
+#: machines/forms.py:295
 msgid "Current extensions"
 msgstr "Extensions actuelles"
 
-#: machines/forms.py:324
+#: machines/forms.py:337
 msgid "Current SOA records"
 msgstr "Enregistrements SOA actuels"
 
-#: machines/forms.py:356
+#: machines/forms.py:370
 msgid "Current MX records"
 msgstr "Enregistrements MX actuels"
 
-#: machines/forms.py:390
+#: machines/forms.py:405
 msgid "Current NS records"
 msgstr "Enregistrements NS actuels"
 
-#: machines/forms.py:419
+#: machines/forms.py:435
 msgid "Current TXT records"
 msgstr "Enregistrements TXT actuels"
 
-#: machines/forms.py:448
+#: machines/forms.py:465
 msgid "Current DNAME records"
 msgstr "Enregistrements DNAME actuels"
 
-#: machines/forms.py:477
+#: machines/forms.py:495
 msgid "Current SRV records"
 msgstr "Enregistrements SRV actuels"
 
-#: machines/forms.py:507
+#: machines/forms.py:526
 msgid "Current NAS devices"
 msgstr "Dispositifs NAS actuels"
 
-#: machines/forms.py:540
+#: machines/forms.py:559
 msgid "Current roles"
 msgstr "Rôles actuels"
 
-#: machines/forms.py:582
+#: machines/forms.py:601
 msgid "Current services"
 msgstr "Services actuels"
 
-#: machines/forms.py:622
+#: machines/forms.py:643
 msgid "Current VLANs"
 msgstr "VLANs actuels"
 
-#: machines/models.py:63
-msgid "Optional"
-msgstr "Optionnel"
-
 #: machines/models.py:71
+msgid "Optional."
+msgstr "Optionnel."
+
+#: machines/models.py:77
 msgid "Can view a machine object"
 msgstr "Peut voir un objet machine"
 
-#: machines/models.py:73
+#: machines/models.py:78
 msgid "Can change the user of a machine"
 msgstr "Peut changer l'utilisateur d'une machine"
 
-#: machines/models.py:75
+#: machines/models.py:80 machines/views.py:317
 msgid "machine"
 msgstr "machine"
 
-#: machines/models.py:76
+#: machines/models.py:81
 msgid "machines"
 msgstr "machines"
 
-#: machines/models.py:109
+#: machines/models.py:114
 msgid "You don't have the right to change the machine's user."
 msgstr "Vous n'avez pas le droit de changer l'utilisateur de la machine."
 
-#: machines/models.py:118
+#: machines/models.py:129
 msgid "You don't have the right to view all the machines."
 msgstr "Vous n'avez pas le droit de voir toutes les machines."
 
-#: machines/models.py:132
+#: machines/models.py:144
 msgid "Nonexistent user."
 msgstr "Utilisateur inexistant."
 
-#: machines/models.py:140
+#: machines/models.py:154 machines/models.py:1303
 msgid "You don't have the right to add a machine."
 msgstr "Vous n'avez pas le droit d'ajouter une machine."
 
-#: machines/models.py:142
+#: machines/models.py:160
 msgid "You don't have the right to add a machine to another user."
 msgstr "Vous n'avez pas le droit d'ajouter une machine à un autre utilisateur."
 
-#: machines/models.py:145 machines/models.py:1239
+#: machines/models.py:168 machines/models.py:1320
 #, python-format
 msgid ""
 "You reached the maximum number of interfaces that you are allowed to create "
@@ -192,79 +192,79 @@ msgstr ""
 "Vous avez atteint le nombre maximal d'interfaces que vous pouvez créer vous-"
 "même (%s)."
 
-#: machines/models.py:164 machines/models.py:1264 machines/models.py:1281
-#: machines/models.py:1370 machines/models.py:1387
+#: machines/models.py:189 machines/models.py:1352 machines/models.py:1371
+#: machines/models.py:1474 machines/models.py:1492
 msgid "You don't have the right to edit a machine of another user."
 msgstr ""
 "Vous n'avez pas le droit de modifier une machine d'un autre utilisateur."
 
-#: machines/models.py:182
+#: machines/models.py:209
 msgid "You don't have the right to delete a machine of another user."
 msgstr ""
 "Vous n'avez pas le droit de supprimer une machine d'une autre utilisateur."
 
-#: machines/models.py:194
+#: machines/models.py:228 machines/models.py:1762
 msgid "You don't have the right to view other machines than yours."
 msgstr "Vous n'avez pas le droit de voir d'autres machines que les vôtres."
 
-#: machines/models.py:206 machines/templates/machines/aff_machines.html:53
+#: machines/models.py:242 machines/templates/machines/aff_machines.html:53
 msgid "No name"
 msgstr "Sans nom"
 
-#: machines/models.py:266
+#: machines/models.py:319
 msgid "Can view a machine type object"
 msgstr "Peut voir un objet type de machine"
 
-#: machines/models.py:267
+#: machines/models.py:320
 msgid "Can use all machine types"
 msgstr "Peut utiliser tous les types de machine"
 
-#: machines/models.py:269
+#: machines/models.py:322
 msgid "machine type"
 msgstr "type de machine"
 
-#: machines/models.py:270
+#: machines/models.py:323
 msgid "machine types"
 msgstr "types de machine"
 
-#: machines/models.py:288
+#: machines/models.py:343
 msgid "You don't have the right to use all machine types."
 msgstr "Vous n'avez pas le droit d'utiliser tous les types de machine."
 
-#: machines/models.py:307
-msgid "Network containing the domain's IPv4 range (optional)"
-msgstr "Réseau contenant la plage IPv4 du domaine (optionnel)"
+#: machines/models.py:364
+msgid "Network containing the domain's IPv4 range (optional)."
+msgstr "Réseau contenant la plage IPv4 du domaine (optionnel)."
 
-#: machines/models.py:315
-msgid "Netmask for the domain's IPv4 range"
-msgstr "Masque de sous-réseau pour la plage IPv4 du domaine"
+#: machines/models.py:369
+msgid "Netmask for the domain's IPv4 range."
+msgstr "Masque de sous-réseau pour la plage IPv4 du domaine."
 
-#: machines/models.py:319
-msgid "Enable reverse DNS for IPv4"
-msgstr "Activer DNS inverse pour IPv4"
+#: machines/models.py:372
+msgid "Enable reverse DNS for IPv4."
+msgstr "Activer DNS inverse pour IPv4."
 
-#: machines/models.py:335
-msgid "Enable reverse DNS for IPv6"
-msgstr "Activer DNS inverse pour IPv6"
+#: machines/models.py:379
+msgid "Enable reverse DNS for IPv6."
+msgstr "Activer DNS inverse pour IPv6."
 
-#: machines/models.py:351
+#: machines/models.py:386
 msgid "Can view an IP type object"
 msgstr "Peut voir un objet type d'IP"
 
-#: machines/models.py:352
+#: machines/models.py:387
 msgid "Can use all IP types"
 msgstr "Peut utiliser tous les types d'IP"
 
-#: machines/models.py:354 machines/templates/machines/aff_iptype.html:35
+#: machines/models.py:389 machines/templates/machines/aff_iptype.html:35
 #: machines/templates/machines/machine.html:108
 msgid "IP type"
 msgstr "type d'IP"
 
-#: machines/models.py:355
+#: machines/models.py:390
 msgid "IP types"
 msgstr "types d'IP"
 
-#: machines/models.py:458
+#: machines/models.py:499
 msgid ""
 "One or several IP addresses from the range are affected, impossible to "
 "delete the range."
@@ -272,21 +272,21 @@ msgstr ""
 "Une ou plusieurs adresses IP de la plage sont affectées, impossible de "
 "supprimer la plage."
 
-#: machines/models.py:500
+#: machines/models.py:546
 msgid "Range end must be after range start..."
 msgstr "La fin de la plage doit être après le début..."
 
-#: machines/models.py:503
+#: machines/models.py:551
 msgid "The range is too large, you can't create a larger one than a /16."
 msgstr ""
 "La plage est trop grande, vous ne pouvez pas en créer une plus grande "
 "qu'un /16."
 
-#: machines/models.py:508
+#: machines/models.py:559
 msgid "The specified range is not disjoint from existing ranges."
 msgstr "La plage renseignée n'est pas disjointe des plages existantes."
 
-#: machines/models.py:516
+#: machines/models.py:573
 msgid ""
 "If you specify a domain network or netmask, it must contain the domain's IP "
 "range."
@@ -294,338 +294,336 @@ msgstr ""
 "Si vous renseignez un réseau ou masque de sous-réseau, il doit contenir la "
 "plage IP du domaine."
 
-#: machines/models.py:549
-msgid "v4 multicast management"
-msgstr "gestion de multidiffusion v4"
+#: machines/models.py:611
+msgid "v4 multicast management."
+msgstr "gestion de multidiffusion v4."
 
-#: machines/models.py:553
-msgid "v6 multicast management"
-msgstr "gestion de multidiffusion v6"
+#: machines/models.py:612
+msgid "v6 multicast management."
+msgstr "gestion de multidiffusion v6."
 
-#: machines/models.py:558
+#: machines/models.py:615
 msgid "Can view a VLAN object"
 msgstr "Peut voir un objet VLAN"
 
-#: machines/models.py:560 machines/templates/machines/machine.html:160
+#: machines/models.py:616 machines/templates/machines/machine.html:160
 msgid "VLAN"
 msgstr "VLAN"
 
-#: machines/models.py:561 machines/templates/machines/sidebar.html:57
+#: machines/models.py:617 machines/templates/machines/sidebar.html:57
 msgid "VLANs"
 msgstr "VLANs"
 
-#: machines/models.py:574
+#: machines/models.py:629
 msgid "MAC-address"
 msgstr "MAC-address"
 
-#: machines/models.py:597
+#: machines/models.py:644
 msgid "Can view a NAS device object"
 msgstr "Peut voir un objet dispositif NAS"
 
-#: machines/models.py:599 machines/templates/machines/machine.html:164
+#: machines/models.py:645 machines/templates/machines/machine.html:164
 msgid "NAS device"
 msgstr "dispositif NAS"
 
-#: machines/models.py:600 machines/templates/machines/sidebar.html:63
+#: machines/models.py:646 machines/templates/machines/sidebar.html:63
 msgid "NAS devices"
 msgstr "dispositifs NAS"
 
-#: machines/models.py:614
-msgid "Contact email address for the zone"
-msgstr "Adresse mail de contact pour la zone"
+#: machines/models.py:660
+msgid "Contact email address for the zone."
+msgstr "Adresse mail de contact pour la zone."
 
-#: machines/models.py:618
+#: machines/models.py:664
 msgid ""
 "Seconds before the secondary DNS have to ask the primary DNS serial to "
-"detect a modification"
+"detect a modification."
 msgstr ""
 "Secondes avant que le DNS secondaire demande au DNS primaire le serial pour "
-"détecter une modification"
+"détecter une modification."
 
-#: machines/models.py:623
+#: machines/models.py:671
 msgid ""
 "Seconds before the secondary DNS ask the serial again in case of a primary "
-"DNS timeout"
+"DNS timeout."
 msgstr ""
 "Secondes avant que le DNS secondaire demande le serial de nouveau dans le "
-"cas d'un délai d'attente du DNS primaire"
+"cas d'un délai d'attente du DNS primaire."
 
-#: machines/models.py:628
+#: machines/models.py:678
 msgid ""
 "Seconds before the secondary DNS stop answering requests in case of primary "
-"DNS timeout"
+"DNS timeout."
 msgstr ""
 "Secondes avant que le DNS secondaire arrête de répondre aux requêtes dans le "
-"cas d'un délai d'attente du DNS primaire"
+"cas d'un délai d'attente du DNS primaire."
 
-#: machines/models.py:633 machines/models.py:890
-msgid "Time to Live"
+#: machines/models.py:683 machines/models.py:950
+msgid "Time To Live."
 msgstr "Temps de vie"
 
-#: machines/models.py:638
+#: machines/models.py:687
 msgid "Can view an SOA record object"
 msgstr "Peut voir un objet enregistrement SOA"
 
-#: machines/models.py:640 machines/templates/machines/aff_extension.html:36
+#: machines/models.py:688 machines/templates/machines/aff_extension.html:36
 #: machines/templates/machines/machine.html:120
 msgid "SOA record"
 msgstr "enregistrement SOA"
 
-#: machines/models.py:641
+#: machines/models.py:689
 msgid "SOA records"
 msgstr "enregistrements SOA"
 
-#: machines/models.py:680
+#: machines/models.py:728
 msgid "SOA to edit"
 msgstr "SOA à modifier"
 
-#: machines/models.py:691
-msgid "Zone name, must begin with a dot (.example.org)"
-msgstr "Nom de zone, doit commencer par un point (.example.org)"
+#: machines/models.py:739
+msgid "Zone name, must begin with a dot (.example.org)."
+msgstr "Nom de zone, doit commencer par un point (.example.org)."
 
-#: machines/models.py:699
-msgid "A record associated with the zone"
-msgstr "Enregistrement A associé à la zone"
+#: machines/models.py:747
+msgid "A record associated with the zone."
+msgstr "Enregistrement A associé à la zone."
 
-#: machines/models.py:705
-msgid "AAAA record associated with the zone"
-msgstr "Enregristrement AAAA associé avec la zone"
+#: machines/models.py:753
+msgid "AAAA record associated with the zone."
+msgstr "Enregristrement AAAA associé avec la zone."
 
-#: machines/models.py:713
-msgid "Should the zone be signed with DNSSEC"
-msgstr "La zone doit-elle être signée avec DNSSEC"
+#: machines/models.py:757
+msgid "Should the zone be signed with DNSSEC."
+msgstr "La zone doit-elle être signée avec DNSSEC."
 
-#: machines/models.py:718
+#: machines/models.py:762
 msgid "Can view an extension object"
 msgstr "Peut voir un objet extension"
 
-#: machines/models.py:719
+#: machines/models.py:763
 msgid "Can use all extensions"
 msgstr "Peut utiliser toutes les extensions"
 
-#: machines/models.py:721
+#: machines/models.py:765
 msgid "DNS extension"
 msgstr "extension DNS"
 
-#: machines/models.py:722
+#: machines/models.py:766
 msgid "DNS extensions"
 msgstr "extensions DNS"
 
-#: machines/models.py:776
+#: machines/models.py:826
+msgid "You don't have the right to use all extensions."
+msgstr "Vous n'avez pas le droit d'utiliser toutes les extensions."
+
+#: machines/models.py:835
 msgid "An extension must begin with a dot."
 msgstr "Une extension doit commencer par un point."
 
-#: machines/models.py:790
+#: machines/models.py:848 machines/models.py:874 machines/models.py:898
+#: machines/models.py:921 machines/models.py:1587
+msgid "Time To Live (TTL)"
+msgstr "Temps de vie (TTL)"
+
+#: machines/models.py:852
 msgid "Can view an MX record object"
 msgstr "Peut voir un objet enregistrement MX"
 
-#: machines/models.py:792 machines/templates/machines/machine.html:124
+#: machines/models.py:853 machines/templates/machines/machine.html:124
 msgid "MX record"
 msgstr "enregistrement MX"
 
-#: machines/models.py:793
+#: machines/models.py:854
 msgid "MX records"
 msgstr "enregistrements MX"
 
-#: machines/models.py:815
+#: machines/models.py:878
 msgid "Can view an NS record object"
 msgstr "Peut voir un objet enregistrement NS"
 
-#: machines/models.py:817 machines/templates/machines/machine.html:128
+#: machines/models.py:879 machines/templates/machines/machine.html:128
 msgid "NS record"
 msgstr "enregistrement NS"
 
-#: machines/models.py:818
+#: machines/models.py:880
 msgid "NS records"
 msgstr "enregistrements NS"
 
-#: machines/models.py:837
+#: machines/models.py:902
 msgid "Can view a TXT record object"
 msgstr "Peut voir un objet enregistrement TXT"
 
-#: machines/models.py:839 machines/templates/machines/machine.html:132
+#: machines/models.py:903 machines/templates/machines/machine.html:132
 msgid "TXT record"
 msgstr "enregistrement TXT"
 
-#: machines/models.py:840
+#: machines/models.py:904
 msgid "TXT records"
 msgstr "enregistrements TXT"
 
-#: machines/models.py:859
+#: machines/models.py:925
 msgid "Can view a DNAME record object"
 msgstr "Peut voir un objet enregistrement DNAME"
 
-#: machines/models.py:861 machines/templates/machines/machine.html:136
+#: machines/models.py:926 machines/templates/machines/machine.html:136
 msgid "DNAME record"
 msgstr "enregistrement DNAME"
 
-#: machines/models.py:862
+#: machines/models.py:927
 msgid "DNAME records"
 msgstr "enregistrements DNAME"
 
-#: machines/models.py:895
+#: machines/models.py:956
 msgid ""
 "Priority of the target server (positive integer value, the lower it is, the "
-"more the server will be used if available)"
+"more the server will be used if available)."
 msgstr ""
 "Priorité du serveur cible (entier positif, plus il est bas, plus le serveur "
-"sera utilisé si disponible)"
+"sera utilisé si disponible)."
 
-#: machines/models.py:902
+#: machines/models.py:965
 msgid ""
 "Relative weight for records with the same priority (integer value between 0 "
-"and 65535)"
+"and 65535)."
 msgstr ""
 "Poids relatif des enregistrements avec la même priorité (entier entre 0 et "
-"65535)"
+"65535)."
 
-#: machines/models.py:907
-msgid "TCP/UDP port"
-msgstr "Port TCP/UDP"
+#: machines/models.py:970
+msgid "TCP/UDP port."
+msgstr "Port TCP/UDP."
 
-#: machines/models.py:912
-msgid "Target server"
-msgstr "Serveur cible"
+#: machines/models.py:973
+msgid "Target server."
+msgstr "Serveur cible."
 
-#: machines/models.py:917
+#: machines/models.py:977
 msgid "Can view an SRV record object"
 msgstr "Peut voir un objet enregistrement SRV"
 
-#: machines/models.py:919 machines/templates/machines/machine.html:140
+#: machines/models.py:978 machines/templates/machines/machine.html:140
 msgid "SRV record"
 msgstr "enregistrement SRV"
 
-#: machines/models.py:920
+#: machines/models.py:979
 msgid "SRV records"
 msgstr "enregistrements SRV"
 
-#: machines/models.py:949 machines/templates/machines/aff_sshfp.html:31
-msgid "SSH public key"
-msgstr "Clé publique SSH"
+#: machines/models.py:1030
+msgid "SSH public key."
+msgstr "Clé publique SSH."
 
-#: machines/models.py:957 machines/templates/machines/aff_sshfp.html:33
-#: machines/templates/machines/aff_vlan.html:35
-msgid "Comment"
-msgstr "Commentaire"
+#: machines/models.py:1033
+msgid "Comment."
+msgstr "Commentaire."
 
-#: machines/models.py:984
+#: machines/models.py:1056
 msgid "Can view an SSHFP record object"
 msgstr "Peut voir un objet enregistrement SSHFP"
 
-#: machines/models.py:986 machines/templates/machines/machine.html:144
+#: machines/models.py:1057 machines/templates/machines/machine.html:144
+#: machines/views.py:485
 msgid "SSHFP record"
 msgstr "enregistrement SSHFP"
 
-#: machines/models.py:987
+#: machines/models.py:1058
 msgid "SSHFP records"
 msgstr "enregistrements SSHFP"
 
-#: machines/models.py:1024
+#: machines/models.py:1093
 msgid "Can view an interface object"
 msgstr "Peut voir un objet interface"
 
-#: machines/models.py:1026
+#: machines/models.py:1094
 msgid "Can change the owner of an interface"
 msgstr "Peut changer l'utilisateur d'une interface"
 
-#: machines/models.py:1028
+#: machines/models.py:1096 machines/views.py:369
 msgid "interface"
 msgstr "interface"
 
-#: machines/models.py:1029
+#: machines/models.py:1097
 msgid "interfaces"
 msgstr "interfaces"
 
-#: machines/models.py:1133
+#: machines/models.py:1135
+msgid "Unknown vendor."
+msgstr "Constructeur inconnu."
+
+#: machines/models.py:1199
 msgid "The given MAC address is invalid."
 msgstr "L'adresse MAC indiquée est invalide."
 
-#: machines/models.py:1141
-msgid "There is no IP address available in the slash."
-msgstr "Il n'y a pas d'adresse IP disponible dans le slash."
+#: machines/models.py:1208
+msgid "There are no IP addresses available in the slash."
+msgstr "Il n'y a pas d'adresses IP disponibles dans le slash."
 
-#: machines/models.py:1154
-#, fuzzy
-#| msgid "IPv4 range"
-msgid "IPv4 unassigning"
-msgstr "Plage IPv4"
-
-#: machines/models.py:1162
-#, fuzzy
-#| msgid "IPv4 range"
-msgid "IPv4 assigning"
-msgstr "Plage IPv4"
-
-#: machines/models.py:1193
+#: machines/models.py:1260
 msgid "The selected IP type is invalid."
 msgstr "Le type d'IP sélectionné est invalide."
 
-#: machines/models.py:1203
-msgid "Mac address already registered in this Machine Type/Subnet"
-msgstr ""
+#: machines/models.py:1274
+msgid "MAC address already registered in this machine type/subnet."
+msgstr "Adresse MAC déjà enregistrée dans ce type de machine/sous-réseau."
 
-#: machines/models.py:1210
+#: machines/models.py:1283
 msgid "The IPv4 address and the machine type don't match."
 msgstr "L'adresse IPv4 et le type de machine ne correspondent pas."
 
-#: machines/models.py:1225
+#: machines/models.py:1298
 msgid "Nonexistent machine."
 msgstr "Machine inexistante."
 
-#: machines/models.py:1229
-msgid "You can't add a machine."
-msgstr "Vous ne pouvez pas ajouter une machine."
-
-#: machines/models.py:1235
+#: machines/models.py:1311
 msgid ""
 "You don't have the right to add an interface to a machine of another user."
 msgstr ""
 "Vous n'avez pas le droit d'ajouter une interface à une machine d'un autre "
 "utilisateur."
 
-#: machines/models.py:1249
-msgid "Permission required to edit the machine."
-msgstr "Permission requise pour modifier la machine."
+#: machines/models.py:1335
+msgid "You don't have the right to edit the machine."
+msgstr "Vous n'avez pas le droit d'éditer une machine."
 
-#: machines/models.py:1293 machines/models.py:1399 machines/models.py:1609
+#: machines/models.py:1389 machines/models.py:1509
 msgid "You don't have the right to view machines other than yours."
 msgstr "Vous n'avez pas le droit de voir d'autres machines que les vôtres."
 
-#: machines/models.py:1326
+#: machines/models.py:1417
 msgid "Can view an IPv6 addresses list object"
 msgstr "Peut voir un objet list d'adresses IPv6"
 
-#: machines/models.py:1327
+#: machines/models.py:1420
 msgid "Can change the SLAAC value of an IPv6 addresses list"
 msgstr "Peut modifier la valeur SLAAC d'une liste d'adresses IPv6"
 
-#: machines/models.py:1330
+#: machines/models.py:1423 machines/views.py:429
 msgid "IPv6 addresses list"
 msgstr "Liste d'adresses IPv6"
 
-#: machines/models.py:1331
+#: machines/models.py:1424
 msgid "IPv6 addresses lists"
 msgstr "Listes d'adresses IPv6"
 
-#: machines/models.py:1343 machines/models.py:1557
+#: machines/models.py:1436 machines/models.py:1677
 msgid "Nonexistent interface."
 msgstr "Interface inexistante."
 
-#: machines/models.py:1346 machines/models.py:1564
+#: machines/models.py:1442 machines/models.py:1686
 msgid "You don't have the right to add an alias to a machine of another user."
 msgstr ""
 "Vous n'avez pas le droit d'ajouter un alias à une machine d'un autre "
 "utilisateur."
 
-#: machines/models.py:1354
-msgid "Permission required to change the SLAAC value of an IPv6 address"
-msgstr "Permission requise pour changer la valeur SLAAC d'une adresse IPv6."
+#: machines/models.py:1455
+msgid "You don't have the right to change the SLAAC value of an IPv6 address."
+msgstr ""
+"Vous n'avez pas le droit de changer la valeur SLAAC d'une adresse IPv6."
 
-#: machines/models.py:1426
+#: machines/models.py:1541
 msgid "A SLAAC IP address is already registered."
 msgstr "Une adresse IP SLAAC est déjà enregistrée."
 
-#: machines/models.py:1434
+#: machines/models.py:1555
 msgid ""
 "The v6 prefix is incorrect and doesn't match the type associated with the "
 "machine."
@@ -633,45 +631,49 @@ msgstr ""
 "Le préfixe v6 est incorrect et ne correspond pas au type associé à la "
 "machine."
 
-#: machines/models.py:1460
+#: machines/models.py:1580
 msgid "Mandatory and unique, must not contain dots."
 msgstr "Obligatoire et unique, ne doit pas contenir de points."
 
-#: machines/models.py:1474
+#: machines/models.py:1595
 msgid "Can view a domain object"
 msgstr "Peut voir un objet domaine"
 
-#: machines/models.py:1476
+#: machines/models.py:1596
+msgid "Can change the TTL of a domain object"
+msgstr "Peut changer le TTL d'un objet domaine"
+
+#: machines/models.py:1598
 msgid "domain"
 msgstr "domaine"
 
-#: machines/models.py:1477
+#: machines/models.py:1599
 msgid "domains"
 msgstr "domaines"
 
-#: machines/models.py:1499
+#: machines/models.py:1621
 msgid "You can't create a both A and CNAME record."
 msgstr "Vous ne pouvez pas créer un enregistrement à la fois A et CNAME."
 
-#: machines/models.py:1502
+#: machines/models.py:1624
 msgid "You can't create a CNAME record pointing to itself."
 msgstr "Vous ne pouvez pas créer un enregistrement CNAME vers lui-même."
 
-#: machines/models.py:1510
+#: machines/models.py:1630
 #, python-format
 msgid "The domain name %s is too long (over 63 characters)."
 msgstr "Le nom de domaine %s est trop long (plus de 63 caractères)."
 
-#: machines/models.py:1513
+#: machines/models.py:1634
 #, python-format
 msgid "The domain name %s contains forbidden characters."
 msgstr "Le nom de domaine %s contient des caractères interdits."
 
-#: machines/models.py:1531
+#: machines/models.py:1651
 msgid "Invalid extension."
 msgstr "Extension invalide."
 
-#: machines/models.py:1572
+#: machines/models.py:1702
 #, python-format
 msgid ""
 "You reached the maximum number of alias that you are allowed to create "
@@ -680,160 +682,164 @@ msgstr ""
 "Vous avez atteint le nombre maximal d'alias que vous pouvez créer vous-même "
 "(%s)."
 
-#: machines/models.py:1585
+#: machines/models.py:1723
 msgid "You don't have the right to edit an alias of a machine of another user."
 msgstr ""
 "Vous n'avez pas le droit de modifier un alias d'une machine d'un autre "
 "utilisateur."
 
-#: machines/models.py:1597
+#: machines/models.py:1743
 msgid ""
 "You don't have the right to delete an alias of a machine of another user."
 msgstr ""
 "Vous n'avez pas le droit de supprimer un alias d'une machine d'un autre "
 "utilisateur."
 
-#: machines/models.py:1625
+#: machines/models.py:1773
+msgid "You don't have the right to change the domain's TTL."
+msgstr "Vous n'avez pas le droit de changer le TTL du domaine."
+
+#: machines/models.py:1790
 msgid "Can view an IPv4 addresses list object"
 msgstr "Peut voir un object liste d'adresses IPv4"
 
-#: machines/models.py:1627
+#: machines/models.py:1791
 msgid "IPv4 addresses list"
 msgstr "Liste d'adresses IPv4"
 
-#: machines/models.py:1628
+#: machines/models.py:1792
 msgid "IPv4 addresses lists"
 msgstr "Listes d'adresses IPv4"
 
-#: machines/models.py:1639
+#: machines/models.py:1804
 msgid "The IPv4 address and the range of the IP type don't match."
 msgstr "L'adresse IPv4 et la plage du type d'IP ne correspondent pas."
 
-#: machines/models.py:1657
+#: machines/models.py:1822
 msgid "DHCP server"
 msgstr "Serveur DHCP"
 
-#: machines/models.py:1658
+#: machines/models.py:1823
 msgid "Switches configuration server"
 msgstr "Serveur de configuration des commutateurs réseau"
 
-#: machines/models.py:1659
+#: machines/models.py:1824
 msgid "Recursive DNS server"
 msgstr "Serveur DNS récursif"
 
-#: machines/models.py:1660
+#: machines/models.py:1825
 msgid "NTP server"
 msgstr "Serveur NTP"
 
-#: machines/models.py:1661
+#: machines/models.py:1826
 msgid "RADIUS server"
 msgstr "Serveur RADIUS"
 
-#: machines/models.py:1662
+#: machines/models.py:1827
 msgid "Log server"
 msgstr "Serveur log"
 
-#: machines/models.py:1663
+#: machines/models.py:1828
 msgid "LDAP master server"
 msgstr "Serveur LDAP maître"
 
-#: machines/models.py:1664
+#: machines/models.py:1829
 msgid "LDAP backup server"
 msgstr "Serveur LDAP de secours"
 
-#: machines/models.py:1665
+#: machines/models.py:1830
 msgid "SMTP server"
 msgstr "Serveur SMTP"
 
-#: machines/models.py:1666
+#: machines/models.py:1831
 msgid "postgreSQL server"
 msgstr "Serveur postgreSQL"
 
-#: machines/models.py:1667
+#: machines/models.py:1832
 msgid "mySQL server"
 msgstr "Serveur mySQL"
 
-#: machines/models.py:1668
+#: machines/models.py:1833
 msgid "SQL client"
 msgstr "Client SQL"
 
-#: machines/models.py:1669
+#: machines/models.py:1834
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: machines/models.py:1683
+#: machines/models.py:1842
 msgid "Can view a role object"
 msgstr "Peut voir un objet rôle"
 
-#: machines/models.py:1685
+#: machines/models.py:1843
 msgid "server role"
 msgstr "rôle de serveur"
 
-#: machines/models.py:1686
+#: machines/models.py:1844
 msgid "server roles"
 msgstr "rôles de serveur"
 
-#: machines/models.py:1720
+#: machines/models.py:1876
 msgid "Minimal time before regeneration of the service."
 msgstr "Temps minimal avant régénération du service."
 
-#: machines/models.py:1724
+#: machines/models.py:1880
 msgid "Maximal time before regeneration of the service."
 msgstr "Temps maximal avant régénération du service."
 
-#: machines/models.py:1730
+#: machines/models.py:1885
 msgid "Can view a service object"
 msgstr "Peut voir un objet service"
 
-#: machines/models.py:1732
+#: machines/models.py:1886
 msgid "service to generate (DHCP, DNS, ...)"
 msgstr "service à générer (DHCP, DNS, ...)"
 
-#: machines/models.py:1733
+#: machines/models.py:1887
 msgid "services to generate (DHCP, DNS, ...)"
 msgstr "services à générer (DHCP, DNS, ...)"
 
-#: machines/models.py:1779
+#: machines/models.py:1931
 msgid "Can view a service server link object"
 msgstr "Peut voir un objet lien service serveur"
 
-#: machines/models.py:1781
+#: machines/models.py:1933
 msgid "link between service and server"
 msgstr "lien entre service et serveur"
 
-#: machines/models.py:1782
+#: machines/models.py:1934
 msgid "links between service and server"
 msgstr "liens entre service et serveur"
 
-#: machines/models.py:1824
+#: machines/models.py:1975
 msgid "Name of the ports configuration"
 msgstr "Nom de la configuration de ports"
 
-#: machines/models.py:1830
+#: machines/models.py:1980
 msgid "Can view a ports opening list object"
 msgstr "Peut voir un objet liste d'ouverture de ports"
 
-#: machines/models.py:1833
+#: machines/models.py:1983
 msgid "ports opening list"
 msgstr "liste d'ouverture de ports"
 
-#: machines/models.py:1834
+#: machines/models.py:1984
 msgid "ports opening lists"
 msgstr "listes d'ouverture de ports"
 
-#: machines/models.py:1843
+#: machines/models.py:1995
 msgid "You don't have the right to delete a ports opening list."
 msgstr "Vous n'avez pas le droit de supprimer une liste d'ouverture de ports."
 
-#: machines/models.py:1846
+#: machines/models.py:1999
 msgid "This ports opening list is used."
 msgstr "Cette liste d'ouverture de ports est utilisée."
 
-#: machines/models.py:1919
+#: machines/models.py:2053
 msgid "ports opening"
 msgstr "ouverture de ports"
 
-#: machines/models.py:1920
+#: machines/models.py:2054
 msgid "ports openings"
 msgstr "ouvertures de ports"
 
@@ -841,6 +847,16 @@ msgstr "ouvertures de ports"
 msgid "Aliases"
 msgstr "Alias"
 
+#: machines/templates/machines/aff_alias.html:33
+#: machines/templates/machines/aff_dname.html:32
+#: machines/templates/machines/aff_mx.html:35
+#: machines/templates/machines/aff_ns.html:34
+#: machines/templates/machines/aff_soa.html:37
+#: machines/templates/machines/aff_srv.html:35
+#: machines/templates/machines/aff_txt.html:34
+msgid "TTL"
+msgstr "Temps de vie"
+
 #: machines/templates/machines/aff_dname.html:30
 msgid "Target zone"
 msgstr "Cible"
@@ -860,8 +876,8 @@ msgstr "Extension"
 
 #: machines/templates/machines/aff_extension.html:35
 #: machines/templates/machines/aff_iptype.html:37
-msgid "'infra' right required"
-msgstr "droit 'infra' requis"
+msgid "\"infra\" right required"
+msgstr "droit « infra » requis"
 
 #: machines/templates/machines/aff_extension.html:41
 msgid "DNSSEC"
@@ -919,7 +935,7 @@ msgstr "Voir le profil"
 msgid "Deactivated"
 msgstr "Désactivée"
 
-#: machines/templates/machines/aff_machines.html:67 machines/views.py:374
+#: machines/templates/machines/aff_machines.html:67
 msgid "Create an interface"
 msgstr "Créer une interface"
 
@@ -935,25 +951,31 @@ msgstr "Afficher le constructeur"
 msgid "Display the IPv6 address"
 msgstr "Afficher les adresses IPv6"
 
-#: machines/templates/machines/aff_machines.html:126
-msgid " Edit"
-msgstr " Modifier"
+#: machines/templates/machines/aff_machines.html:126 machines/views.py:299
+#: machines/views.py:413 machines/views.py:469 machines/views.py:520
+#: machines/views.py:583 machines/views.py:646 machines/views.py:708
+#: machines/views.py:760 machines/views.py:812 machines/views.py:864
+#: machines/views.py:919 machines/views.py:971 machines/views.py:1033
+#: machines/views.py:1089 machines/views.py:1141 machines/views.py:1207
+#: machines/views.py:1259 machines/views.py:1575
+msgid "Edit"
+msgstr "Modifier"
 
 #: machines/templates/machines/aff_machines.html:134
-msgid " Manage the aliases"
-msgstr " Gérer les alias"
+msgid "Manage the aliases"
+msgstr "Gérer les alias"
 
 #: machines/templates/machines/aff_machines.html:142
-msgid " Manage the IPv6 addresses"
-msgstr " Gérer les adresses IPv6"
+msgid "Manage the IPv6 addresses"
+msgstr "Gérer les adresses IPv6"
 
 #: machines/templates/machines/aff_machines.html:150
-msgid " Manage the SSH fingerprints"
-msgstr " Gérer les empreintes SSH"
+msgid "Manage the SSH fingerprints"
+msgstr "Gérer les empreintes SSH"
 
 #: machines/templates/machines/aff_machines.html:158
-msgid " Manage the ports configuration"
-msgstr " Gérer les configuration de ports"
+msgid "Manage the ports configuration"
+msgstr "Gérer les configuration de ports"
 
 #: machines/templates/machines/aff_machinetype.html:33
 msgid "Matching IP type"
@@ -1023,12 +1045,12 @@ msgid "Last regeneration"
 msgstr "Dernière régénération"
 
 #: machines/templates/machines/aff_servers.html:34
-msgid "Regeneration required"
-msgstr "Régénération requise"
+msgid "Regeneration asked"
+msgstr "Régénération demandée"
 
 #: machines/templates/machines/aff_servers.html:35
-msgid "Regeneration activated"
-msgstr "Régénération activée"
+msgid "Regeneration needed"
+msgstr "Régénération requise"
 
 #: machines/templates/machines/aff_service.html:33
 msgid "Minimal time before regeneration"
@@ -1062,11 +1084,6 @@ msgstr "Relance"
 msgid "Expire"
 msgstr "Expiration"
 
-#: machines/templates/machines/aff_soa.html:37
-#: machines/templates/machines/aff_srv.html:35
-msgid "TTL"
-msgstr "Temps de vie"
-
 #: machines/templates/machines/aff_srv.html:32
 #: machines/templates/machines/machine.html:152
 msgid "Service"
@@ -1088,10 +1105,19 @@ msgstr "Port"
 msgid "Target"
 msgstr "Cible"
 
+#: machines/templates/machines/aff_sshfp.html:31
+msgid "SSH public key"
+msgstr "Clé publique SSH"
+
 #: machines/templates/machines/aff_sshfp.html:32
 msgid "Algorithm used"
 msgstr "Algorithme utilisé"
 
+#: machines/templates/machines/aff_sshfp.html:33
+#: machines/templates/machines/aff_vlan.html:35
+msgid "Comment"
+msgstr "Commentaire"
+
 #: machines/templates/machines/aff_vlan.html:33
 msgid "ID"
 msgstr "ID"
@@ -1115,6 +1141,7 @@ msgstr ""
 "( %(objet)s ) ?"
 
 #: machines/templates/machines/delete.html:36
+#: machines/templates/machines/edit_portlist.html:52
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1142,137 +1169,133 @@ msgstr "Machines"
 msgid "Add a port"
 msgstr "Ajouter un port"
 
-#: machines/templates/machines/edit_portlist.html:53
-msgid "Create or edit"
-msgstr "Créer ou modifier"
-
 #: machines/templates/machines/index_alias.html:32
 msgid "List of the aliases of the interface"
 msgstr "Liste des alias de l'interface"
 
 #: machines/templates/machines/index_alias.html:34
-msgid " Add an alias"
-msgstr " Ajouter un alias"
+msgid "Add an alias"
+msgstr "Ajouter un alias"
 
 #: machines/templates/machines/index_alias.html:36
-msgid " Delete one or several aliases"
-msgstr " Supprimer un ou plusieurs alias"
+msgid "Delete one or several aliases"
+msgstr "Supprimer un ou plusieurs alias"
 
 #: machines/templates/machines/index_extension.html:33
 msgid "List of extensions"
 msgstr "Liste des extensions"
 
-#: machines/templates/machines/index_extension.html:37
-msgid " Add an extension"
-msgstr " Ajouter une extension"
+#: machines/templates/machines/index_extension.html:36
+msgid "Add an extension"
+msgstr "Ajouter une extension"
 
-#: machines/templates/machines/index_extension.html:40
-msgid " Delete one or several extensions"
-msgstr " Supprimer une ou plusieurs extensions"
+#: machines/templates/machines/index_extension.html:39
+msgid "Delete one or several extensions"
+msgstr "Supprimer une ou plusieurs extensions"
 
-#: machines/templates/machines/index_extension.html:44
+#: machines/templates/machines/index_extension.html:43
 msgid "List of SOA records"
 msgstr "Liste des enregistrements SOA"
 
-#: machines/templates/machines/index_extension.html:47
-msgid " Add an SOA record"
-msgstr " Ajouter un enregistrement SOA"
+#: machines/templates/machines/index_extension.html:46
+msgid "Add an SOA record"
+msgstr "Ajouter un enregistrement SOA"
 
-#: machines/templates/machines/index_extension.html:51
-msgid " Delete one or several SOA records"
-msgstr " Supprimer un ou plusieurs enregistrements SOA"
+#: machines/templates/machines/index_extension.html:50
+msgid "Delete one or several SOA records"
+msgstr "Supprimer un ou plusieurs enregistrements SOA"
 
-#: machines/templates/machines/index_extension.html:55
+#: machines/templates/machines/index_extension.html:54
 msgid "List of MX records"
 msgstr "Liste des enregistrements MX"
 
-#: machines/templates/machines/index_extension.html:58
-msgid " Add an MX record"
-msgstr " Ajouter un enregistrement MX"
+#: machines/templates/machines/index_extension.html:57
+msgid "Add an MX record"
+msgstr "Ajouter un enregistrement MX"
 
-#: machines/templates/machines/index_extension.html:62
-msgid " Delete one or several MX records"
-msgstr " Supprimer un ou plusieurs enregistrements MX"
+#: machines/templates/machines/index_extension.html:61
+msgid "Delete one or several MX records"
+msgstr "Supprimer un ou plusieurs enregistrements MX"
 
-#: machines/templates/machines/index_extension.html:66
+#: machines/templates/machines/index_extension.html:65
 msgid "List of NS records"
 msgstr "Liste des enregistrements NS"
 
-#: machines/templates/machines/index_extension.html:69
-msgid " Add an NS record"
-msgstr " Ajouter un enregistrement NS"
+#: machines/templates/machines/index_extension.html:68
+msgid "Add an NS record"
+msgstr "Ajouter un enregistrement NS"
 
-#: machines/templates/machines/index_extension.html:73
-msgid " Delete one or several NS records"
-msgstr " Supprimer un ou plusieurs enregistrements NS"
+#: machines/templates/machines/index_extension.html:72
+msgid "Delete one or several NS records"
+msgstr "Supprimer un ou plusieurs enregistrements NS"
 
-#: machines/templates/machines/index_extension.html:77
+#: machines/templates/machines/index_extension.html:76
 msgid "List of TXT records"
 msgstr "Liste des enregistrements TXT"
 
-#: machines/templates/machines/index_extension.html:80
-msgid " Add a TXT record"
-msgstr " Ajouter un enregistrement TXT"
+#: machines/templates/machines/index_extension.html:79
+msgid "Add a TXT record"
+msgstr "Ajouter un enregistrement TXT"
 
-#: machines/templates/machines/index_extension.html:84
-msgid " Delete one or several TXT records"
-msgstr " Supprimer un ou plusieurs enregistrements TXT"
+#: machines/templates/machines/index_extension.html:83
+msgid "Delete one or several TXT records"
+msgstr "Supprimer un ou plusieurs enregistrements TXT"
 
-#: machines/templates/machines/index_extension.html:88
+#: machines/templates/machines/index_extension.html:87
 msgid "List of DNAME records"
 msgstr "Liste des enregistrements DNAME"
 
-#: machines/templates/machines/index_extension.html:91
-msgid " Add a DNAME record"
-msgstr " Ajouter un enregistrement DNAME"
+#: machines/templates/machines/index_extension.html:90
+msgid "Add a DNAME record"
+msgstr "Ajouter un enregistrement DNAME"
 
-#: machines/templates/machines/index_extension.html:95
-msgid " Delete one or several DNAME records"
-msgstr " Supprimer un ou plusieurs enregistrements DNAME"
+#: machines/templates/machines/index_extension.html:94
+msgid "Delete one or several DNAME records"
+msgstr "Supprimer un ou plusieurs enregistrements DNAME"
 
-#: machines/templates/machines/index_extension.html:99
+#: machines/templates/machines/index_extension.html:98
 msgid "List of SRV records"
 msgstr "Liste des enregistrements SRV"
 
-#: machines/templates/machines/index_extension.html:102
-msgid " Add an SRV record"
-msgstr " Ajouter un enregistrement SRV"
+#: machines/templates/machines/index_extension.html:101
+msgid "Add an SRV record"
+msgstr "Ajouter un enregistrement SRV"
 
-#: machines/templates/machines/index_extension.html:106
-msgid " Delete one or several SRV records"
-msgstr " Supprimer un ou plusieurs enregistrements SRV"
+#: machines/templates/machines/index_extension.html:105
+msgid "Delete one or several SRV records"
+msgstr "Supprimer un ou plusieurs enregistrements SRV"
 
 #: machines/templates/machines/index_iptype.html:33
 msgid "List of IP types"
 msgstr "Liste des types d'IP"
 
 #: machines/templates/machines/index_iptype.html:36
-msgid " Add an IP type"
-msgstr " Ajouter un type d'IP"
+msgid "Add an IP type"
+msgstr "Ajouter un type d'IP"
 
 #: machines/templates/machines/index_iptype.html:40
-msgid " Delete one or several IP types"
-msgstr " Supprimer un ou plusieurs types d'IP"
+msgid "Delete one or several IP types"
+msgstr "Supprimer un ou plusieurs types d'IP"
 
 #: machines/templates/machines/index_ipv6.html:33
 msgid "List of the IPv6 addresses of the interface"
 msgstr "Liste des adresses IPv6 de l'interface"
 
 #: machines/templates/machines/index_ipv6.html:36
-msgid " Add an IPv6 address"
-msgstr " Ajouter une adresse IPv6"
+msgid "Add an IPv6 address"
+msgstr "Ajouter une adresse IPv6"
 
 #: machines/templates/machines/index_machinetype.html:34
 msgid "List of machine types"
 msgstr "Liste des types de machine"
 
 #: machines/templates/machines/index_machinetype.html:37
-msgid " Add a machine type"
-msgstr " Ajouter un type de machine"
+msgid "Add a machine type"
+msgstr "Ajouter un type de machine"
 
 #: machines/templates/machines/index_machinetype.html:41
-msgid " Delete one or several machine types"
-msgstr " Supprimer un ou plusieurs types de machine"
+msgid "Delete one or several machine types"
+msgstr "Supprimer un ou plusieurs types de machine"
 
 #: machines/templates/machines/index_nas.html:34
 msgid "List of NAS devices"
@@ -1290,20 +1313,20 @@ msgstr ""
 "NAS."
 
 #: machines/templates/machines/index_nas.html:38
-msgid " Add a NAS device type"
-msgstr " Ajouter un type de dispositif NAS"
+msgid "Add a NAS device type"
+msgstr "Ajouter un type de dispositif NAS"
 
 #: machines/templates/machines/index_nas.html:42
-msgid " Delete one or several NAS device types"
-msgstr " Supprimer un ou plusieurs types de dispositif NAS"
+msgid "Delete one or several NAS device types"
+msgstr "Supprimer un ou plusieurs types de dispositif NAS"
 
 #: machines/templates/machines/index_portlist.html:11
 msgid "List of ports configurations"
 msgstr "Liste des configurations de ports"
 
 #: machines/templates/machines/index_portlist.html:14
-msgid " Add a configuration"
-msgstr " Ajouter une configuration"
+msgid "Add a configuration"
+msgstr "Ajouter une configuration"
 
 #: machines/templates/machines/index_portlist.html:21
 msgid "TCP (input)"
@@ -1326,24 +1349,24 @@ msgid "List of roles"
 msgstr "Liste des rôles"
 
 #: machines/templates/machines/index_role.html:36
-msgid " Add a role"
-msgstr " Ajouter un rôle"
+msgid "Add a role"
+msgstr "Ajouter un rôle"
 
 #: machines/templates/machines/index_role.html:39
-msgid " Delete one or several roles"
-msgstr " Supprimer un ou plusieurs rôles"
+msgid "Delete one or several roles"
+msgstr "Supprimer un ou plusieurs rôles"
 
 #: machines/templates/machines/index_service.html:33
 msgid "List of services"
 msgstr "Liste des services"
 
 #: machines/templates/machines/index_service.html:36
-msgid " Add a service"
-msgstr " Ajouter un service"
+msgid "Add a service"
+msgstr "Ajouter un service"
 
 #: machines/templates/machines/index_service.html:39
-msgid " Delete one or several services"
-msgstr " Supprimer un ou plusieurs services"
+msgid "Delete one or several services"
+msgstr "Supprimer un ou plusieurs services"
 
 #: machines/templates/machines/index_service.html:42
 msgid "States of servers"
@@ -1354,20 +1377,20 @@ msgid "SSH fingerprints"
 msgstr "Empreintes SSH"
 
 #: machines/templates/machines/index_sshfp.html:34
-msgid " Add an SSH fingerprint"
-msgstr " Ajouter une empreinte SSH"
+msgid "Add an SSH fingerprint"
+msgstr "Ajouter une empreinte SSH"
 
 #: machines/templates/machines/index_vlan.html:33
 msgid "List of VLANs"
 msgstr "Liste des VLANs"
 
 #: machines/templates/machines/index_vlan.html:36
-msgid " Add a VLAN"
-msgstr " Ajouter un VLAN"
+msgid "Add a VLAN"
+msgstr "Ajouter un VLAN"
 
 #: machines/templates/machines/index_vlan.html:39
-msgid " Delete one or several VLANs"
-msgstr " Supprimer un ou plusieurs VLANs"
+msgid "Delete one or several VLANs"
+msgstr "Supprimer un ou plusieurs VLANs"
 
 #: machines/templates/machines/machine.html:92
 msgid "Machine"
@@ -1409,92 +1432,76 @@ msgstr "Rôles de serveur"
 msgid "Ports openings"
 msgstr "Ouvertures de ports"
 
-#: machines/views.py:155
+#: machines/views.py:153
 msgid "Select a machine type first."
 msgstr "Sélectionnez un type de machine d'abord."
 
-#: machines/views.py:257
+#: machines/views.py:244
 msgid "The machine was created."
 msgstr "La machine a été créée."
 
-#: machines/views.py:269
-msgid "Create a machine"
-msgstr "Créer une machine"
+#: machines/views.py:253 machines/views.py:348 machines/views.py:389
+#: machines/views.py:447 machines/views.py:501 machines/views.py:566
+#: machines/views.py:629 machines/views.py:691 machines/views.py:743
+#: machines/views.py:795 machines/views.py:847 machines/views.py:902
+#: machines/views.py:954 machines/views.py:1011 machines/views.py:1072
+#: machines/views.py:1124 machines/views.py:1190 machines/views.py:1242
+msgid "Add"
+msgstr "Ajouter"
 
-#: machines/views.py:309
+#: machines/views.py:285
 msgid "The machine was edited."
 msgstr "La machine a été modifiée."
 
-#: machines/views.py:321 machines/views.py:445 machines/views.py:511
-#: machines/views.py:567 machines/views.py:629 machines/views.py:690
-#: machines/views.py:748 machines/views.py:805 machines/views.py:862
-#: machines/views.py:919 machines/views.py:977 machines/views.py:1034
-#: machines/views.py:1106 machines/views.py:1169 machines/views.py:1226
-#: machines/views.py:1292 machines/views.py:1349
-msgid "Edit"
-msgstr "Modifier"
-
-#: machines/views.py:334
+#: machines/views.py:312
 msgid "The machine was deleted."
 msgstr "La machine a été supprimée."
 
-#: machines/views.py:363
+#: machines/views.py:338
 msgid "The interface was created."
 msgstr "L'interface a été créée."
 
-#: machines/views.py:390
+#: machines/views.py:364
 msgid "The interface was deleted."
 msgstr "L'interface a été supprimée."
 
-#: machines/views.py:415
+#: machines/views.py:384
 msgid "The IPv6 addresses list was created."
 msgstr "La liste d'adresses IPv6 a été créée."
 
-#: machines/views.py:421
-msgid "Create an IPv6 addresses list"
-msgstr "Créer une liste d'adresses IPv6"
-
-#: machines/views.py:439
+#: machines/views.py:405
 msgid "The IPv6 addresses list was edited."
 msgstr "La liste d'adresses IPv6 a été modifiée."
 
-#: machines/views.py:458
+#: machines/views.py:424
 msgid "The IPv6 addresses list was deleted."
 msgstr "La liste d'adresses IPv6 a été supprimée."
 
-#: machines/views.py:482
+#: machines/views.py:442
 msgid "The SSHFP record was created."
 msgstr "L'enregistrement SSHFP a été créé."
 
-#: machines/views.py:488
-msgid "Create a SSHFP record"
-msgstr "Créer un enregistrement SSHFP"
-
-#: machines/views.py:505
+#: machines/views.py:461
 msgid "The SSHFP record was edited."
 msgstr "L'enregistrement SSHFP a été modifié."
 
-#: machines/views.py:524
+#: machines/views.py:480
 msgid "The SSHFP record was deleted."
 msgstr "L'enregistrement SSHFP a été supprimé."
 
-#: machines/views.py:545
+#: machines/views.py:498
 msgid "The IP type was created."
 msgstr "Le type d'IP a été créé."
 
-#: machines/views.py:548
-msgid "Create an IP type"
-msgstr "Créer un type d'IP"
-
-#: machines/views.py:564
+#: machines/views.py:517
 msgid "The IP type was edited."
 msgstr "Le type d'IP a été modifié."
 
-#: machines/views.py:583
+#: machines/views.py:536
 msgid "The IP type was deleted."
 msgstr "Le type d'IP a été supprimé."
 
-#: machines/views.py:587
+#: machines/views.py:542
 #, python-format
 msgid ""
 "The IP type %s is assigned to at least one machine, you can't delete it."
@@ -1502,31 +1509,27 @@ msgstr ""
 "Le type d'IP %s est assigné à au moins une machine, vous ne pouvez pas le "
 "supprimer."
 
-#: machines/views.py:592 machines/views.py:654 machines/views.py:715
-#: machines/views.py:772 machines/views.py:829 machines/views.py:886
-#: machines/views.py:944 machines/views.py:1001 machines/views.py:1058
-#: machines/views.py:1136 machines/views.py:1193 machines/views.py:1250
-#: machines/views.py:1316 machines/views.py:1373
+#: machines/views.py:550 machines/views.py:613 machines/views.py:675
+#: machines/views.py:729 machines/views.py:781 machines/views.py:833
+#: machines/views.py:886 machines/views.py:940 machines/views.py:992
+#: machines/views.py:1056 machines/views.py:1110 machines/views.py:1165
+#: machines/views.py:1228 machines/views.py:1280
 msgid "Delete"
 msgstr "Supprimer"
 
-#: machines/views.py:605
+#: machines/views.py:563
 msgid "The machine type was created."
 msgstr "Le type de machine a été créé."
 
-#: machines/views.py:608
-msgid "Create a machine type"
-msgstr "Créer un type de machine"
-
-#: machines/views.py:626
+#: machines/views.py:580
 msgid "The machine type was edited."
 msgstr "Le type de machine a été modifié."
 
-#: machines/views.py:645
+#: machines/views.py:599
 msgid "The machine type was deleted."
 msgstr "Le type de machine a été supprimé."
 
-#: machines/views.py:649
+#: machines/views.py:605
 #, python-format
 msgid ""
 "The machine type %s is assigned to at least one machine, you can't delete it."
@@ -1534,23 +1537,19 @@ msgstr ""
 "Le type de machine %s est assigné à au moins un machine, vous ne pouvez pas "
 "le supprimer."
 
-#: machines/views.py:667
+#: machines/views.py:626
 msgid "The extension was created."
 msgstr "L'extension a été créée."
 
-#: machines/views.py:670
-msgid "Create an extension"
-msgstr "Créer une extension"
-
-#: machines/views.py:687
+#: machines/views.py:643
 msgid "The extension was edited."
 msgstr "L'extension a été modifiée."
 
-#: machines/views.py:706
+#: machines/views.py:662
 msgid "The extension was deleted."
 msgstr "L'extension a été supprimée."
 
-#: machines/views.py:710
+#: machines/views.py:668
 #, python-format
 msgid ""
 "The extension %s is assigned to at least one machine type, you can't delete "
@@ -1559,260 +1558,214 @@ msgstr ""
 "L'extension %s est assignée à au moins un type de machine, vous ne pouvez "
 "pas le supprimer."
 
-#: machines/views.py:728
+#: machines/views.py:688
 msgid "The SOA record was created."
 msgstr "L'enregistrement SOA a été créé."
 
-#: machines/views.py:731
-msgid "Create an SOA record"
-msgstr "Créer un enregistrement SOA"
-
-#: machines/views.py:745
+#: machines/views.py:705
 msgid "The SOA record was edited."
 msgstr "L'enregistrement SOA a été modifié."
 
-#: machines/views.py:764
+#: machines/views.py:722
 msgid "The SOA record was deleted."
 msgstr "L'enregistrement SOA a été supprimé."
 
-#: machines/views.py:768
+#: machines/views.py:725
 #, python-format
 msgid "Error: the SOA record %s can't be deleted."
 msgstr "Erreur : l'enregistrement SOA %s ne peut pas être supprimé."
 
-#: machines/views.py:785
+#: machines/views.py:740
 msgid "The MX record was created."
 msgstr "L'enregistrement MX a été créé."
 
-#: machines/views.py:788
-msgid "Create an MX record"
-msgstr "Créer un enregistrement MX"
-
-#: machines/views.py:802
+#: machines/views.py:757
 msgid "The MX record was edited."
 msgstr "L'enregistrement MX a été modifié."
 
-#: machines/views.py:821
+#: machines/views.py:774
 msgid "The MX record was deleted."
 msgstr "L'enregistrement MX a été supprimé."
 
-#: machines/views.py:825
+#: machines/views.py:777
 #, python-format
 msgid "Error: the MX record %s can't be deleted."
 msgstr "Erreur : l'enregistrement MX %s ne peut pas être supprimé."
 
-#: machines/views.py:842
+#: machines/views.py:792
 msgid "The NS record was created."
 msgstr "L'enregistrement NS a été créé."
 
-#: machines/views.py:845
-msgid "Create an NS record"
-msgstr "Créer un enregistrement NS"
-
-#: machines/views.py:859
+#: machines/views.py:809
 msgid "The NS record was edited."
 msgstr "L'enregistrement NS a été modifié."
 
-#: machines/views.py:878
+#: machines/views.py:826
 msgid "The NS record was deleted."
 msgstr "L'enregistrement NS a été supprimé."
 
-#: machines/views.py:882
+#: machines/views.py:829
 #, python-format
 msgid "Error: the NS record %s can't be deleted."
 msgstr "Erreur : l'enregistrement NS %s ne peut pas être supprimé."
 
-#: machines/views.py:899
+#: machines/views.py:844
 msgid "The DNAME record was created."
 msgstr "L'enregistrement DNAME a été créé."
 
-#: machines/views.py:902
-msgid "Create a DNAME record"
-msgstr "Créer un enregistrement DNAME"
-
-#: machines/views.py:916
+#: machines/views.py:861
 msgid "The DNAME record was edited."
 msgstr "L'enregistrement DNAME a été modifié."
 
-#: machines/views.py:935
+#: machines/views.py:878
 msgid "The DNAME record was deleted."
 msgstr "L'enregistrement DNAME a été supprimé."
 
-#: machines/views.py:939
+#: machines/views.py:882
 #, python-format
 msgid "Error: the DNAME record %s can't be deleted."
 msgstr "Erreur : l'enregistrement DNAME %s ne peut pas être supprimé."
 
-#: machines/views.py:957
+#: machines/views.py:899
 msgid "The TXT record was created."
 msgstr "L'enregistrement TXT a été créé."
 
-#: machines/views.py:960
-msgid "Create a TXT record"
-msgstr "Créer un enregistrement TXT"
-
-#: machines/views.py:974
+#: machines/views.py:916
 msgid "The TXT record was edited."
 msgstr "L'enregistrement TXT a été modifié."
 
-#: machines/views.py:993
+#: machines/views.py:933
 msgid "The TXT record was deleted."
 msgstr "L'enregistrement TXT a été supprimé."
 
-#: machines/views.py:997
+#: machines/views.py:936
 #, python-format
 msgid "Error: the TXT record %s can't be deleted."
 msgstr "Erreur : l'enregistrement %s ne peut pas être supprimé."
 
-#: machines/views.py:1014
+#: machines/views.py:951
 msgid "The SRV record was created."
 msgstr "L'enregistrement SRV a été créé."
 
-#: machines/views.py:1017
-msgid "Create an SRV record"
-msgstr "Créer un enregistrement SRV"
-
-#: machines/views.py:1031
+#: machines/views.py:968
 msgid "The SRV record was edited."
 msgstr "L'enregistrement SRV a été modifié."
 
-#: machines/views.py:1050
+#: machines/views.py:985
 msgid "The SRV record was deleted."
 msgstr "L'enregistrement SRV a été supprimé."
 
-#: machines/views.py:1054
+#: machines/views.py:988
 #, python-format
 msgid "Error: the SRV record %s can't be deleted."
 msgstr "Erreur : l'enregistrement SRV %s ne peut pas être supprimé."
 
-#: machines/views.py:1074
+#: machines/views.py:1006
 msgid "The alias was created."
 msgstr "L'alias a été créé."
 
-#: machines/views.py:1080
-msgid "Create an alias"
-msgstr "Créer un alias"
-
-#: machines/views.py:1098
+#: machines/views.py:1025
 msgid "The alias was edited."
 msgstr "L'alias a été modifié."
 
-#: machines/views.py:1124
+#: machines/views.py:1047
 #, python-format
 msgid "The alias %s was deleted."
 msgstr "L'alias %s a été supprimé."
 
-#: machines/views.py:1129
+#: machines/views.py:1050
 #, python-format
 msgid "Error: the alias %s can't be deleted."
 msgstr "Erreur : l'alias %s ne peut pas être supprimé."
 
-#: machines/views.py:1149
+#: machines/views.py:1069
 msgid "The role was created."
 msgstr "Le rôle a été créé."
 
-#: machines/views.py:1152
-msgid "Create a role"
-msgstr "Créer un rôle"
-
-#: machines/views.py:1166
+#: machines/views.py:1086
 msgid "The role was edited."
 msgstr "Le rôle a été modifié."
 
-#: machines/views.py:1185
+#: machines/views.py:1103
 msgid "The role was deleted."
 msgstr "Le rôle a été supprimé."
 
-#: machines/views.py:1189
+#: machines/views.py:1106
 #, python-format
 msgid "Error: the role %s can't be deleted."
 msgstr "Erreur : le rôle %s ne peut pas être supprimé."
 
-#: machines/views.py:1206
+#: machines/views.py:1121
 msgid "The service was created."
 msgstr "Le service a été créé."
 
-#: machines/views.py:1209
-msgid "Create a service"
-msgstr "Créer un service"
-
-#: machines/views.py:1223
+#: machines/views.py:1138
 msgid "The service was edited."
 msgstr "Le service a été modifié."
 
-#: machines/views.py:1242
+#: machines/views.py:1157
 msgid "The service was deleted."
 msgstr "Le service a été supprimé."
 
-#: machines/views.py:1246
+#: machines/views.py:1161
 #, python-format
 msgid "Error: the service %s can't be deleted."
 msgstr "Erreur : le service %s ne peut pas être supprimé."
 
-#: machines/views.py:1272
+#: machines/views.py:1187
 msgid "The VLAN was created."
 msgstr "Le VLAN a été créé."
 
-#: machines/views.py:1275
-msgid "Create a VLAN"
-msgstr "Créer un VLAN"
-
-#: machines/views.py:1289
+#: machines/views.py:1204
 msgid "The VLAN was edited."
 msgstr "Le VLAN a été modifié."
 
-#: machines/views.py:1308
+#: machines/views.py:1221
 msgid "The VLAN was deleted."
 msgstr "Le VLAN a été supprimé."
 
-#: machines/views.py:1312
+#: machines/views.py:1224
 #, python-format
 msgid "Error: the VLAN %s can't be deleted."
 msgstr "Erreur : le VLAN %s ne peut pas être supprimé."
 
-#: machines/views.py:1329
+#: machines/views.py:1239
 msgid "The NAS device was created."
 msgstr "Le dispositif NAS a été créé."
 
-#: machines/views.py:1332
-msgid "Create a NAS device"
-msgstr "Créer un dispositif NAS"
-
-#: machines/views.py:1346
+#: machines/views.py:1256
 msgid "The NAS device was edited."
 msgstr "Le dispositif NAS a été modifié."
 
-#: machines/views.py:1365
+#: machines/views.py:1273
 msgid "The NAS device was deleted."
 msgstr "Le dispositif NAS a été supprimé."
 
-#: machines/views.py:1369
+#: machines/views.py:1276
 #, python-format
 msgid "Error: the NAS device %s can't be deleted."
 msgstr "Erreur : le dispositif NAS %s ne peut pas être supprimé."
 
-#: machines/views.py:1625
+#: machines/views.py:1502
 msgid "The ports list was edited."
 msgstr "La liste de ports a été modifiée."
 
-#: machines/views.py:1639
+#: machines/views.py:1516
 msgid "The ports list was deleted."
 msgstr "La liste de ports a été supprimée."
 
-#: machines/views.py:1664
+#: machines/views.py:1541
 msgid "The ports list was created."
 msgstr "La liste de ports a été créée."
 
-#: machines/views.py:1682
-msgid "Warning: the IPv4 isn't public, the opening won't have effect in v4."
+#: machines/views.py:1561
+msgid ""
+"Warning: the IP address is not public, the opening won't have any effect in "
+"v4."
 msgstr ""
-"Attention : l'adresse IPv4 n'est pas publique, l'ouverture n'aura pas "
-"d'effet en v4."
+"Attention : l'adresse IP n'est pas publique, l'ouverture n'aura pas d'effet "
+"en v4."
 
-#: machines/views.py:1692
+#: machines/views.py:1572
 msgid "The ports configuration was edited."
 msgstr "La configuration de ports a été modifiée."
-
-#: machines/views.py:1695
-msgid "Edit the configuration"
-msgstr "Modifier la configuration"
diff --git a/machines/migrations/0106_auto_20191120_0159.py b/machines/migrations/0106_auto_20191120_0159.py
new file mode 100644
index 00000000..5526a818
--- /dev/null
+++ b/machines/migrations/0106_auto_20191120_0159.py
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-11-20 00:59
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0105_dname_ttl'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='domain',
+            options={'permissions': (('view_domain', 'Can view a domain object'), ('change_ttl', 'Can change the TTL of a domain object')), 'verbose_name': 'domain', 'verbose_name_plural': 'domains'},
+        ),
+        migrations.AlterField(
+            model_name='extension',
+            name='dnssec',
+            field=models.BooleanField(default=False, help_text='Should the zone be signed with DNSSEC.'),
+        ),
+        migrations.AlterField(
+            model_name='extension',
+            name='name',
+            field=models.CharField(help_text='Zone name, must begin with a dot (.example.org).', max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='extension',
+            name='origin',
+            field=models.ForeignKey(blank=True, help_text='A record associated with the zone.', null=True, on_delete=django.db.models.deletion.PROTECT, to='machines.IpList'),
+        ),
+        migrations.AlterField(
+            model_name='extension',
+            name='origin_v6',
+            field=models.GenericIPAddressField(blank=True, help_text='AAAA record associated with the zone.', null=True, protocol='IPv6'),
+        ),
+        migrations.AlterField(
+            model_name='iptype',
+            name='domaine_ip_netmask',
+            field=models.IntegerField(default=24, help_text="Netmask for the domain's IPv4 range.", validators=[django.core.validators.MaxValueValidator(31), django.core.validators.MinValueValidator(8)]),
+        ),
+        migrations.AlterField(
+            model_name='iptype',
+            name='domaine_ip_network',
+            field=models.GenericIPAddressField(blank=True, help_text="Network containing the domain's IPv4 range (optional).", null=True, protocol='IPv4'),
+        ),
+        migrations.AlterField(
+            model_name='iptype',
+            name='reverse_v4',
+            field=models.BooleanField(default=False, help_text='Enable reverse DNS for IPv4.'),
+        ),
+        migrations.AlterField(
+            model_name='iptype',
+            name='reverse_v6',
+            field=models.BooleanField(default=False, help_text='Enable reverse DNS for IPv6.'),
+        ),
+        migrations.AlterField(
+            model_name='machine',
+            name='name',
+            field=models.CharField(blank=True, help_text='Optional.', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='soa',
+            name='expire',
+            field=models.PositiveIntegerField(default=3600000, help_text='Seconds before the secondary DNS stop answering requests in case of primary DNS timeout.'),
+        ),
+        migrations.AlterField(
+            model_name='soa',
+            name='mail',
+            field=models.EmailField(help_text='Contact email address for the zone.', max_length=254),
+        ),
+        migrations.AlterField(
+            model_name='soa',
+            name='refresh',
+            field=models.PositiveIntegerField(default=86400, help_text='Seconds before the secondary DNS have to ask the primary DNS serial to detect a modification.'),
+        ),
+        migrations.AlterField(
+            model_name='soa',
+            name='retry',
+            field=models.PositiveIntegerField(default=7200, help_text='Seconds before the secondary DNS ask the serial again in case of a primary DNS timeout.'),
+        ),
+        migrations.AlterField(
+            model_name='soa',
+            name='ttl',
+            field=models.PositiveIntegerField(default=172800, help_text='Time To Live.'),
+        ),
+        migrations.AlterField(
+            model_name='srv',
+            name='port',
+            field=models.PositiveIntegerField(help_text='TCP/UDP port.', validators=[django.core.validators.MaxValueValidator(65535)]),
+        ),
+        migrations.AlterField(
+            model_name='srv',
+            name='priority',
+            field=models.PositiveIntegerField(default=0, help_text='Priority of the target server (positive integer value, the lower it is, the more the server will be used if available).', validators=[django.core.validators.MaxValueValidator(65535)]),
+        ),
+        migrations.AlterField(
+            model_name='srv',
+            name='target',
+            field=models.ForeignKey(help_text='Target server.', on_delete=django.db.models.deletion.PROTECT, to='machines.Domain'),
+        ),
+        migrations.AlterField(
+            model_name='srv',
+            name='ttl',
+            field=models.PositiveIntegerField(default=172800, help_text='Time To Live.'),
+        ),
+        migrations.AlterField(
+            model_name='srv',
+            name='weight',
+            field=models.PositiveIntegerField(default=0, help_text='Relative weight for records with the same priority (integer value between 0 and 65535).', validators=[django.core.validators.MaxValueValidator(65535)]),
+        ),
+        migrations.AlterField(
+            model_name='sshfp',
+            name='comment',
+            field=models.CharField(blank=True, help_text='Comment.', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='sshfp',
+            name='pub_key_entry',
+            field=models.TextField(help_text='SSH public key.', max_length=2048),
+        ),
+        migrations.AlterField(
+            model_name='vlan',
+            name='igmp',
+            field=models.BooleanField(default=False, help_text='v4 multicast management.'),
+        ),
+        migrations.AlterField(
+            model_name='vlan',
+            name='mld',
+            field=models.BooleanField(default=False, help_text='v6 multicast management.'),
+        ),
+    ]
diff --git a/machines/models.py b/machines/models.py
index 8b83e256..7b548cfb 100644
--- a/machines/models.py
+++ b/machines/models.py
@@ -68,7 +68,7 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
 
     user = models.ForeignKey("users.User", on_delete=models.CASCADE)
     name = models.CharField(
-        max_length=255, help_text=_("Optional"), blank=True, null=True
+        max_length=255, help_text=_("Optional."), blank=True, null=True
     )
     active = models.BooleanField(default=True)
 
@@ -157,7 +157,8 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
             if user != user_request:
                 return (
                     False,
-                    _("You don't have the right to add a machine" " to another user."),
+                    _("You don't have the right to add a machine to another"
+                      " user."),
                     ("machines.add_machine",),
                 )
             if user.user_interfaces().count() >= max_lambdauser_interfaces:
@@ -185,7 +186,8 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
             if not (user_request.has_perm("machines.change_interface") and can_user):
                 return (
                     False,
-                    _("You don't have the right to edit a machine" " of another user."),
+                    _("You don't have the right to edit a machine of another"
+                      " user."),
                     ("machines.change_interface",) + permissions,
                 )
         return True, None, None
@@ -223,7 +225,8 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
         ):
             return (
                 False,
-                _("You don't have the right to view other machines" " than yours."),
+                _("You don't have the right to view other machines than"
+                  " yours."),
                 ("machines.view_machine",),
             )
         return True, None, None
@@ -358,22 +361,22 @@ class IpType(RevMixin, AclMixin, models.Model):
         protocol="IPv4",
         null=True,
         blank=True,
-        help_text=_("Network containing the domain's IPv4 range (optional)"),
+        help_text=_("Network containing the domain's IPv4 range (optional)."),
     )
     domaine_ip_netmask = models.IntegerField(
         default=24,
         validators=[MaxValueValidator(31), MinValueValidator(8)],
-        help_text=_("Netmask for the domain's IPv4 range"),
+        help_text=_("Netmask for the domain's IPv4 range."),
     )
     reverse_v4 = models.BooleanField(
-        default=False, help_text=_("Enable reverse DNS for IPv4")
+        default=False, help_text=_("Enable reverse DNS for IPv4.")
     )
     prefix_v6 = models.GenericIPAddressField(protocol="IPv6", null=True, blank=True)
     prefix_v6_length = models.IntegerField(
         default=64, validators=[MaxValueValidator(128), MinValueValidator(0)]
     )
     reverse_v6 = models.BooleanField(
-        default=False, help_text=_("Enable reverse DNS for IPv6")
+        default=False, help_text=_("Enable reverse DNS for IPv6.")
     )
     vlan = models.ForeignKey("Vlan", on_delete=models.PROTECT, blank=True, null=True)
     ouverture_ports = models.ForeignKey("OuverturePortList", blank=True, null=True)
@@ -553,7 +556,8 @@ class IpType(RevMixin, AclMixin, models.Model):
         for element in IpType.objects.all().exclude(pk=self.pk):
             if not self.ip_set.isdisjoint(element.ip_set):
                 raise ValidationError(
-                    _("The specified range is not disjoint" " from existing ranges.")
+                    _("The specified range is not disjoint from existing"
+                      " ranges.")
                 )
         # On formate le prefix v6
         if self.prefix_v6:
@@ -604,8 +608,8 @@ class Vlan(RevMixin, AclMixin, models.Model):
     arp_protect = models.BooleanField(default=False)
     dhcp_snooping = models.BooleanField(default=False)
     dhcpv6_snooping = models.BooleanField(default=False)
-    igmp = models.BooleanField(default=False, help_text=_("v4 multicast management"))
-    mld = models.BooleanField(default=False, help_text=_("v6 multicast management"))
+    igmp = models.BooleanField(default=False, help_text=_("v4 multicast management."))
+    mld = models.BooleanField(default=False, help_text=_("v6 multicast management."))
 
     class Meta:
         permissions = (("view_vlan", _("Can view a VLAN object")),)
@@ -653,30 +657,30 @@ class SOA(RevMixin, AclMixin, models.Model):
     """
 
     name = models.CharField(max_length=255)
-    mail = models.EmailField(help_text=_("Contact email address for the zone"))
+    mail = models.EmailField(help_text=_("Contact email address for the zone."))
     refresh = models.PositiveIntegerField(
         default=86400,  # 24 hours
         help_text=_(
             "Seconds before the secondary DNS have to ask the primary"
-            " DNS serial to detect a modification"
+            " DNS serial to detect a modification."
         ),
     )
     retry = models.PositiveIntegerField(
         default=7200,  # 2 hours
         help_text=_(
             "Seconds before the secondary DNS ask the serial again in"
-            " case of a primary DNS timeout"
+            " case of a primary DNS timeout."
         ),
     )
     expire = models.PositiveIntegerField(
         default=3600000,  # 1000 hours
         help_text=_(
             "Seconds before the secondary DNS stop answering requests"
-            " in case of primary DNS timeout"
+            " in case of primary DNS timeout."
         ),
     )
     ttl = models.PositiveIntegerField(
-        default=172800, help_text=_("Time to Live")  # 2 days
+        default=172800, help_text=_("Time To Live.")  # 2 days
     )
 
     class Meta:
@@ -732,7 +736,7 @@ class Extension(RevMixin, AclMixin, models.Model):
     name = models.CharField(
         max_length=255,
         unique=True,
-        help_text=_("Zone name, must begin with a dot (.example.org)"),
+        help_text=_("Zone name, must begin with a dot (.example.org)."),
     )
     need_infra = models.BooleanField(default=False)
     origin = models.ForeignKey(
@@ -740,17 +744,17 @@ class Extension(RevMixin, AclMixin, models.Model):
         on_delete=models.PROTECT,
         blank=True,
         null=True,
-        help_text=_("A record associated with the zone"),
+        help_text=_("A record associated with the zone."),
     )
     origin_v6 = models.GenericIPAddressField(
         protocol="IPv6",
         null=True,
         blank=True,
-        help_text=_("AAAA record associated with the zone"),
+        help_text=_("AAAA record associated with the zone."),
     )
     soa = models.ForeignKey("SOA", on_delete=models.CASCADE)
     dnssec = models.BooleanField(
-        default=False, help_text=_("Should the zone be signed with DNSSEC")
+        default=False, help_text=_("Should the zone be signed with DNSSEC.")
     )
 
     class Meta:
@@ -819,7 +823,7 @@ class Extension(RevMixin, AclMixin, models.Model):
         can = user_request.has_perm("machines.use_all_extension")
         return (
             can,
-            _("You cannot use all extensions.") if not can else None,
+            _("You don't have the right to use all extensions.") if not can else None,
             ("machines.use_all_extension",),
         )
 
@@ -943,7 +947,7 @@ class Srv(RevMixin, AclMixin, models.Model):
     )
     extension = models.ForeignKey("Extension", on_delete=models.PROTECT)
     ttl = models.PositiveIntegerField(
-        default=172800, help_text=_("Time to Live")  # 2 days
+        default=172800, help_text=_("Time To Live.")  # 2 days
     )
     priority = models.PositiveIntegerField(
         default=0,
@@ -951,7 +955,7 @@ class Srv(RevMixin, AclMixin, models.Model):
         help_text=_(
             "Priority of the target server (positive integer value,"
             " the lower it is, the more the server will be used if"
-            " available)"
+            " available)."
         ),
     )
     weight = models.PositiveIntegerField(
@@ -959,14 +963,14 @@ class Srv(RevMixin, AclMixin, models.Model):
         validators=[MaxValueValidator(65535)],
         help_text=_(
             "Relative weight for records with the same priority"
-            " (integer value between 0 and 65535)"
+            " (integer value between 0 and 65535)."
         ),
     )
     port = models.PositiveIntegerField(
-        validators=[MaxValueValidator(65535)], help_text=_("TCP/UDP port")
+        validators=[MaxValueValidator(65535)], help_text=_("TCP/UDP port.")
     )
     target = models.ForeignKey(
-        "Domain", on_delete=models.PROTECT, help_text=_("Target server")
+        "Domain", on_delete=models.PROTECT, help_text=_("Target server.")
     )
 
     class Meta:
@@ -1023,10 +1027,10 @@ class SshFp(RevMixin, AclMixin, models.Model):
     )
 
     machine = models.ForeignKey("Machine", on_delete=models.CASCADE)
-    pub_key_entry = models.TextField(help_text=_("SSH public key"), max_length=2048)
+    pub_key_entry = models.TextField(help_text=_("SSH public key."), max_length=2048)
     algo = models.CharField(choices=ALGO, max_length=32)
     comment = models.CharField(
-        help_text=_("Comment"), max_length=255, null=True, blank=True
+        help_text=_("Comment."), max_length=255, null=True, blank=True
     )
 
     @cached_property
@@ -1128,7 +1132,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             oui = mac.oui
             vendor = oui.registration().org
         except NotRegisteredError:
-            vendor = "Unknown vendor"
+            vendor = _("Unknown vendor.")
         return vendor
 
     def sync_ipv6_dhcpv6(self):
@@ -1201,7 +1205,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             self.ipv4 = free_ips[0]
         else:
             raise ValidationError(
-                _("There is no IP address available in the" " slash.")
+                _("There are no IP addresses available in the slash.")
             )
         return
 
@@ -1214,7 +1218,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         """Unassign ipv4 to multiple interfaces"""
         with transaction.atomic(), reversion.create_revision():
             interface_list.update(ipv4=None)
-            reversion.set_comment(_("IPv4 unassigning"))
+            reversion.set_comment("IPv4 unassignment")
 
     @classmethod
     def mass_assign_ipv4(cls, interface_list):
@@ -1222,7 +1226,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             with transaction.atomic(), reversion.create_revision():
                 interface.assign_ipv4()
                 interface.save()
-                reversion.set_comment(_("IPv4 assigning"))
+                reversion.set_comment("IPv4 assignment")
 
     def update_type(self):
         """ Lorsque le machinetype est changé de type d'ip, on réassigne"""
@@ -1267,7 +1271,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         )
         if interfaces_similar and interfaces_similar.first() != self:
             raise ValidationError(
-                _("Mac address already registered in this Machine Type/Subnet")
+                _("MAC address already registered in this machine type/subnet.")
             )
 
     def save(self, *args, **kwargs):
@@ -1276,7 +1280,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         if self.ipv4:
             if self.machine_type.ip_type != self.ipv4.ip_type:
                 raise ValidationError(
-                    _("The IPv4 address and the machine type" " don't match.")
+                    _("The IPv4 address and the machine type don't match.")
                 )
         self.validate_unique()
         super(Interface, self).save(*args, **kwargs)
@@ -1296,7 +1300,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             if not (
                 preferences.models.OptionalMachine.get_cached_value("create_machine")
             ):
-                return False, _("You can't add a machine."), ("machines.add_interface",)
+                return False, _("You don't have the right to add a machine."), ("machines.add_interface",)
             max_lambdauser_interfaces = preferences.models.OptionalMachine.get_cached_value(
                 "max_lambdauser_interfaces"
             )
@@ -1328,7 +1332,7 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         can = user_request.has_perm("machines.change_interface_machine")
         return (
             can,
-            _("Permission required to edit the machine.") if not can else None,
+            _("You don't have the right to edit the machine.") if not can else None,
             ("machines.change_interface_machine",),
         )
 
@@ -1345,7 +1349,8 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             if not (user_request.has_perm("machines.change_interface") and can_user):
                 return (
                     False,
-                    _("You don't have the right to edit a machine of" " another user."),
+                    _("You don't have the right to edit a machine of another"
+                      " user."),
                     ("machines.change_interface",) + permissions,
                 )
         return True, None, None
@@ -1363,7 +1368,8 @@ class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             if not (user_request.has_perm("machines.change_interface") and can_user):
                 return (
                     False,
-                    _("You don't have the right to edit a machine of" " another user."),
+                    _("You don't have the right to edit a machine of another"
+                      " user."),
                     ("machines.change_interface",) + permissions,
                 )
         return True, None, None
@@ -1411,7 +1417,7 @@ class Ipv6List(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             ("view_ipv6list", _("Can view an IPv6 addresses list object")),
             (
                 "change_ipv6list_slaac_ip",
-                _("Can change the SLAAC value of an" " IPv6 addresses list"),
+                _("Can change the SLAAC value of an IPv6 addresses list"),
             ),
         )
         verbose_name = _("IPv6 addresses list")
@@ -1446,7 +1452,7 @@ class Ipv6List(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         can = user_request.has_perm("machines.change_ipv6list_slaac_ip")
         return (
             can,
-            _("Permission required to change the SLAAC value of an IPv6" " address")
+            _("You don't have the right to change the SLAAC value of an IPv6 address.")
             if not can
             else None,
             ("machines.change_ipv6list_slaac_ip",),
@@ -1465,7 +1471,7 @@ class Ipv6List(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             if not (user_request.has_perm("machines.change_ipv6list") and can_user):
                 return (
                     False,
-                    _("You don't have the right to edit a machine of" " another user."),
+                    _("You don't have the right to edit a machine of another user."),
                     ("machines.change_ipv6list",),
                 )
         return True, None, None
@@ -1483,7 +1489,7 @@ class Ipv6List(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
             if not (user_request.has_perm("machines.change_ipv6list") and can_user):
                 return (
                     False,
-                    _("You don't have the right to edit a machine of" " another user."),
+                    _("You don't have the right to edit a machine of another user."),
                     ("machines.change_ipv6list",) + permissions,
                 )
         return True, None, None
@@ -1587,7 +1593,7 @@ class Domain(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         unique_together = (("name", "extension"),)
         permissions = (
             ("view_domain", _("Can view a domain object")),
-            ("change_ttl", _("Can change TTL of a domain object")),
+            ("change_ttl", _("Can change the TTL of a domain object")),
         )
         verbose_name = _("domain")
         verbose_name_plural = _("domains")
@@ -1612,20 +1618,20 @@ class Domain(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         if self.get_extension():
             self.extension = self.get_extension()
         if self.interface_parent and self.cname:
-            raise ValidationError(_("You can't create a both A and CNAME" " record."))
+            raise ValidationError(_("You can't create a both A and CNAME record."))
         if self.cname == self:
             raise ValidationError(
-                _("You can't create a CNAME record pointing" " to itself.")
+                _("You can't create a CNAME record pointing to itself.")
             )
         HOSTNAME_LABEL_PATTERN = re.compile(r"(?!-)[A-Z\d-]+(?<!-)$", re.IGNORECASE)
         dns = self.name.lower()
         if len(dns) > 63:
             raise ValidationError(
-                _("The domain name %s is too long (over 63" " characters).") % dns
+                _("The domain name %s is too long (over 63 characters).") % dns
             )
         if not HOSTNAME_LABEL_PATTERN.match(dns):
             raise ValidationError(
-                _("The domain name %s contains forbidden" " characters.") % dns
+                _("The domain name %s contains forbidden characters.") % dns
             )
         self.validate_unique()
         super(Domain, self).clean()
@@ -1753,7 +1759,8 @@ class Domain(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
         ):
             return (
                 False,
-                _("You don't have the right to view machines other than yours."),
+                _("You don't have the right to view other machines than"
+                  " yours."),
                 ("machines.view_domain",),
             )
         return True, None, None
@@ -1794,7 +1801,7 @@ class IpList(RevMixin, AclMixin, models.Model):
         """ Erreur si l'ip_type est incorrect"""
         if not str(self.ipv4) in self.ip_type.ip_set_as_str:
             raise ValidationError(
-                _("The IPv4 address and the range of the IP" " type don't match.")
+                _("The IPv4 address and the range of the IP type don't match.")
             )
         return
 
@@ -1970,7 +1977,8 @@ class OuverturePortList(RevMixin, AclMixin, models.Model):
 
     class Meta:
         permissions = (
-            ("view_ouvertureportlist", _("Can view a ports opening list" " object")),
+            ("view_ouvertureportlist", _("Can view a ports opening list"
+             " object")),
         )
         verbose_name = _("ports opening list")
         verbose_name_plural = _("ports opening lists")
diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html
index 809ef4ba..358fc33e 100644
--- a/machines/templates/machines/aff_extension.html
+++ b/machines/templates/machines/aff_extension.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <thead>
         <tr>
             <th>{% trans "Extension" %}</th>
-            <th>{% trans "'infra' right required" %}</th>
+	    <th>{% blocktrans %}"infra" right required{% endblocktrans %}</th>
             <th>{% trans "SOA record" %}</th>
             <th>{% trans "A record origin" %}</th>
             {% if ipv6_enabled %}
diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html
index 2675b87a..7cf710c2 100644
--- a/machines/templates/machines/aff_iptype.html
+++ b/machines/templates/machines/aff_iptype.html
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <th>{% trans "IP type" %}</th>
             <th>{% trans "Extension" %}</th>
-            <th>{% trans "'infra' right required" %}</th>
+	    <th>{% blocktrans %}"infra" right required{% endblocktrans %}</th>
             <th>{% trans "IPv4 range" %}</th>
             <th>{% trans "v6 prefix" %}</th>
             <th>{% trans "DNSSEC reverse v4/v6" %}</th>
diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index e59cfde6..77b65546 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -123,7 +123,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                         <li>
                                             <a href="{% url 'machines:edit-interface' interface.id %}">
                                                 <i class="fa fa-edit"></i>
-                                                {% trans " Edit" %}
+                                                {% trans "Edit" %}
                                             </a>
                                         </li>
                                     {% acl_end %}
@@ -131,7 +131,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                         <li>
                                             <a href="{% url 'machines:index-alias' interface.id %}">
                                                 <i class="fa fa-edit"></i>
-                                                {% trans " Manage the aliases" %}
+                                                {% trans "Manage the aliases" %}
                                             </a>
                                         </li>
                                     {% acl_end %}
@@ -139,7 +139,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                         <li>
                                             <a href="{% url 'machines:index-ipv6' interface.id %}">
                                                 <i class="fa fa-edit"></i>
-                                                {% trans " Manage the IPv6 addresses" %}
+                                                {% trans "Manage the IPv6 addresses" %}
                                             </a>
                                         </li>
                                     {% acl_end %}
@@ -147,7 +147,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                         <li>
                                             <a href="{% url 'machines:index-sshfp' interface.machine.id %}">
                                                 <i class="fa fa-edit"></i>
-                                                {% trans " Manage the SSH fingerprints" %}
+                                                {% trans "Manage the SSH fingerprints" %}
                                             </a>
                                         </li>
                                     {% acl_end %}
@@ -155,7 +155,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                         <li>
                                             <a href="{% url 'machines:port-config' interface.id %}">
                                                 <i class="fa fa-edit"></i>
-                                                {% trans " Manage the ports configuration" %}
+                                                {% trans "Manage the ports configuration" %}
                                             </a>
                                         </li>
                                     {% acl_end %}
diff --git a/machines/templates/machines/aff_servers.html b/machines/templates/machines/aff_servers.html
index 36c4bca0..3829c6c1 100644
--- a/machines/templates/machines/aff_servers.html
+++ b/machines/templates/machines/aff_servers.html
@@ -31,8 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <th>{% trans "Service name" %}</th>
         <th>{% trans "Server" %}</th>
         <th>{% trans "Last regeneration" %}</th>
-        <th>{% trans "Regeneration required" %}</th>
-        <th>{% trans "Regeneration activated" %}</th>
+        <th>{% trans "Regeneration asked" %}</th>
+        <th>{% trans "Regeneration needed" %}</th>
     </tr>
     </thead>
     {% for server in servers_list %}
diff --git a/machines/templates/machines/edit_portlist.html b/machines/templates/machines/edit_portlist.html
index 387723bb..a2aded23 100644
--- a/machines/templates/machines/edit_portlist.html
+++ b/machines/templates/machines/edit_portlist.html
@@ -47,11 +47,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </div>
 
         <p>
-            {% trans "Add a port" as value %}
-            <input class="btn btn-primary btn-sm" role="button" value="value" id="add_one">
+	<input class="btn btn-primary btn-sm" role="button" value="{% trans "Add a port" %}" id="add_one">
         </p>
-        {% trans "Create or edit" as tr_create_or_edit %}
-        {% bootstrap_button tr_create_or_edit icon='ok' button_class='btn-success' %}
+        {% trans "Confirm" as tr_confirm %}
+        {% bootstrap_button tr_confirm icon='ok' button_class='btn-success' %}
     </form>
     <script type="text/javascript">
         var template = `{{ports.empty_form}}`;
diff --git a/machines/templates/machines/index_alias.html b/machines/templates/machines/index_alias.html
index a887e74b..4bf88edc 100644
--- a/machines/templates/machines/index_alias.html
+++ b/machines/templates/machines/index_alias.html
@@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
     <h2>{% trans "List of the aliases of the interface" %}</h2>
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-alias' interface_id %}"><i
-            class="fa fa-plus"></i>{% trans " Add an alias" %}</a>
+            class="fa fa-plus"></i> {% trans "Add an alias" %}</a>
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-alias'  interface_id %}"><i
-            class="fa fa-trash"></i>{% trans " Delete one or several aliases" %}</a>
+            class="fa fa-trash"></i> {% trans "Delete one or several aliases" %}</a>
     {% include 'machines/aff_alias.html' with  alias_list=alias_list %}
     <br/>
     <br/>
diff --git a/machines/templates/machines/index_extension.html b/machines/templates/machines/index_extension.html
index ad6cb4e5..26e9efea 100644
--- a/machines/templates/machines/index_extension.html
+++ b/machines/templates/machines/index_extension.html
@@ -33,77 +33,76 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of extensions" %}</h2>
     {% can_create Extension %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-extension' %}">
-            <i class="fa fa-plus"></i>
-            {% trans " Add an extension" %}</a>
+            <i class="fa fa-plus"></i> {% trans "Add an extension" %}</a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-extension' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several extensions" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several extensions" %}
     </a>
     {% include 'machines/aff_extension.html' with  extension_list=extension_list %}
 
     <h2>{% trans "List of SOA records" %}</h2>
     {% can_create SOA %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-soa' %}">
-            <i class="fa fa-plus"></i>{% trans " Add an SOA record" %}
+            <i class="fa fa-plus"></i> {% trans "Add an SOA record" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-soa' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several SOA records" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several SOA records" %}
     </a>
     {% include 'machines/aff_soa.html' with  soa_list=soa_list %}
 
     <h2>{% trans "List of MX records" %}</h2>
     {% can_create Mx %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-mx' %}">
-            <i class="fa fa-plus"></i>{% trans " Add an MX record" %}
+            <i class="fa fa-plus"></i> {% trans "Add an MX record" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-mx' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several MX records" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several MX records" %}
     </a>
     {% include 'machines/aff_mx.html' with  mx_list=mx_list %}
 
     <h2>{% trans "List of NS records" %}</h2>
     {% can_create Ns %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-ns' %}">
-            <i class="fa fa-plus"></i>{% trans " Add an NS record" %}
+            <i class="fa fa-plus"></i> {% trans "Add an NS record" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-ns' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several NS records" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several NS records" %}
     </a>
     {% include 'machines/aff_ns.html' with  ns_list=ns_list %}
 
     <h2>{% trans "List of TXT records" %}</h2>
     {% can_create Txt %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-txt' %}">
-            <i class="fa fa-plus"></i>{% trans " Add a TXT record" %}
+            <i class="fa fa-plus"></i> {% trans "Add a TXT record" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-txt' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several TXT records" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several TXT records" %}
     </a>
     {% include 'machines/aff_txt.html' with  txt_list=txt_list %}
 
     <h2>{% trans "List of DNAME records" %}</h2>
     {% can_create DName %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-dname' %}">
-            <i class="fa fa-plus"></i> {% trans " Add a DNAME record" %}
+            <i class="fa fa-plus"></i> {% trans "Add a DNAME record" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-dname' %}">
-        <i class="fa fa-trash"></i> {% trans " Delete one or several DNAME records" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several DNAME records" %}
     </a>
     {% include 'machines/aff_dname.html' with  dname_list=dname_list %}
 
     <h2>{% trans "List of SRV records" %}</h2>
     {% can_create Srv %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-srv' %}">
-            <i class="fa fa-plus"></i>{% trans " Add an SRV record" %}
+            <i class="fa fa-plus"></i> {% trans "Add an SRV record" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-srv' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several SRV records" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several SRV records" %}
     </a>
     {% include 'machines/aff_srv.html' with  srv_list=srv_list %}
 {% endblock %}
diff --git a/machines/templates/machines/index_iptype.html b/machines/templates/machines/index_iptype.html
index 08f88d82..65f78f74 100644
--- a/machines/templates/machines/index_iptype.html
+++ b/machines/templates/machines/index_iptype.html
@@ -33,11 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of IP types" %}</h2>
     {% can_create IpType %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-iptype' %}">
-            <i class="fa fa-plus"></i>{% trans " Add an IP type" %}
+            <i class="fa fa-plus"></i> {% trans "Add an IP type" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-iptype' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several IP types" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several IP types" %}
     </a>
     {% include 'machines/aff_iptype.html' with  iptype_list=iptype_list %}
 {% endblock %}
diff --git a/machines/templates/machines/index_ipv6.html b/machines/templates/machines/index_ipv6.html
index df3472dc..c9cbe8fd 100644
--- a/machines/templates/machines/index_ipv6.html
+++ b/machines/templates/machines/index_ipv6.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of the IPv6 addresses of the interface" %}</h2>
     {% can_create Ipv6List interface_id %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-ipv6list' interface_id %}">
-            <i class="fa fa-plus"></i>{% trans " Add an IPv6 address" %}
+            <i class="fa fa-plus"></i> {% trans "Add an IPv6 address" %}
         </a>
     {% acl_end %}
     {% include 'machines/aff_ipv6.html' with  ipv6_list=ipv6_list %}
diff --git a/machines/templates/machines/index_machinetype.html b/machines/templates/machines/index_machinetype.html
index 4f029791..24ac490e 100644
--- a/machines/templates/machines/index_machinetype.html
+++ b/machines/templates/machines/index_machinetype.html
@@ -34,11 +34,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of machine types" %}</h2>
     {% can_create MachineType %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-machinetype' %}">
-            <i class="fa fa-plus"></i>{% trans " Add a machine type" %}
+            <i class="fa fa-plus"></i> {% trans "Add a machine type" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-machinetype' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several machine types" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several machine types" %}
     </a>
     {% include 'machines/aff_machinetype.html' with  machinetype_list=machinetype_list %}
     <br/>
diff --git a/machines/templates/machines/index_nas.html b/machines/templates/machines/index_nas.html
index d9c1f39e..b4a3e4fb 100644
--- a/machines/templates/machines/index_nas.html
+++ b/machines/templates/machines/index_nas.html
@@ -35,11 +35,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h5>{% trans "The NAS device type and machine type are linked. It is useful for MAC address auto capture by RADIUS, and allows to choose the machine type to assign to the machines according to the NAS device type." %}</h5>
     {% can_create Nas %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-nas' %}">
-            <i class="fa fa-plus"></i>{% trans " Add a NAS device type" %}
+            <i class="fa fa-plus"></i> {% trans "Add a NAS device type" %}
         </a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-nas' %}">
-        <i class="fa fa-trash"></i>{% trans " Delete one or several NAS device types" %}
+        <i class="fa fa-trash"></i> {% trans "Delete one or several NAS device types" %}
     </a>
     {% include 'machines/aff_nas.html' with  nas_list=nas_list %}
     <br/>
diff --git a/machines/templates/machines/index_portlist.html b/machines/templates/machines/index_portlist.html
index c540478d..671f8e74 100644
--- a/machines/templates/machines/index_portlist.html
+++ b/machines/templates/machines/index_portlist.html
@@ -11,7 +11,7 @@
     <h2>{% trans "List of ports configurations" %}</h2>
     {% can_create OuverturePortList %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-portlist' %}">
-            <i class="fa fa-plus"></i>{% trans " Add a configuration" %}
+            <i class="fa fa-plus"></i> {% trans "Add a configuration" %}
         </a>
     {% acl_end %}
     <table class="table table-striped">
diff --git a/machines/templates/machines/index_role.html b/machines/templates/machines/index_role.html
index ab859c2e..c92bcb25 100644
--- a/machines/templates/machines/index_role.html
+++ b/machines/templates/machines/index_role.html
@@ -33,9 +33,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of roles" %}</h2>
     {% can_create Role %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-role' %}"><i
-            class="fa fa-plus"></i>{% trans " Add a role" %}</a>
+            class="fa fa-plus"></i> {% trans "Add a role" %}</a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-role' %}"><i
-            class="fa fa-trash"></i>{% trans " Delete one or several roles" %}</a>
+            class="fa fa-trash"></i> {% trans "Delete one or several roles" %}</a>
     {% include 'machines/aff_role.html' with  role_list=role_list %}
 {% endblock %}
diff --git a/machines/templates/machines/index_service.html b/machines/templates/machines/index_service.html
index 56886638..05376f2b 100644
--- a/machines/templates/machines/index_service.html
+++ b/machines/templates/machines/index_service.html
@@ -33,10 +33,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of services" %}</h2>
     {% can_create machines.Service %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-service' %}"><i
-            class="fa fa-plus"></i>{% trans " Add a service" %}</a>
+            class="fa fa-plus"></i> {% trans "Add a service" %}</a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service' %}"><i
-            class="fa fa-trash"></i>{% trans " Delete one or several services" %}</a>
+            class="fa fa-trash"></i> {% trans "Delete one or several services" %}</a>
     {% include 'machines/aff_service.html' with  service_list=service_list %}
 
     <h2>{% trans "States of servers" %}</h2>
diff --git a/machines/templates/machines/index_sshfp.html b/machines/templates/machines/index_sshfp.html
index c1508eaf..b3fe7d35 100644
--- a/machines/templates/machines/index_sshfp.html
+++ b/machines/templates/machines/index_sshfp.html
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "SSH fingerprints" %}</h2>
     {% can_create SshFp machine_id %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-sshfp' machine_id %}">
-        <i class="fa fa-plus"></i>{% trans " Add an SSH fingerprint" %}
+        <i class="fa fa-plus"></i> {% trans "Add an SSH fingerprint" %}
     </a>
     {% acl_end %}
     {% include 'machines/aff_sshfp.html' with sshfp_list=sshfp_list %}
diff --git a/machines/templates/machines/index_vlan.html b/machines/templates/machines/index_vlan.html
index dbeb4dcd..1ab87427 100644
--- a/machines/templates/machines/index_vlan.html
+++ b/machines/templates/machines/index_vlan.html
@@ -33,9 +33,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "List of VLANs" %}</h2>
     {% can_create Vlan %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-vlan' %}"><i
-            class="fa fa-plus"></i>{% trans " Add a VLAN" %}</a>
+            class="fa fa-plus"></i> {% trans "Add a VLAN" %}</a>
     {% acl_end %}
     <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-vlan' %}"><i
-            class="fa fa-trash"></i>{% trans " Delete one or several VLANs" %}</a>
+            class="fa fa-trash"></i> {% trans "Delete one or several VLANs" %}</a>
     {% include 'machines/aff_vlan.html' with  vlan_list=vlan_list %}
 {% endblock %}
diff --git a/machines/templates/machines/sidebar.html b/machines/templates/machines/sidebar.html
index c5519c8d..0993f33c 100644
--- a/machines/templates/machines/sidebar.html
+++ b/machines/templates/machines/sidebar.html
@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% can_view_all Nas %}
     <a class="list-group-item list-group-item-info" href="{% url 'machines:index-nas' %}">
         <i class="fa fa-list-ul"></i>
-        {% trans "NAS devices" %}
+	{% trans "NAS devices" %}
     </a>
     {% acl_end %}
     {% can_view_all machines.Service %}
diff --git a/machines/views.py b/machines/views.py
index e2858f7d..c308764d 100644
--- a/machines/views.py
+++ b/machines/views.py
@@ -250,7 +250,7 @@ def new_machine(request, user, **_kwargs):
             "interfaceform": interface,
             "domainform": domain,
             "i_mbf_param": i_mbf_param,
-            "action_name": _("Create a machine"),
+            "action_name": _("Add"),
         },
         "machines/machine.html",
         request,
@@ -314,7 +314,7 @@ def del_machine(request, machine, **_kwargs):
             reverse("users:profil", kwargs={"userid": str(machine.user.id)})
         )
     return form(
-        {"objet": machine, "objet_name": "machine"}, "machines/delete.html", request
+        {"objet": machine, "objet_name": _("machine")}, "machines/delete.html", request
     )
 
 
@@ -345,7 +345,7 @@ def new_interface(request, machine, **_kwargs):
             "interfaceform": interface_form,
             "domainform": domain_form,
             "i_mbf_param": i_mbf_param,
-            "action_name": _("Create an interface"),
+            "action_name": _("Add"),
         },
         "machines/machine.html",
         request,
@@ -366,7 +366,7 @@ def del_interface(request, interface, **_kwargs):
             reverse("users:profil", kwargs={"userid": str(request.user.id)})
         )
     return form(
-        {"objet": interface, "objet_name": "interface"}, "machines/delete.html", request
+        {"objet": interface, "objet_name": _("interface")}, "machines/delete.html", request
     )
 
 
@@ -386,7 +386,7 @@ def new_ipv6list(request, interface, **_kwargs):
             reverse("machines:index-ipv6", kwargs={"interfaceid": str(interface.id)})
         )
     return form(
-        {"ipv6form": ipv6, "action_name": _("Create an IPv6 addresses list")},
+        {"ipv6form": ipv6, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -426,7 +426,7 @@ def del_ipv6list(request, ipv6list, **_kwargs):
             reverse("machines:index-ipv6", kwargs={"interfaceid": str(interfaceid)})
         )
     return form(
-        {"objet": ipv6list, "objet_name": "ipv6"}, "machines/delete.html", request
+        {"objet": ipv6list, "objet_name": _("IPv6 addresses list")}, "machines/delete.html", request
     )
 
 
@@ -444,7 +444,7 @@ def new_sshfp(request, machine, **_kwargs):
             reverse("machines:index-sshfp", kwargs={"machineid": str(machine.id)})
         )
     return form(
-        {"sshfpform": sshfp, "action_name": _("Create a SSHFP record")},
+        {"sshfpform": sshfp, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -482,7 +482,7 @@ def del_sshfp(request, sshfp, **_kwargs):
             reverse("machines:index-sshfp", kwargs={"machineid": str(machineid)})
         )
     return form(
-        {"objet": sshfp, "objet_name": "sshfp"}, "machines/delete.html", request
+        {"objet": sshfp, "objet_name": _("SSHFP record")}, "machines/delete.html", request
     )
 
 
@@ -498,7 +498,7 @@ def add_iptype(request):
         messages.success(request, _("The IP type was created."))
         return redirect(reverse("machines:index-iptype"))
     return form(
-        {"iptypeform": iptype, "action_name": _("Create an IP type")},
+        {"iptypeform": iptype, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -563,7 +563,7 @@ def add_machinetype(request):
         messages.success(request, _("The machine type was created."))
         return redirect(reverse("machines:index-machinetype"))
     return form(
-        {"machinetypeform": machinetype, "action_name": _("Create a machine" " type")},
+        {"machinetypeform": machinetype, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -626,7 +626,7 @@ def add_extension(request):
         messages.success(request, _("The extension was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"extensionform": extension, "action_name": _("Create an extension")},
+        {"extensionform": extension, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -688,7 +688,7 @@ def add_soa(request):
         messages.success(request, _("The SOA record was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"soaform": soa, "action_name": _("Create an SOA record")},
+        {"soaform": soa, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -740,7 +740,7 @@ def add_mx(request):
         messages.success(request, _("The MX record was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"mxform": mx, "action_name": _("Create an MX record")},
+        {"mxform": mx, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -792,7 +792,7 @@ def add_ns(request):
         messages.success(request, _("The NS record was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"nsform": ns, "action_name": _("Create an NS record")},
+        {"nsform": ns, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -844,7 +844,7 @@ def add_dname(request):
         messages.success(request, _("The DNAME record was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"dnameform": dname, "action_name": _("Create a DNAME record")},
+        {"dnameform": dname, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -899,7 +899,7 @@ def add_txt(request):
         messages.success(request, _("The TXT record was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"txtform": txt, "action_name": _("Create a TXT record")},
+        {"txtform": txt, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -951,7 +951,7 @@ def add_srv(request):
         messages.success(request, _("The SRV record was created."))
         return redirect(reverse("machines:index-extension"))
     return form(
-        {"srvform": srv, "action_name": _("Create an SRV record")},
+        {"srvform": srv, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -1008,7 +1008,7 @@ def add_alias(request, interface, interfaceid):
             reverse("machines:index-alias", kwargs={"interfaceid": str(interfaceid)})
         )
     return form(
-        {"aliasform": alias, "action_name": _("Create an alias")},
+        {"aliasform": alias, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -1069,7 +1069,7 @@ def add_role(request):
         messages.success(request, _("The role was created."))
         return redirect(reverse("machines:index-role"))
     return form(
-        {"roleform": role, "action_name": _("Create a role")},
+        {"roleform": role, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -1121,7 +1121,7 @@ def add_service(request):
         messages.success(request, _("The service was created."))
         return redirect(reverse("machines:index-service"))
     return form(
-        {"serviceform": service, "action_name": _("Create a service")},
+        {"serviceform": service, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -1187,7 +1187,7 @@ def add_vlan(request):
         messages.success(request, _("The VLAN was created."))
         return redirect(reverse("machines:index-vlan"))
     return form(
-        {"vlanform": vlan, "action_name": _("Create a VLAN")},
+        {"vlanform": vlan, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -1239,7 +1239,7 @@ def add_nas(request):
         messages.success(request, _("The NAS device was created."))
         return redirect(reverse("machines:index-nas"))
     return form(
-        {"nasform": nas, "action_name": _("Create a NAS device")},
+        {"nasform": nas, "action_name": _("Add")},
         "machines/machine.html",
         request,
     )
@@ -1558,8 +1558,8 @@ def configure_ports(request, interface_instance, **_kwargs):
             request,
             (
                 _(
-                    "Warning: the IPv4 isn't public, the opening won't have effect"
-                    " in v4."
+                    "Warning: the IP address is not public, the opening won't"
+                    " have any effect in v4."
                 )
             ),
         )
@@ -1572,7 +1572,7 @@ def configure_ports(request, interface_instance, **_kwargs):
             messages.success(request, _("The ports configuration was edited."))
         return redirect(reverse("machines:index"))
     return form(
-        {"interfaceform": interface, "action_name": _("Edit the" " configuration")},
+        {"interfaceform": interface, "action_name": _("Edit")},
         "machines/machine.html",
         request,
     )
diff --git a/multi_op/locale/fr/LC_MESSAGES/django.po b/multi_op/locale/fr/LC_MESSAGES/django.po
new file mode 100644
index 00000000..4faf9166
--- /dev/null
+++ b/multi_op/locale/fr/LC_MESSAGES/django.po
@@ -0,0 +1,128 @@
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018 Maël Kervella
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
+"PO-Revision-Date: 2019-11-16 00:22+0100\n"
+"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: multi_op/forms.py:43
+msgid "Dormitory"
+msgstr "Résidence"
+
+#: multi_op/preferences/models.py:37
+msgid "enabled dorm"
+msgstr "résidence activée"
+
+#: multi_op/preferences/models.py:41
+msgid "dormitories preferences"
+msgstr "préférences de résidences"
+
+#: multi_op/templates/multi_op/aff_room_state.html:36
+msgid "Room"
+msgstr "Chambre"
+
+#: multi_op/templates/multi_op/aff_room_state.html:37
+msgid "Building"
+msgstr "Bâtiment"
+
+#: multi_op/templates/multi_op/aff_room_state.html:40
+msgid "Connnected to"
+msgstr "Connectée à"
+
+#: multi_op/templates/multi_op/aff_room_state.html:41
+msgid "User"
+msgstr "Utilisateur"
+
+#: multi_op/templates/multi_op/aff_room_state.html:42
+msgid "Details"
+msgstr "Détails"
+
+#: multi_op/templates/multi_op/aff_room_state.html:43
+msgid "End of subscription on"
+msgstr "Fin de cotisation le"
+
+#: multi_op/templates/multi_op/aff_room_state.html:44
+msgid "Internet access"
+msgstr "Accès Internet"
+
+#: multi_op/templates/multi_op/aff_room_state.html:45
+msgid "Action"
+msgstr "Action"
+
+#: multi_op/templates/multi_op/aff_room_state.html:52
+msgid "Other operator"
+msgstr "Autre opérateur"
+
+#: multi_op/templates/multi_op/aff_room_state.html:53
+msgid "None"
+msgstr "Aucun"
+
+#: multi_op/templates/multi_op/aff_room_state.html:55
+msgid "Non member"
+msgstr "Non adhérent"
+
+#: multi_op/templates/multi_op/aff_room_state.html:58
+msgid "Active"
+msgstr "Actif"
+
+#: multi_op/templates/multi_op/aff_room_state.html:60
+msgid "Disabled"
+msgstr "Désactivé"
+
+#: multi_op/templates/multi_op/index_room_state.html:30
+msgid "Multiple operators"
+msgstr "Opérateurs multiples"
+
+#: multi_op/templates/multi_op/index_room_state.html:38
+msgid "Room connections"
+msgstr "Connexions de chambre"
+
+#: multi_op/templates/multi_op/index_room_state.html:44
+msgid "Select dormitory"
+msgstr "Sélectionnez la résidence"
+
+#: multi_op/templates/multi_op/navbar.html:2
+msgid "Manage the operators"
+msgstr "Gérer les opérateurs"
+
+#: multi_op/templates/multi_op/sidebar.html:31
+msgid "Room connections state"
+msgstr "État des connexions de chambre"
+
+#: multi_op/templates/multi_op/sidebar.html:35
+msgid "Sockets to connect"
+msgstr "Prises à connecter"
+
+#: multi_op/templates/multi_op/sidebar.html:39
+msgid "Sockets to disconnect"
+msgstr "Prises à déconnecter"
+
+#: multi_op/views.py:169
+#, python-format
+msgid "The room %s was disconnected."
+msgstr "La chambre %s a été déconnectée."
diff --git a/multi_op/preferences/models.py b/multi_op/preferences/models.py
index 6f6f8066..c342bf41 100644
--- a/multi_op/preferences/models.py
+++ b/multi_op/preferences/models.py
@@ -34,8 +34,8 @@ class Preferences(models.Model):
         "topologie.Dormitory",
         related_name="vlan_tagged",
         blank=True,
-        verbose_name=_("Enabled dorm"),
+        verbose_name=_("enabled dorm"),
     )
 
     class Meta:
-        verbose_name = _("Dormitory of connection settings")
+        verbose_name = _("dormitories preferences")
diff --git a/multi_op/templates/multi_op/aff_room_state.html b/multi_op/templates/multi_op/aff_room_state.html
index 75ca027c..bdfdd98b 100644
--- a/multi_op/templates/multi_op/aff_room_state.html
+++ b/multi_op/templates/multi_op/aff_room_state.html
@@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% trans "Building" as tr_building %}
             <th>{% include 'buttons/sort.html' with prefix='building' col='name' text=tr_building %}</th>
             <th>{% include 'buttons/sort.html' with prefix='room' col='name' text=tr_room %}</th>
-	    <th>{% trans "Connnected on" %}</th>
+	    <th>{% trans "Connnected to" %}</th>
 	    <th>{% trans "User" %}</th>
 	    <th>{% trans "Details" %}</th>
             <th>{% trans "End of subscription on" %}</th>
@@ -49,10 +49,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <tr>
         <td>{{ room.building }}</td>
         <td>{{ room.name }}</td>
-	<td>{% if room.port_set.all %}<span class="label label-success">AURORE{% else %}<span class="label label-danger">{% trans "Other operator" %}{% endif %}</span></td>
-	<td>{% if room.adherent %}<a href="{% url 'users:profil' room.adherent.id%}">{{ room.adherent }}</a>{% else %} {% trans "Aucun" %}{% endif %}</td>
+	<td>{% if room.port_set.all %}<span class="label label-success">{{ asso_name }}{% else %}<span class="label label-danger">{% trans "Other operator" %}{% endif %}</span></td>
+	<td>{% if room.adherent %}<a href="{% url 'users:profil' room.adherent.id%}">{{ room.adherent }}</a>{% else %} {% trans "None" %}{% endif %}</td>
         <td>{{ room.details }}</td>
-	<td>{% if room.adherent.is_adherent %}<i class="text-success">{% else %}<i class="text-danger">{% endif %}{% if room.adherent.end_adhesion %}{{ room.adherent.end_adhesion}}{% else %}{% trans "No member" %}{% endif %}</i></td>
+	<td>{% if room.adherent.is_adherent %}<i class="text-success">{% else %}<i class="text-danger">{% endif %}{% if room.adherent.end_adhesion %}{{ room.adherent.end_adhesion}}{% else %}{% trans "Non member" %}{% endif %}</i></td>
         <td>
             {% if room.adherent.has_access == True %}
             <i class="text-success">{% trans "Active" %}</i>
diff --git a/multi_op/templates/multi_op/form_preferences.html b/multi_op/templates/multi_op/form_preferences.html
deleted file mode 100644
index 5c7e5d5e..00000000
--- a/multi_op/templates/multi_op/form_preferences.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends 'machines/sidebar.html' %}
-{% comment %}
-Re2o est un logiciel d'administration développé initiallement au rezometz. Il
-se veut agnostique au réseau considéré, de manière à être installable en
-quelques clics.
-
-Copyright © 2017  Gabriel Détraz
-Copyright © 2017  Goulven Kermarec
-Copyright © 2017  Augustin Lemesle
-Copyright © 2017  Maël Kervella
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-{% endcomment %}
-
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block title %}{% trans "Ticket" %}{% endblock %}
-
-{% block content %}
-<h2> {% trans "Tickets settings modification" %}</h2>
-
-{% for message in messages %}
-<div class="{{ message| bootstrap_message_classes }} alert-dismissable">
-    <button type="button" class="close" data_dismiss="alert" aria-hidden="true">&#125;</button>
-    {{ message | safe }}
-</div>
-{% endfor %}
-
-<form class="form" method="post">
-    {% csrf_token %}
-        {% bootstrap_field preferencesform.publish_address %}
-        {% bootstrap_field preferencesform.mail_language %}
-    {% bootstrap_button "Editer" button_type="submit" icon='ok' button_class='btn-success' %}
-</form>
-{% endblock %}
diff --git a/multi_op/templates/multi_op/form_ticket.html b/multi_op/templates/multi_op/form_ticket.html
deleted file mode 100644
index d35e9f5d..00000000
--- a/multi_op/templates/multi_op/form_ticket.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends 'machines/sidebar.html' %}
-{% comment %}
-Re2o est un logiciel d'administration développé initiallement au rezometz. Il
-se veut agnostique au réseau considéré, de manière à être installable en
-quelques clics.
-
-Copyright © 2017  Gabriel Détraz
-Copyright © 2017  Goulven Kermarec
-Copyright © 2017  Augustin Lemesle
-Copyright © 2017  Maël Kervella
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-{% endcomment %}
-
-{% load bootstrap3 %}
-{% load massive_bootstrap_form %}
-{% load i18n %}
-
-{% block title %}{% trans "Ticket" %}{% endblock %}
-
-{% block content %}
-<h2> Ouverture d'un Ticket </h2>
-
-<form class="form" method="post">
-    {% csrf_token %}
-    {% if not user.is_authenticated %}
-    <p>{% trans "Vous n'êtes pas authentifié. Veuillez fournir une adresse mail afin que nous puissions vous recontacter." %}</p>
-        {% bootstrap_field ticketform.email %}
-    {% endif %}
-        {% bootstrap_field ticketform.title %}
-        <br>
-        <p>{% trans "Description de votre problème. Veuillez fournir le plus d'informations possible afin de faciliter la recherche de solution. Voici quelques informations dont nous pourions avoir besoin:" %}</p>
-        <ul class="list">
-            <li>
-                <p> {% trans "Le type de votre problème (adhesion, connexion, paiement ou autre)." %}</p>
-            </li>
-            <li>
-                <p> {% trans "Les conditions dans lesquelles vous rencontrez le problème (Wifi/filaire, sur tout les apareils ou sur un seul. Est-ce une nouvelle machine ?" %}</p>
-            </li>
-            <li>
-                <p> {% trans "Les endroits dans lequels le problème survient (chez vous, dans une partie commune, dans un batiment en particulier)." %}</p>
-        </ul>
-        {% bootstrap_field ticketform.description %}
-    {% bootstrap_button "Ouvrir le Ticket" button_type="submit" icon='ok' button_class='btn-success' %}
-</form>
-{% endblock %}
diff --git a/multi_op/templates/multi_op/index.html b/multi_op/templates/multi_op/index.html
deleted file mode 100644
index 4429c4fd..00000000
--- a/multi_op/templates/multi_op/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends 'users/sidebar.html' %}
-{% comment %}
-Re2o est un logiciel d'administration développé initiallement au rezometz. Il
-se veut agnostique au réseau considéré, de manière à être installable en
-quelques clics.
-
-Copyright © 2017  Gabriel Détraz
-Copyright © 2017  Goulven Kermarec
-Copyright © 2017  Augustin Lemesle
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-{% endcomment %}
-
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block title%}{% trans "Tickets" %}{% endblock %}
-
-{% block content %}
-	<h2>{% trans "Tickets" %}</h2>
-	{% include 'tickets/aff_tickets.html' with tickets_list=tickets_list %}
-{% endblock %}
diff --git a/multi_op/templates/multi_op/index_room_state.html b/multi_op/templates/multi_op/index_room_state.html
index 50881a19..6e7bb45e 100644
--- a/multi_op/templates/multi_op/index_room_state.html
+++ b/multi_op/templates/multi_op/index_room_state.html
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 {% load i18n %}
 
-{% block title %}{% trans "Multi Operators" %}{% endblock %}
+{% block title %}{% trans "Multiple operators" %}{% endblock %}
 
 {% block content %}
 
@@ -35,17 +35,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% bootstrap_form_errors dormitory_form %}
 {% endif %}
 
-<h2>{% trans "Rooms connections" %}</h2>
+<h2>{% trans "Room connections" %}</h2>
 
 {% if dormitory_form %}
 <form class="form" method="post">
 	{% csrf_token %}
 	{% bootstrap_form dormitory_form %}
-	{% bootstrap_button "Select Dormitory" icon='ok' button_class='btn-success' %}
+	{% trans "Select dormitory" as tr_select_dorm %}
+	{% bootstrap_button tr_select_dorm icon='ok' button_class='btn-success' %}
 </form>
 {% endif %}
 
-{% include 'multi_op/aff_room_state.html' with room_list=room_list %}
+{% include 'multi_op/aff_room_state.html' with room_list=room_list asso_name=asso_name %}
     <br />
     <br />
     <br />
diff --git a/multi_op/templates/multi_op/navbar.html b/multi_op/templates/multi_op/navbar.html
index c5e84c43..ac3cfe5f 100644
--- a/multi_op/templates/multi_op/navbar.html
+++ b/multi_op/templates/multi_op/navbar.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-<li><a href="{% url 'multi_op:aff-state-global' %}"><i class="fa fa-random"></i> {% trans "Multi Operators" %}</a></li>
+<li><a href="{% url 'multi_op:aff-state-global' %}"><i class="fa fa-random"></i> {% trans "Manage the operators" %}</a></li>
diff --git a/multi_op/templates/multi_op/navbar_logout.html b/multi_op/templates/multi_op/navbar_logout.html
deleted file mode 100644
index 8a7114f3..00000000
--- a/multi_op/templates/multi_op/navbar_logout.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% load i18n %}
-<li>
-    <a href="{% url 'tickets:new-ticket' %}">
-        <i class="fa fa-ticket"></i> {% trans "Ouvrir un ticket" %}
-    </a>
-</li>
diff --git a/multi_op/templates/multi_op/preferences.html b/multi_op/templates/multi_op/preferences.html
deleted file mode 100644
index 60cbfac6..00000000
--- a/multi_op/templates/multi_op/preferences.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n %}
-
-<div  class="panel panel-default" id="tickets">
-    <div class="panel-heading" data-toggle="collapse" href="#collapse_tickets">
-        <h4 class="panel-title">
-            <a><i class="fa fa-ticket"></i>   {% trans "Tickets" %}</a>
-        </h4>
-    </div>
-    
-	<div id="collapse_tickets" class="panel-collapse panel-body collapse">
-		
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'tickets:edit-preferences-tickets' %}">
-            <i class="fa fa-edit"></i>
-            {% trans "Edit" %}
-        </a>
-        <p></p>    
-            
-        <div class="table-responsive">
-        <table class="table">
-			<tr>
-                <th><p>{% trans "Publication email address"%}</p></th>
-                {% if preferences.publish_address %}
-			        <td><p>{{ preferences.publish_address }}</p></td>
-                {% else %}
-                    <td><p>{% trans "Pas d'adresse, les tickets ne sont pas annoncés" %}</p></td>
-                {% endif %}
-			</tr>
-            <tr>
-                <th><p>{% trans "Email language" %}</p></th>
-                <td><p>{{ language }}</p></th>
-            </tr>
-  		<table class="table">
-  		</table>
-		</div>
-    </div>
-</div>
diff --git a/multi_op/templates/multi_op/sidebar.html b/multi_op/templates/multi_op/sidebar.html
index 0433fc61..86771de1 100644
--- a/multi_op/templates/multi_op/sidebar.html
+++ b/multi_op/templates/multi_op/sidebar.html
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block sidebar %}
     <a class="list-group-item list-group-item-info" href="{% url 'multi_op:aff-state-global' %}">
         <i class="fa fa-random"></i>
-	{% trans "Rooms connection state" %}
+	{% trans "Room connections state" %}
     </a>
     <a class="list-group-item list-group-item-info" href="{% url 'multi_op:aff-pending-connection' %}">
         <i class="fa fa-compress"></i>
diff --git a/multi_op/views.py b/multi_op/views.py
index 64b9eeee..266c8a15 100644
--- a/multi_op/views.py
+++ b/multi_op/views.py
@@ -41,7 +41,7 @@ from re2o.base import re2o_paginator, SortTable
 
 from re2o.acl import can_view, can_view_all, can_edit, can_create
 
-from preferences.models import GeneralOption
+from preferences.models import GeneralOption, AssoOption
 
 from .forms import DormitoryForm
 
@@ -67,7 +67,15 @@ def display_rooms_connection(request, dormitory=None):
     )
     pagination_number = GeneralOption.get_cached_value("pagination_number")
     room_list = re2o_paginator(request, room_list, pagination_number)
-    return render(request, "multi_op/index_room_state.html", {"room_list": room_list})
+    asso_name = AssoOption.get_cached_value("pseudo")
+    return render(
+        request,
+        "multi_op/index_room_state.html",
+        {
+            "room_list": room_list,
+            "asso_name": asso_name,
+        },
+    )
 
 
 @login_required
@@ -105,10 +113,15 @@ def aff_pending_connection(request):
     )
     pagination_number = GeneralOption.get_cached_value("pagination_number")
     room_list = re2o_paginator(request, room_list, pagination_number)
+    asso_name = AssoOption.get_cached_value("pseudo")
     return render(
         request,
         "multi_op/index_room_state.html",
-        {"room_list": room_list, "dormitory_form": dormitory_form},
+        {
+            "room_list": room_list,
+            "dormitory_form": dormitory_form,
+            "asso_name": asso_name,
+        },
     )
 
 
@@ -135,10 +148,15 @@ def aff_pending_disconnection(request):
     )
     pagination_number = GeneralOption.get_cached_value("pagination_number")
     room_list = re2o_paginator(request, room_list, pagination_number)
+    asso_name = AssoOption.get_cached_value("pseudo")
     return render(
         request,
         "multi_op/index_room_state.html",
-        {"room_list": room_list, "dormitory_form": dormitory_form},
+        {
+            "room_list": room_list,
+            "dormitory_form": dormitory_form,
+            "asso_name": asso_name,
+        },
     )
 
 
@@ -148,7 +166,7 @@ def disconnect_room(request, room, roomid):
     """Action of disconnecting a room"""
     room.port_set.clear()
     room.save()
-    messages.success(request, "Room %s disconnected" % room)
+    messages.success(request, _("The room %s was disconnected.") % room)
     return redirect(reverse("multi_op:aff-pending-disconnection"))
 
 
diff --git a/preferences/acl.py b/preferences/acl.py
index 27b209b7..e1b47faf 100644
--- a/preferences/acl.py
+++ b/preferences/acl.py
@@ -41,6 +41,7 @@ def can_view(user):
     can = user.has_module_perms("preferences")
     return (
         can,
-        None if can else _("You don't have the right to view this" " application."),
+        None if can else _("You don't have the right to view this"
+                           " application."),
         ("preferences",),
     )
diff --git a/preferences/forms.py b/preferences/forms.py
index ea1079b4..9ea9fca5 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -81,13 +81,13 @@ class EditOptionalMachineForm(ModelForm):
         prefix = kwargs.pop("prefix", self.Meta.model.__name__)
         super(EditOptionalMachineForm, self).__init__(*args, prefix=prefix, **kwargs)
         self.fields["password_machine"].label = _(
-            "Possibility to set a" " password per machine"
+            "Possibility to set a password per machine"
         )
         self.fields["max_lambdauser_interfaces"].label = _(
-            "Maximum number of" " interfaces" " allowed for a" " standard user"
+            "Maximum number of interfaces allowed for a standard user"
         )
         self.fields["max_lambdauser_aliases"].label = _(
-            "Maximum number of DNS" " aliases allowed for" " a standard user"
+            "Maximum number of DNS aliases allowed for a standard user"
         )
         self.fields["ipv6_mode"].label = _("IPv6 mode")
         self.fields["create_machine"].label = _("Can create a machine")
@@ -136,20 +136,20 @@ class EditGeneralOptionForm(ModelForm):
         self.fields["general_message_fr"].label = _("General message in French")
         self.fields["general_message_en"].label = _("General message in English")
         self.fields["search_display_page"].label = _(
-            "Number of results" " displayed when" " searching"
+            "Number of results displayed when searching"
         )
         self.fields["pagination_number"].label = _(
-            "Number of items per page," " standard size (e.g." " users)"
+            "Number of items per page, standard size (e.g. users)"
         )
         self.fields["pagination_large_number"].label = _(
-            "Number of items per" " page, large size" " (e.g. machines)"
+            "Number of items per page, large size (e.g. machines)"
         )
         self.fields["req_expire_hrs"].label = _(
-            "Time before expiration of the" " reset password link (in" " hours)"
+            "Time before expiration of the reset password link (in hours)"
         )
         self.fields["site_name"].label = _("Website name")
-        self.fields["email_from"].label = _("Email address for automatic" " emailing")
-        self.fields["GTU_sum_up"].label = _("Summary of the General Terms of" " Use")
+        self.fields["email_from"].label = _("Email address for automatic emailing")
+        self.fields["GTU_sum_up"].label = _("Summary of the General Terms of Use")
         self.fields["GTU"].label = _("General Terms of Use")
 
 
@@ -171,7 +171,7 @@ class EditAssoOptionForm(ModelForm):
         self.fields["telephone"].label = _("Telephone number")
         self.fields["pseudo"].label = _("Usual name")
         self.fields["utilisateur_asso"].label = _(
-            "Account used for editing" " from /admin"
+            "Account used for editing from /admin"
         )
         self.fields["description"].label = _("Description")
 
@@ -187,10 +187,10 @@ class EditMailMessageOptionForm(ModelForm):
         prefix = kwargs.pop("prefix", self.Meta.model.__name__)
         super(EditMailMessageOptionForm, self).__init__(*args, prefix=prefix, **kwargs)
         self.fields["welcome_mail_fr"].label = _(
-            "Message for the French" " welcome email"
+            "Message for the French welcome email"
         )
         self.fields["welcome_mail_en"].label = _(
-            "Message for the English" " welcome email"
+            "Message for the English welcome email"
         )
 
 
@@ -451,7 +451,7 @@ class DelDocumentTemplateForm(FormRevMixin, Form):
 
     document_templates = forms.ModelMultipleChoiceField(
         queryset=DocumentTemplate.objects.none(),
-        label=_("Available document templates"),
+        label=_("Current document templates"),
         widget=forms.CheckboxSelectMultiple,
     )
 
diff --git a/preferences/locale/fr/LC_MESSAGES/django.po b/preferences/locale/fr/LC_MESSAGES/django.po
index dc236a62..0047c101 100644
--- a/preferences/locale/fr/LC_MESSAGES/django.po
+++ b/preferences/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
 "PO-Revision-Date: 2018-06-24 15:54+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,245 +30,261 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: preferences/acl.py:42
+#: preferences/acl.py:44
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: preferences/forms.py:66
-#: preferences/templates/preferences/display_preferences.html:142
+#: preferences/forms.py:65
+#: preferences/templates/preferences/display_preferences.html:144
 msgid "Telephone number required"
 msgstr "Numéro de téléphone requis"
 
-#: preferences/forms.py:68
+#: preferences/forms.py:66
 msgid "GPG fingerprint"
 msgstr "Empreinte GPG"
 
-#: preferences/forms.py:69
+#: preferences/forms.py:67
 msgid "All can create a club"
 msgstr "Tous peuvent créer un club"
 
-#: preferences/forms.py:70
+#: preferences/forms.py:68
 msgid "All can create a member"
 msgstr "Tous peuvent créer un adhérent"
 
-#: preferences/forms.py:71
+#: preferences/forms.py:69
 #: preferences/templates/preferences/display_preferences.html:120
 msgid "Self registration"
 msgstr "Autoinscription"
 
-#: preferences/forms.py:72
+#: preferences/forms.py:70
 msgid "Default shell"
 msgstr "Interface en ligne de commande par défaut"
 
-#: preferences/forms.py:88
+#: preferences/forms.py:84
 msgid "Possibility to set a password per machine"
 msgstr "Possibilité de mettre un mot de passe par machine"
 
-#: preferences/forms.py:90
-#: preferences/templates/preferences/display_preferences.html:172
+#: preferences/forms.py:87
+#: preferences/templates/preferences/display_preferences.html:174
 msgid "Maximum number of interfaces allowed for a standard user"
 msgstr "Nombre maximum d'interfaces autorisé pour un utilisateur standard"
 
-#: preferences/forms.py:94
-#: preferences/templates/preferences/display_preferences.html:176
+#: preferences/forms.py:90
+#: preferences/templates/preferences/display_preferences.html:178
 msgid "Maximum number of DNS aliases allowed for a standard user"
 msgstr "Nombre maximum d'alias DNS autorisé pour un utilisateur standard"
 
-#: preferences/forms.py:97
+#: preferences/forms.py:92
 msgid "IPv6 mode"
 msgstr "Mode IPv6"
 
-#: preferences/forms.py:98
+#: preferences/forms.py:93
 msgid "Can create a machine"
 msgstr "Peut créer une machine"
 
-#: preferences/forms.py:144
+#: preferences/forms.py:136
 msgid "General message in French"
 msgstr "Message général en français"
 
-#: preferences/forms.py:145
+#: preferences/forms.py:137
 msgid "General message in English"
 msgstr "Message général en anglais"
 
-#: preferences/forms.py:146
+#: preferences/forms.py:139
 #: preferences/templates/preferences/display_preferences.html:58
 msgid "Number of results displayed when searching"
 msgstr "Nombre de résultats affichés lors de la recherche"
 
-#: preferences/forms.py:149
+#: preferences/forms.py:142
 msgid "Number of items per page, standard size (e.g. users)"
 msgstr "Nombre d'éléments par page, taille standard (ex : utilisateurs)"
 
-#: preferences/forms.py:152
+#: preferences/forms.py:145
 msgid "Number of items per page, large size (e.g. machines)"
 msgstr "Nombre d'éléments par page, taille importante (ex : machines)"
 
-#: preferences/forms.py:155
+#: preferences/forms.py:148
 #: preferences/templates/preferences/display_preferences.html:66
 msgid "Time before expiration of the reset password link (in hours)"
 msgstr ""
 "Temps avant expiration du lien de réinitialisation de mot de passe (en "
 "heures)"
 
-#: preferences/forms.py:158
+#: preferences/forms.py:150
 #: preferences/templates/preferences/display_preferences.html:52
 msgid "Website name"
 msgstr "Nom du site"
 
-#: preferences/forms.py:159
+#: preferences/forms.py:151
 #: preferences/templates/preferences/display_preferences.html:54
 msgid "Email address for automatic emailing"
 msgstr "Adresse mail pour les mails automatiques"
 
-#: preferences/forms.py:161
+#: preferences/forms.py:152
 #: preferences/templates/preferences/display_preferences.html:76
 msgid "Summary of the General Terms of Use"
 msgstr "Résumé des Conditions Générales d'Utilisation"
 
-#: preferences/forms.py:163
+#: preferences/forms.py:153
 #: preferences/templates/preferences/display_preferences.html:78
 msgid "General Terms of Use"
 msgstr "Conditions Générales d'Utilisation"
 
-#: preferences/forms.py:179
+#: preferences/forms.py:166
 msgid "Organisation name"
 msgstr "Nom de l'association"
 
-#: preferences/forms.py:180
-#: preferences/templates/preferences/display_preferences.html:323
+#: preferences/forms.py:167
+#: preferences/templates/preferences/display_preferences.html:307
 msgid "SIRET number"
 msgstr "Numéro SIRET"
 
-#: preferences/forms.py:181
+#: preferences/forms.py:168
 msgid "Address (line 1)"
 msgstr "Adresse (ligne 1)"
 
-#: preferences/forms.py:182
+#: preferences/forms.py:169
 msgid "Address (line 2)"
 msgstr "Adresse (ligne 2)"
 
-#: preferences/forms.py:183 preferences/models.py:476
-#: preferences/templates/preferences/display_preferences.html:331
+#: preferences/forms.py:170
+#: preferences/templates/preferences/display_preferences.html:315
 msgid "Contact email address"
 msgstr "Adresse mail de contact"
 
-#: preferences/forms.py:184
-#: preferences/templates/preferences/display_preferences.html:335
+#: preferences/forms.py:171
+#: preferences/templates/preferences/display_preferences.html:319
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: preferences/forms.py:185
-#: preferences/templates/preferences/display_preferences.html:337
+#: preferences/forms.py:172
+#: preferences/templates/preferences/display_preferences.html:321
 msgid "Usual name"
 msgstr "Nom d'usage"
 
-#: preferences/forms.py:186
+#: preferences/forms.py:174
 msgid "Account used for editing from /admin"
 msgstr "Compte utilisé pour les modifications depuis /admin"
 
-#: preferences/forms.py:188 preferences/forms.py:274
+#: preferences/forms.py:176 preferences/forms.py:321
 #: preferences/templates/preferences/aff_service.html:33
 msgid "Description"
 msgstr "Description"
 
-#: preferences/forms.py:204
+#: preferences/forms.py:190
 msgid "Message for the French welcome email"
 msgstr "Message pour le mail de bienvenue en français"
 
-#: preferences/forms.py:206
+#: preferences/forms.py:193
 msgid "Message for the English welcome email"
 msgstr "Message pour le mail de bienvenue en anglais"
 
-#: preferences/forms.py:223
+#: preferences/forms.py:207
 msgid "Facebook URL"
 msgstr "URL du compte Facebook"
 
-#: preferences/forms.py:224
+#: preferences/forms.py:208
 msgid "Twitter URL"
 msgstr "URL du compte Twitter"
 
-#: preferences/forms.py:225
-#: preferences/templates/preferences/display_preferences.html:495
+#: preferences/forms.py:209
+#: preferences/templates/preferences/display_preferences.html:482
 msgid "Twitter account name"
 msgstr "Nom du compte Twitter"
 
-#: preferences/forms.py:247
+#: preferences/forms.py:227
 msgid "You chose to set vlan but did not set any VLAN."
 msgstr ""
 "Vous avez choisi de paramétrer vlan mais vous n'avez indiqué aucun VLAN."
 
-#: preferences/forms.py:251
+#: preferences/forms.py:228
 msgid "Please, choose a VLAN."
 msgstr "Veuillez choisir un VLAN."
 
-#: preferences/forms.py:272
+#: preferences/forms.py:259
+msgid "There is already a mandate taking place at the specified start date."
+msgstr "Il y a déjà un mandat ayant cours à la date de début renseignée."
+
+#: preferences/forms.py:273
+msgid "There is already a mandate taking place at the specified end date."
+msgstr "Il y a déjà un madant ayant cours à la date de fin renseignée."
+
+#: preferences/forms.py:287
+msgid "The specified dates overlap with an existing mandate."
+msgstr "Les dates renseignées se superposent avec un mandat existant."
+
+#: preferences/forms.py:319
 #: preferences/templates/preferences/aff_service.html:31
-#: preferences/templates/preferences/display_preferences.html:321
+#: preferences/templates/preferences/display_preferences.html:305
 msgid "Name"
 msgstr "Nom"
 
-#: preferences/forms.py:273
+#: preferences/forms.py:320
 #: preferences/templates/preferences/aff_service.html:32
 msgid "URL"
 msgstr "URL"
 
-#: preferences/forms.py:275
+#: preferences/forms.py:322
 #: preferences/templates/preferences/aff_service.html:34
 msgid "Image"
 msgstr "Image"
 
-#: preferences/forms.py:282
+#: preferences/forms.py:330
 msgid "Current services"
 msgstr "Services actuels"
 
-#: preferences/forms.py:369
+#: preferences/forms.py:419
 msgid "Current email addresses"
 msgstr "Adresses mail actuelles"
 
-#: preferences/forms.py:403
-msgid "Available document templates"
-msgstr ""
+#: preferences/forms.py:454
+msgid "Current document templates"
+msgstr "Modèles de document actuels"
+
+#: preferences/forms.py:484
+msgid "Current attributes"
+msgstr "Attributs actuels"
 
 #: preferences/models.py:77
 msgid "Users can create a club."
 msgstr "Les utilisateurs peuvent créer un club."
 
-#: preferences/models.py:81
+#: preferences/models.py:80
 msgid "Users can create a member."
 msgstr "Les utilisateurs peuvent créer un adhérent."
 
-#: preferences/models.py:92
+#: preferences/models.py:87
 msgid "Users can edit their shell."
 msgstr "Les utilisateurs peuvent modifier leur interface en ligne de commande."
 
-#: preferences/models.py:96
+#: preferences/models.py:90
 msgid "Users can edit their room."
 msgstr "Les utilisateurs peuvent modifier leur chambre."
 
-#: preferences/models.py:100
+#: preferences/models.py:93
 msgid "Enable local email accounts for users."
 msgstr "Activer les comptes mail locaux pour les utilisateurs."
 
-#: preferences/models.py:105
-msgid "Domain to use for local email accounts"
-msgstr "Domaine à utiliser pour les comptes mail locaux"
+#: preferences/models.py:98
+msgid "Domain to use for local email accounts."
+msgstr "Domaine à utiliser pour les comptes mail locaux."
 
-#: preferences/models.py:109
+#: preferences/models.py:102
 msgid "Maximum number of local email addresses for a standard user."
 msgstr ""
 "Nombre maximum d'adresses mail locales autorisé pour un utilisateur standard."
 
-#: preferences/models.py:114
+#: preferences/models.py:107
 msgid "Not yet active users will be deleted after this number of days."
 msgstr ""
 "Les utilisateurs n'ayant jamais adhéré seront supprimés après ce nombre de "
 "jours."
 
-#: preferences/models.py:119
+#: preferences/models.py:111
 msgid "A new user can create their account on Re2o."
 msgstr "Un nouvel utilisateur peut créer son compte sur Re2o."
 
-#: preferences/models.py:123
+#: preferences/models.py:116
 msgid ""
 "If True, all new created and connected users are active. If False, only when "
 "a valid registration has been paid."
@@ -276,309 +292,397 @@ msgstr ""
 "Si True, tous les nouveaux utilisations créés et connectés sont actifs. Si "
 "False, seulement quand une inscription validée a été payée."
 
-#: preferences/models.py:129
-msgid "Can view the user options"
-msgstr "Peut voir les options d'utilisateur"
+#: preferences/models.py:121
+msgid "If True, archived users are allowed to connect."
+msgstr "Si True, les utilisateurs archivés sont autorisés à se connecter."
 
-#: preferences/models.py:131
-msgid "user options"
-msgstr "options d'utilisateur"
+#: preferences/models.py:125
+msgid "Can view the user preferences"
+msgstr "Peut voir les préférences d'utilisateur"
 
-#: preferences/models.py:138
-msgid "Email domain must begin with @"
-msgstr "Un domaine mail doit commencer par @"
+#: preferences/models.py:126
+msgid "user preferences"
+msgstr "Préférences d'utilisateur"
 
-#: preferences/models.py:156
-msgid "Autoconfiguration by RA"
+#: preferences/models.py:133
+msgid "Email domain must begin with @."
+msgstr "Un domaine mail doit commencer par @."
+
+#: preferences/models.py:151
+msgid "Automatic configuration by RA"
 msgstr "Configuration automatique par RA"
 
-#: preferences/models.py:157
-msgid "IP addresses assigning by DHCPv6"
+#: preferences/models.py:152
+msgid "IP addresses assignment by DHCPv6"
 msgstr "Attribution d'adresses IP par DHCPv6"
 
-#: preferences/models.py:158
+#: preferences/models.py:153
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: preferences/models.py:180
-msgid "Can view the machine options"
-msgstr "Peut voir les options de machine"
+#: preferences/models.py:162
+msgid "default Time To Live (TTL) for CNAME, A and AAAA records"
+msgstr ""
+"Temps de vie (TTL) par défault pour des enregistrements CNAME, A et AAAA"
 
-#: preferences/models.py:182
-msgid "machine options"
-msgstr "options de machine"
+#: preferences/models.py:172
+msgid "Can view the machine preferences"
+msgstr "Peut voir les préférences de machine"
 
-#: preferences/models.py:201 preferences/models.py:598
+#: preferences/models.py:173
+msgid "machine preferences"
+msgstr "Préférences de machine"
+
+#: preferences/models.py:193 preferences/models.py:651
 msgid "On the IP range's VLAN of the machine"
 msgstr "Sur le VLAN de la plage d'IP de la machine"
 
-#: preferences/models.py:202 preferences/models.py:599
-msgid "Preset in 'VLAN for machines accepted by RADIUS'"
-msgstr "Prédéfinie dans 'VLAN pour les machines acceptées par RADIUS'"
+#: preferences/models.py:194 preferences/models.py:652
+msgid "Preset in \"VLAN for machines accepted by RADIUS\""
+msgstr "Prédéfinie dans « VLAN pour les machines acceptées par RADIUS »"
 
-#: preferences/models.py:211
-#: preferences/templates/preferences/display_preferences.html:246
-msgid "Web management, activated in case of automatic provision"
-msgstr "Gestion web, activée en cas de provision automatique"
+#: preferences/models.py:200
+msgid "Web management, activated in case of automatic provision."
+msgstr "Gestion web, activée en cas de provision automatique."
 
-#: preferences/models.py:215
+#: preferences/models.py:205
 msgid ""
-"SSL web management, make sure that a certificate is installed on the switch"
+"SSL web management, make sure that a certificate is installed on the switch."
 msgstr ""
 "Gestion web SSL, vérifiez qu'un certificat est installé sur le commutateur "
-"réseau"
+"réseau."
 
-#: preferences/models.py:220
-#: preferences/templates/preferences/display_preferences.html:248
-msgid "REST management, activated in case of automatic provision"
-msgstr "Gestion REST, activée en cas de provision automatique"
+#: preferences/models.py:211
+msgid "REST management, activated in case of automatic provision."
+msgstr "Gestion REST, activée en cas de provision automatique."
+
+#: preferences/models.py:218
+msgid "IP range for the management of switches."
+msgstr "Plage d'IP pour la gestion des commutateurs réseau."
+
+#: preferences/models.py:224
+msgid "Provision of configuration mode for switches."
+msgstr "Mode de provision de configuration pour les commutateurs réseau."
 
 #: preferences/models.py:227
-#: preferences/templates/preferences/display_preferences.html:262
-msgid "IP range for the management of switches"
-msgstr "Plage d'IP pour la gestion des commutateurs réseau"
+msgid "SFTP login for switches."
+msgstr "Identifiant SFTP pour les commutateurs réseau."
 
-#: preferences/models.py:233
-#: preferences/templates/preferences/display_preferences.html:270
-msgid "Provision of configuration mode for switches"
-msgstr "Mode de provision de configuration pour les commutateurs réseau"
+#: preferences/models.py:230
+msgid "SFTP password."
+msgstr "Mot de passe SFTP."
 
-#: preferences/models.py:239
-msgid "SFTP login for switches"
-msgstr "Identifiant SFTP pour les commutateurs réseau"
+#: preferences/models.py:334
+msgid "Can view the topology preferences"
+msgstr "Peut voir les préférences de topologie"
 
-#: preferences/models.py:245
-msgid "SFTP password"
-msgstr "Mot de passe SFTP"
+#: preferences/models.py:335
+msgid "topology preferences"
+msgstr "préférences de topologie"
 
-#: preferences/models.py:304
-msgid "Can view the topology options"
-msgstr "Peut voir les options de topologie"
+#: preferences/models.py:348
+msgid "RADIUS key."
+msgstr "Clé RADIUS."
 
-#: preferences/models.py:306
-msgid "topology options"
-msgstr "options de topologie"
+#: preferences/models.py:350
+msgid "Comment for this key."
+msgstr "Commentaire pour cette clé."
 
-#: preferences/models.py:320 preferences/models.py:338
-msgid "RADIUS key"
-msgstr "Clé RADIUS"
+#: preferences/models.py:353
+msgid "Default key for switches."
+msgstr "Clé par défaut pour les commutateurs réseau."
 
-#: preferences/models.py:326
-msgid "Comment for this key"
-msgstr "Commentaire pour cette clé"
-
-#: preferences/models.py:331
-msgid "Default key for switches"
-msgstr "Clé par défaut pour les commutateurs réseau"
-
-#: preferences/models.py:336
+#: preferences/models.py:357
 msgid "Can view a RADIUS key object"
 msgstr "Peut voir un objet clé RADIUS"
 
-#: preferences/models.py:339
-#: preferences/templates/preferences/display_preferences.html:221
+#: preferences/models.py:358 preferences/views.py:331
+msgid "RADIUS key"
+msgstr "Clé RADIUS"
+
+#: preferences/models.py:359
+#: preferences/templates/preferences/display_preferences.html:201
 msgid "RADIUS keys"
 msgstr "clés RADIUS"
 
-#: preferences/models.py:342
+#: preferences/models.py:366
+msgid "Default RADIUS key for switches already exists."
+msgstr "Clé par défaut pour les commutateurs réseau."
+
+#: preferences/models.py:369
 msgid "RADIUS key "
 msgstr "clé RADIUS "
 
-#: preferences/models.py:349
-#: preferences/templates/preferences/aff_switchmanagementcred.html:31
-msgid "Switch login"
-msgstr "Identifiant du commutateur réseau"
+#: preferences/models.py:375
+msgid "Switch login."
+msgstr "Identifiant du commutateur réseau."
 
-#: preferences/models.py:353
-msgid "Password"
-msgstr "Mot de passe"
+#: preferences/models.py:376
+msgid "Password."
+msgstr "Mot de passe."
 
-#: preferences/models.py:358
-msgid "Default credentials for switches"
-msgstr "Identifiants par défaut pour les commutateurs réseau"
+#: preferences/models.py:378
+msgid "Default credentials for switches."
+msgstr "Identifiants par défaut pour les commutateurs réseau."
 
-#: preferences/models.py:363
+#: preferences/models.py:385
 msgid "Can view a switch management credentials object"
 msgstr "Peut voir un objet identifiants de gestion de commutateur réseau"
 
-#: preferences/models.py:366
+#: preferences/models.py:388 preferences/views.py:394
 msgid "switch management credentials"
 msgstr "identifiants de gestion de commutateur réseau"
 
-#: preferences/models.py:369
+#: preferences/models.py:391
 msgid "Switch login "
 msgstr "Identifiant du commutateur réseau "
 
-#: preferences/models.py:381
-msgid "Delay between the email and the membership's end"
-msgstr "Délai entre le mail et la fin d'adhésion"
+#: preferences/models.py:403
+msgid "Delay between the email and the membership's end."
+msgstr "Délai entre le mail et la fin d'adhésion."
 
-#: preferences/models.py:387
-msgid "Message displayed specifically for this reminder"
-msgstr "Message affiché spécifiquement pour ce rappel"
+#: preferences/models.py:409
+msgid "Message displayed specifically for this reminder."
+msgstr "Message affiché spécifiquement pour ce rappel."
 
-#: preferences/models.py:392
+#: preferences/models.py:413
 msgid "Can view a reminder object"
 msgstr "Peut voir un objet rappel"
 
-#: preferences/models.py:394
+#: preferences/models.py:414 preferences/views.py:276
 msgid "reminder"
 msgstr "rappel"
 
-#: preferences/models.py:395
+#: preferences/models.py:415
 msgid "reminders"
 msgstr "rappels"
 
-#: preferences/models.py:412
+#: preferences/models.py:436
 msgid ""
 "General message displayed on the French version of the website (e.g. in case "
-"of maintenance)"
+"of maintenance)."
 msgstr ""
 "Message général affiché sur la version française du site (ex : en cas de "
-"maintenance)"
+"maintenance)."
 
-#: preferences/models.py:418
+#: preferences/models.py:444
 msgid ""
 "General message displayed on the English version of the website (e.g. in "
-"case of maintenance)"
+"case of maintenance)."
 msgstr ""
 "Message général affiché sur la version anglaise du site (ex : en cas de "
-"maintenance)"
+"maintenance)."
 
-#: preferences/models.py:441
-msgid "Can view the general options"
-msgstr "Peut voir les options générales"
+#: preferences/models.py:459
+msgid "Can view the general preferences"
+msgstr "Peut voir les préférences générales"
 
-#: preferences/models.py:443
-msgid "general options"
-msgstr "options générales"
+#: preferences/models.py:460
+msgid "general preferences"
+msgstr "préférences générales"
 
-#: preferences/models.py:463
-msgid "Can view the service options"
-msgstr "Peut voir les options de service"
+#: preferences/models.py:480
+msgid "Can view the service preferences"
+msgstr "Peut voir les préférences de service"
 
-#: preferences/models.py:465
+#: preferences/models.py:481 preferences/views.py:227
 msgid "service"
 msgstr "service"
 
-#: preferences/models.py:466
+#: preferences/models.py:482
 msgid "services"
 msgstr "services"
 
-#: preferences/models.py:482
+#: preferences/models.py:492
+msgid "Contact email address."
+msgstr "Adresse mail de contact."
+
+#: preferences/models.py:498
 msgid "Description of the associated email address."
 msgstr "Description de l'adresse mail associée."
 
-#: preferences/models.py:492
+#: preferences/models.py:508
 msgid "Can view a contact email address object"
 msgstr "Peut voir un objet adresse mail de contact"
 
-#: preferences/models.py:494
+#: preferences/models.py:510
 msgid "contact email address"
 msgstr "adresse mail de contact"
 
-#: preferences/models.py:495
+#: preferences/models.py:511
 msgid "contact email addresses"
 msgstr "adresses mail de contact"
 
-#: preferences/models.py:505
+#: preferences/models.py:519 preferences/views.py:634
+msgid "mandate"
+msgstr "mandat"
+
+#: preferences/models.py:520
+msgid "mandates"
+msgstr "mandats"
+
+#: preferences/models.py:521
+msgid "Can view a mandate object"
+msgstr "Peut voir un objet mandat"
+
+#: preferences/models.py:528
+msgid "president of the association"
+msgstr "président de l'association"
+
+#: preferences/models.py:529
+msgid "Displayed on subscription vouchers."
+msgstr "Affiché sur les reçus de cotisation."
+
+#: preferences/models.py:531
+msgid "start date"
+msgstr "date de début"
+
+#: preferences/models.py:532
+msgid "end date"
+msgstr "date de fin"
+
+#: preferences/models.py:545
+msgid ""
+"No mandates have been created. Please go to the preferences page to create "
+"one."
+msgstr ""
+"Aucun mandat n'a été créé. Veuillez vous rendre sur la page de préférences "
+"pour en créer un."
+
+#: preferences/models.py:560
 msgid "Networking organisation school Something"
 msgstr "Association de réseau de l'école Machin"
 
-#: preferences/models.py:509
+#: preferences/models.py:563
 msgid "Threadneedle Street"
 msgstr "1 rue de la Vrillière"
 
-#: preferences/models.py:510
+#: preferences/models.py:564
 msgid "London EC2R 8AH"
 msgstr "75001 Paris"
 
-#: preferences/models.py:513
+#: preferences/models.py:567
 msgid "Organisation"
 msgstr "Association"
 
-#: preferences/models.py:527
-#: preferences/templates/preferences/display_preferences.html:347
-msgid "President of the association"
-msgstr "Président de l'association"
+#: preferences/models.py:574
+msgid "Can view the organisation preferences"
+msgstr "Peut voir les préférences d'association"
 
-#: preferences/models.py:528
-msgid "Displayed on subscription vouchers"
-msgstr ""
-
-#: preferences/models.py:533
-msgid "Can view the organisation options"
-msgstr "Peut voir les options d'association"
-
-#: preferences/models.py:535
-msgid "organisation options"
-msgstr "options d'association"
-
-#: preferences/models.py:564
-msgid "Can view the homepage options"
-msgstr "Peut voir les options de page d'accueil"
-
-#: preferences/models.py:566
-msgid "homepage options"
-msgstr "options de page d'accueil"
-
-#: preferences/models.py:579
-msgid "Welcome email in French"
-msgstr "Mail de bienvenue en français"
-
-#: preferences/models.py:580
-msgid "Welcome email in English"
-msgstr "Mail de bienvenue en anglais"
-
-#: preferences/models.py:584
-msgid "Can view the email message options"
-msgstr "Peut voir les options de message pour les mails"
-
-#: preferences/models.py:587
-msgid "email message options"
-msgstr "options de messages pour les mails"
-
-#: preferences/models.py:592
-msgid "RADIUS policy"
-msgstr "Politique de RADIUS"
+#: preferences/models.py:575
+msgid "organisation preferences"
+msgstr "préférences d'association"
 
 #: preferences/models.py:593
-msgid "RADIUS policies"
-msgstr "Politiques de RADIUS"
+msgid "Can view the homepage preferences"
+msgstr "Peut voir les préférences de page d'accueil"
 
-#: preferences/models.py:604
+#: preferences/models.py:594
+msgid "homepage preferences"
+msgstr "Préférences de page d'accueil"
+
+#: preferences/models.py:608
+msgid "Welcome email in French."
+msgstr "Mail de bienvenue en français."
+
+#: preferences/models.py:611
+msgid "Welcome email in English."
+msgstr "Mail de bienvenue en anglais."
+
+#: preferences/models.py:616
+msgid "Can view the email message preferences"
+msgstr "Peut voir les préférences de message pour les mails"
+
+#: preferences/models.py:618
+msgid "email message preferences"
+msgstr "préférences de messages pour les mails"
+
+#: preferences/models.py:623
+msgid "RADIUS attribute"
+msgstr "attribut RADIUS"
+
+#: preferences/models.py:624
+msgid "RADIUS attributes"
+msgstr "attributs RADIUS"
+
+#: preferences/models.py:628 preferences/views.py:587
+msgid "attribute"
+msgstr "attribut"
+
+#: preferences/models.py:629
+msgid "See https://freeradius.org/rfc/attributes.html."
+msgstr "Voir https://freeradius.org/rfc/attributes.html."
+
+#: preferences/models.py:631
+msgid "value"
+msgstr "valeur"
+
+#: preferences/models.py:633
+msgid "comment"
+msgstr "commentaire"
+
+#: preferences/models.py:634
+msgid "Use this field to document this attribute."
+msgstr "Utilisez ce champ pour documenter cet attribut."
+
+#: preferences/models.py:645
+msgid "RADIUS policy"
+msgstr "politique de RADIUS"
+
+#: preferences/models.py:646
+#: preferences/templates/preferences/display_preferences.html:279
+msgid "RADIUS policies"
+msgstr "politiques de RADIUS"
+
+#: preferences/models.py:657
 msgid "Reject the machine"
 msgstr "Rejeter la machine"
 
-#: preferences/models.py:605
+#: preferences/models.py:658
 msgid "Place the machine on the VLAN"
 msgstr "Placer la machine sur le VLAN"
 
-#: preferences/models.py:616
-msgid "Policy for unknown machines"
-msgstr "Politique pour les machines inconnues"
+#: preferences/models.py:667
+msgid "policy for unknown machines"
+msgstr "politique pour les machines inconnues"
 
-#: preferences/models.py:624
-msgid "Unknown machines VLAN"
+#: preferences/models.py:675
+msgid "unknown machines VLAN"
 msgstr "VLAN pour les machines inconnues"
 
-#: preferences/models.py:625
-msgid "VLAN for unknown machines if not rejected"
-msgstr "VLAN pour les machines inconnues si non rejeté"
+#: preferences/models.py:676
+msgid "VLAN for unknown machines if not rejected."
+msgstr "VLAN pour les machines inconnues si non rejeté."
 
-#: preferences/models.py:631
-msgid "Policy for unknown ports"
-msgstr "Politique pour les ports inconnus"
+#: preferences/models.py:682
+msgid "unknown machines attributes"
+msgstr "attributs pour les machines inconnues"
 
-#: preferences/models.py:639
-msgid "Unknown ports VLAN"
+#: preferences/models.py:683
+msgid "Answer attributes for unknown machines."
+msgstr "Attributs de réponse pour les machines inconnues."
+
+#: preferences/models.py:689
+msgid "policy for unknown ports"
+msgstr "politique pour les ports inconnus"
+
+#: preferences/models.py:697
+msgid "unknown ports VLAN"
 msgstr "VLAN pour les ports inconnus"
 
-#: preferences/models.py:640
-msgid "VLAN for unknown ports if not rejected"
-msgstr "VLAN pour les ports inconnus si non rejeté"
+#: preferences/models.py:698
+msgid "VLAN for unknown ports if not rejected."
+msgstr "VLAN pour les ports inconnus si non rejeté."
 
-#: preferences/models.py:646
+#: preferences/models.py:704
+msgid "unknown ports attributes"
+msgstr "attributs pour les ports inconnus"
+
+#: preferences/models.py:705
+msgid "Answer attributes for unknown ports."
+msgstr "Attributs de réponse pour les ports inconnus."
+
+#: preferences/models.py:712
 msgid ""
 "Policy for machines connecting from unregistered rooms (relevant on ports "
 "with STRICT RADIUS mode)"
@@ -586,88 +690,149 @@ msgstr ""
 "Politique pour les machines se connectant depuis des chambre non "
 "enregistrées (pertinent pour les ports avec le mode de RADIUS STRICT)"
 
-#: preferences/models.py:655
-msgid "Unknown rooms VLAN"
+#: preferences/models.py:722
+msgid "unknown rooms VLAN"
 msgstr "VLAN pour les chambres inconnues"
 
-#: preferences/models.py:656
-msgid "VLAN for unknown rooms if not rejected"
-msgstr "VLAN pour les chambres inconnues si non rejeté"
+#: preferences/models.py:723
+msgid "VLAN for unknown rooms if not rejected."
+msgstr "VLAN pour les chambres inconnues si non rejeté."
 
-#: preferences/models.py:662
-msgid "Policy for non members"
-msgstr "Politique pour les non adhérents"
+#: preferences/models.py:729
+msgid "unknown rooms attributes"
+msgstr "attributs pour les chambres inconnues"
 
-#: preferences/models.py:670
-msgid "Non members VLAN"
+#: preferences/models.py:730
+msgid "Answer attributes for unknown rooms."
+msgstr "Attributs de réponse pour les chambres inconnues."
+
+#: preferences/models.py:736
+msgid "policy for non members"
+msgstr "politique pour les non adhérents"
+
+#: preferences/models.py:744
+msgid "non members VLAN"
 msgstr "VLAN pour les non adhérents"
 
-#: preferences/models.py:671
-msgid "VLAN for non members if not rejected"
-msgstr "VLAN pour les non adhérents si non rejeté"
+#: preferences/models.py:745
+msgid "VLAN for non members if not rejected."
+msgstr "VLAN pour les non adhérents si non rejeté."
 
-#: preferences/models.py:677
-msgid "Policy for banned users"
-msgstr "Politique pour les utilisateurs bannis"
-
-#: preferences/models.py:685
-msgid "Banned users VLAN"
-msgstr "VLAN pour les utilisateurs bannis"
-
-#: preferences/models.py:686
-msgid "VLAN for banned users if not rejected"
-msgstr "VLAN pour les utilisateurs bannis si non rejeté"
-
-#: preferences/models.py:715
-msgid "cotisations options"
-msgstr "options de cotisation"
-
-#: preferences/models.py:719
-msgid "Template for invoices"
-msgstr ""
-
-#: preferences/models.py:726
-msgid "Template for subscription voucher"
-msgstr ""
-
-#: preferences/models.py:732
-msgid "Send voucher by email when the invoice is controlled."
-msgstr ""
-
-#: preferences/models.py:743
-msgid "template"
-msgstr ""
-
-#: preferences/models.py:747
-msgid "name"
-msgstr ""
+#: preferences/models.py:751
+msgid "non members attributes"
+msgstr "attributs pour les non adhérents"
 
 #: preferences/models.py:752
-msgid "document template"
-msgstr ""
+msgid "Answer attributes for non members."
+msgstr "Attributs de réponse pour les non adhérents."
 
-#: preferences/models.py:753
-msgid "document templates"
+#: preferences/models.py:758
+msgid "policy for banned users"
+msgstr "politique pour les utilisateurs bannis"
+
+#: preferences/models.py:766
+msgid "banned users VLAN"
+msgstr "VLAN pour les utilisateurs bannis"
+
+#: preferences/models.py:767
+msgid "VLAN for banned users if not rejected."
+msgstr "VLAN pour les utilisateurs bannis si non rejeté."
+
+#: preferences/models.py:773
+msgid "banned users attributes"
+msgstr "attributs pour les utilisateurs bannis"
+
+#: preferences/models.py:774
+msgid "Answer attributes for banned users."
+msgstr "Attributs de réponse pour les utilisateurs bannis."
+
+#: preferences/models.py:787
+msgid "accepted users attributes"
+msgstr "attributs pour les utilisateurs acceptés"
+
+#: preferences/models.py:788
+msgid "Answer attributes for accepted users."
+msgstr "Attributs de réponse pour les utilisateurs acceptés."
+
+#: preferences/models.py:815
+msgid "subscription preferences"
+msgstr "préférences de cotisation"
+
+#: preferences/models.py:819
+msgid "template for invoices"
+msgstr "modèle pour les factures"
+
+#: preferences/models.py:826
+msgid "template for subscription vouchers"
+msgstr "modèle pour les reçus de cotisation"
+
+#: preferences/models.py:832
+msgid "send voucher by email when the invoice is controlled"
+msgstr "envoyer le reçu par mail quand la facture est contrôlée"
+
+#: preferences/models.py:834
+msgid ""
+"Be careful, if no mandate is defined on the preferences page, errors will be "
+"triggered when generating vouchers."
 msgstr ""
+"Faites attention, si aucun mandat n'est défini sur la page de préférences, "
+"des erreurs seront déclenchées en générant des reçus."
+
+#: preferences/models.py:846
+msgid "template"
+msgstr "modèle"
+
+#: preferences/models.py:847
+msgid "name"
+msgstr "nom"
+
+#: preferences/models.py:850
+msgid "document template"
+msgstr "modèle de document"
+
+#: preferences/models.py:851
+msgid "document templates"
+msgstr "modèles de document"
 
 #: preferences/templates/preferences/aff_document_template.html:32
 msgid "Document template"
-msgstr ""
+msgstr "Modèle de document"
 
 #: preferences/templates/preferences/aff_document_template.html:33
 msgid "File"
-msgstr ""
+msgstr "Fichier"
 
 #: preferences/templates/preferences/aff_mailcontact.html:31
-#: preferences/templates/preferences/display_preferences.html:327
+#: preferences/templates/preferences/display_preferences.html:311
 msgid "Address"
 msgstr "Adresse"
 
 #: preferences/templates/preferences/aff_mailcontact.html:32
+#: preferences/templates/preferences/aff_radiusattributes.html:30
 #: preferences/templates/preferences/aff_radiuskey.html:32
 msgid "Comment"
 msgstr "Commentaire"
 
+#: preferences/templates/preferences/aff_mandate.html:29
+msgid "Start date"
+msgstr "Date de début"
+
+#: preferences/templates/preferences/aff_mandate.html:30
+msgid "End date"
+msgstr "Date de fin"
+
+#: preferences/templates/preferences/aff_mandate.html:31
+msgid "President"
+msgstr "Président"
+
+#: preferences/templates/preferences/aff_mandate.html:38
+msgid "In progress"
+msgstr "En cours"
+
+#: preferences/templates/preferences/aff_radiusattributes.html:29
+msgid "Attribute"
+msgstr "Attribut"
+
 #: preferences/templates/preferences/aff_radiuskey.html:31
 msgid "RADIUS key ID"
 msgstr "ID de la clé RADIUS"
@@ -677,27 +842,24 @@ msgid "Default RADIUS key for switches"
 msgstr "Clé RADIUS par défaut pour les commutateurs réseau"
 
 #: preferences/templates/preferences/aff_radiuskey.html:34
-msgid "RADIUS key used by the swithes"
-msgstr "Clé RADIUS utilisée par les commutateurs réseau"
+msgid "Switches using the RADIUS key"
+msgstr "Commutateurs réseau utilisant la clé RADIUS"
 
 #: preferences/templates/preferences/aff_radiusoptions.html:28
-#: preferences/templates/preferences/display_preferences.html:204
 msgid "General policy for VLAN setting"
 msgstr "Politique générale pour le placement sur un VLAN"
 
 #: preferences/templates/preferences/aff_radiusoptions.html:30
-#: preferences/templates/preferences/display_preferences.html:206
 msgid ""
 "This setting defines the VLAN policy after acceptance by RADIUS: either on "
-"the IP range's VLAN of the machine, or a VLAN preset in 'VLAN for machines "
-"accepted by RADIUS'"
+"the IP range's VLAN of the machine, or a VLAN preset in \"VLAN for machines "
+"accepted by RADIUS\"."
 msgstr ""
 "Ce réglage définit la politique de placement sur un VLAN après acceptation "
 "par RADIUS: soit sur le VLAN de la plage d'IP de la machine, soit sur le "
-"VLAN prédéfini dans 'VLAN pour les machines acceptées par RADIUS'"
+"VLAN prédéfini dans « VLAN pour les machines acceptées par RADIUS »."
 
 #: preferences/templates/preferences/aff_radiusoptions.html:33
-#: preferences/templates/preferences/display_preferences.html:210
 msgid "VLAN for machines accepted by RADIUS"
 msgstr "VLAN pour les machines acceptées par RADIUS"
 
@@ -706,63 +868,68 @@ msgstr "VLAN pour les machines acceptées par RADIUS"
 msgid "VLAN %(vlan_decision_ok)s"
 msgstr "VLAN %(vlan_decision_ok)s"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:41
+#: preferences/templates/preferences/aff_radiusoptions.html:35
+#: preferences/templates/preferences/aff_radiusoptions.html:50
+msgid "Attributes"
+msgstr "Attributs"
+
+#: preferences/templates/preferences/aff_radiusoptions.html:48
 msgid "Situation"
 msgstr "Situation"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:42
+#: preferences/templates/preferences/aff_radiusoptions.html:49
 msgid "Behaviour"
 msgstr "Comportement"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:46
+#: preferences/templates/preferences/aff_radiusoptions.html:54
 msgid "Unknown machine"
 msgstr "Machine inconnue"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:49
-#: preferences/templates/preferences/aff_radiusoptions.html:59
-#: preferences/templates/preferences/aff_radiusoptions.html:69
-#: preferences/templates/preferences/aff_radiusoptions.html:79
-#: preferences/templates/preferences/aff_radiusoptions.html:89
+#: preferences/templates/preferences/aff_radiusoptions.html:57
+#: preferences/templates/preferences/aff_radiusoptions.html:74
+#: preferences/templates/preferences/aff_radiusoptions.html:91
+#: preferences/templates/preferences/aff_radiusoptions.html:108
+#: preferences/templates/preferences/aff_radiusoptions.html:125
 msgid "Reject"
 msgstr "Rejeter"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:51
+#: preferences/templates/preferences/aff_radiusoptions.html:59
 #, python-format
 msgid "VLAN %(unknown_machine_vlan)s"
 msgstr "VLAN %(unknown_machine_vlan)s"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:56
+#: preferences/templates/preferences/aff_radiusoptions.html:71
 msgid "Unknown port"
 msgstr "Port inconnu"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:61
+#: preferences/templates/preferences/aff_radiusoptions.html:76
 #, python-format
 msgid "VLAN %(unknown_port_vlan)s"
 msgstr "VLAN %(unknown_port_vlan)s"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:66
+#: preferences/templates/preferences/aff_radiusoptions.html:88
 msgid "Unknown room"
 msgstr "Chambre inconnue"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:71
+#: preferences/templates/preferences/aff_radiusoptions.html:93
 #, python-format
 msgid "VLAN %(unknown_room_vlan)s"
 msgstr "VLAN %(unknown_room_vlan)s"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:76
+#: preferences/templates/preferences/aff_radiusoptions.html:105
 msgid "Non member"
 msgstr "Non adhérent"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:81
+#: preferences/templates/preferences/aff_radiusoptions.html:110
 #, python-format
 msgid "VLAN %(non_member_vlan)s"
 msgstr "VLAN %(non_member_vlan)s"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:86
+#: preferences/templates/preferences/aff_radiusoptions.html:122
 msgid "Banned user"
 msgstr "Utilisateur banni"
 
-#: preferences/templates/preferences/aff_radiusoptions.html:91
+#: preferences/templates/preferences/aff_radiusoptions.html:127
 #, python-format
 msgid "VLAN %(banned_vlan)s"
 msgstr "VLAN %(banned_vlan)s"
@@ -775,13 +942,17 @@ msgstr "Nombre de jours avant le rappel"
 msgid "Message for this reminder"
 msgstr "Message pour ce rappel"
 
+#: preferences/templates/preferences/aff_switchmanagementcred.html:31
+msgid "Switch login"
+msgstr "Identifiant du commutateur réseau"
+
 #: preferences/templates/preferences/aff_switchmanagementcred.html:32
 msgid "Default switch management credentials"
 msgstr "Identifiants de gestion de commutateur réseau par défaut"
 
 #: preferences/templates/preferences/aff_switchmanagementcred.html:33
-msgid "Management credentials used by the switches"
-msgstr "Identifiants de gestion utilisés par les commutateurs réseau"
+msgid "Switches using the management credentials"
+msgstr "Commutateurs réseau utilisant les identifiants"
 
 #: preferences/templates/preferences/delete.html:29
 msgid "Deletion of preferences"
@@ -812,16 +983,16 @@ msgstr "Préférences générales"
 
 #: preferences/templates/preferences/display_preferences.html:46
 #: preferences/templates/preferences/display_preferences.html:108
-#: preferences/templates/preferences/display_preferences.html:165
-#: preferences/templates/preferences/display_preferences.html:199
-#: preferences/templates/preferences/display_preferences.html:240
-#: preferences/templates/preferences/display_preferences.html:301
-#: preferences/templates/preferences/display_preferences.html:316
-#: preferences/templates/preferences/display_preferences.html:410
-#: preferences/templates/preferences/display_preferences.html:488
+#: preferences/templates/preferences/display_preferences.html:167
+#: preferences/templates/preferences/display_preferences.html:220
+#: preferences/templates/preferences/display_preferences.html:282
+#: preferences/templates/preferences/display_preferences.html:300
+#: preferences/templates/preferences/display_preferences.html:397
+#: preferences/templates/preferences/display_preferences.html:475
 #: preferences/templates/preferences/edit_preferences.html:46
-#: preferences/views.py:193 preferences/views.py:241 preferences/views.py:287
-#: preferences/views.py:336 preferences/views.py:396 preferences/views.py:468
+#: preferences/views.py:212 preferences/views.py:261 preferences/views.py:307
+#: preferences/views.py:367 preferences/views.py:431 preferences/views.py:496
+#: preferences/views.py:572 preferences/views.py:619
 msgid "Edit"
 msgstr "Modifier"
 
@@ -878,203 +1049,236 @@ msgstr "%(delete_notyetactive)s jours"
 msgid "All users are active by default"
 msgstr "Tous les utilisateurs sont actifs par défault"
 
-#: preferences/templates/preferences/display_preferences.html:131
+#: preferences/templates/preferences/display_preferences.html:128
+msgid "Allow archived users to log in"
+msgstr "Autoriser les utilisateurs archivés à se connecter"
+
+#: preferences/templates/preferences/display_preferences.html:133
 msgid "Users general permissions"
 msgstr "Permissions générales des utilisateurs"
 
-#: preferences/templates/preferences/display_preferences.html:134
+#: preferences/templates/preferences/display_preferences.html:136
 msgid "Default shell for users"
 msgstr "Interface en ligne de commande par défaut pour les utilisateurs"
 
-#: preferences/templates/preferences/display_preferences.html:136
+#: preferences/templates/preferences/display_preferences.html:138
 msgid "Users can edit their shell"
 msgstr "Les utilisateurs peuvent modifier leur interface en ligne de commande"
 
-#: preferences/templates/preferences/display_preferences.html:140
+#: preferences/templates/preferences/display_preferences.html:142
 msgid "Users can edit their room"
 msgstr "Les utilisateurs peuvent modifier leur chambre"
 
-#: preferences/templates/preferences/display_preferences.html:146
+#: preferences/templates/preferences/display_preferences.html:148
 msgid "GPG fingerprint field"
 msgstr "Champ empreinte GPG"
 
-#: preferences/templates/preferences/display_preferences.html:157
-msgid "Machines preferences"
-msgstr "Préférences de machines"
+#: preferences/templates/preferences/display_preferences.html:159
+msgid "Machine preferences"
+msgstr "Préférences de machine"
 
-#: preferences/templates/preferences/display_preferences.html:170
+#: preferences/templates/preferences/display_preferences.html:172
 msgid "Password per machine"
 msgstr "Mot de passe par machine"
 
-#: preferences/templates/preferences/display_preferences.html:178
+#: preferences/templates/preferences/display_preferences.html:180
+msgid "Default Time To Live (TTL) for CNAME, A and AAAA records."
+msgstr ""
+"Temps de vie (TTL) par défault pour des enregistrements CNAME, A et AAAA."
+
+#: preferences/templates/preferences/display_preferences.html:184
 msgid "IPv6 support"
 msgstr "Support de l'IPv6"
 
-#: preferences/templates/preferences/display_preferences.html:182
+#: preferences/templates/preferences/display_preferences.html:186
 msgid "Creation of machines"
 msgstr "Création de machines"
 
-#: preferences/templates/preferences/display_preferences.html:192
+#: preferences/templates/preferences/display_preferences.html:196
 msgid "Topology preferences"
 msgstr "Préférences de topologie"
 
-#: preferences/templates/preferences/display_preferences.html:212
-msgid "VLAN for machines rejected by RADIUS"
-msgstr "VLAN pour les machines rejetées par RADIUS"
+#: preferences/templates/preferences/display_preferences.html:203
+msgid "Add a RADIUS key"
+msgstr "Ajouter une clé RADIUS"
 
-#: preferences/templates/preferences/display_preferences.html:216
-msgid "VLAN for non members machines"
-msgstr "VLAN pour les machines des non adhérents"
-
-#: preferences/templates/preferences/display_preferences.html:223
-msgid " Add a RADIUS key"
-msgstr " Ajouter une clé RADIUS"
-
-#: preferences/templates/preferences/display_preferences.html:233
+#: preferences/templates/preferences/display_preferences.html:213
 msgid "Configuration of switches"
 msgstr "Configuration de commutateurs réseau"
 
-#: preferences/templates/preferences/display_preferences.html:255
+#: preferences/templates/preferences/display_preferences.html:226
+msgid "Web management, activated in case of automatic provision"
+msgstr "Gestion web, activée en cas de provision automatique"
+
+#: preferences/templates/preferences/display_preferences.html:228
+msgid "REST management, activated in case of automatic provision"
+msgstr "Gestion REST, activée en cas de provision automatique"
+
+#: preferences/templates/preferences/display_preferences.html:235
 msgid "Provision of configuration for switches"
 msgstr "Provision de configuration pour les commutateurs réseau"
 
-#: preferences/templates/preferences/display_preferences.html:258
+#: preferences/templates/preferences/display_preferences.html:238
 msgid "Switches with automatic provision"
 msgstr "Commutateurs réseau avec provision automatique"
 
+#: preferences/templates/preferences/display_preferences.html:239
+#: preferences/templates/preferences/display_preferences.html:243
+#: preferences/templates/preferences/display_preferences.html:247
+#: preferences/templates/preferences/display_preferences.html:255
 #: preferences/templates/preferences/display_preferences.html:259
-#: preferences/templates/preferences/display_preferences.html:263
-#: preferences/templates/preferences/display_preferences.html:267
-#: preferences/templates/preferences/display_preferences.html:275
-#: preferences/templates/preferences/display_preferences.html:279
-#: preferences/templates/preferences/display_preferences.html:289
+#: preferences/templates/preferences/display_preferences.html:269
 msgid "OK"
 msgstr "OK"
 
-#: preferences/templates/preferences/display_preferences.html:259
-#: preferences/templates/preferences/display_preferences.html:263
-#: preferences/templates/preferences/display_preferences.html:267
-#: preferences/templates/preferences/display_preferences.html:289
+#: preferences/templates/preferences/display_preferences.html:239
+#: preferences/templates/preferences/display_preferences.html:243
+#: preferences/templates/preferences/display_preferences.html:247
+#: preferences/templates/preferences/display_preferences.html:269
 msgid "Missing"
 msgstr "Manquant"
 
-#: preferences/templates/preferences/display_preferences.html:266
+#: preferences/templates/preferences/display_preferences.html:242
+msgid "IP range for the management of switches"
+msgstr "Plage d'IP pour la gestion des commutateurs réseau"
+
+#: preferences/templates/preferences/display_preferences.html:246
 msgid "Server for the configuration of switches"
 msgstr "Serveur pour la configuration des commutateurs réseau"
 
-#: preferences/templates/preferences/display_preferences.html:274
+#: preferences/templates/preferences/display_preferences.html:250
+msgid "Provision of configuration mode for switches"
+msgstr "Mode de provision de configuration pour les commutateurs réseau"
+
+#: preferences/templates/preferences/display_preferences.html:254
 msgid "TFTP mode"
 msgstr "Mode TFTP"
 
-#: preferences/templates/preferences/display_preferences.html:278
+#: preferences/templates/preferences/display_preferences.html:258
 msgid "SFTP mode"
 msgstr "Mode SFTP"
 
-#: preferences/templates/preferences/display_preferences.html:279
+#: preferences/templates/preferences/display_preferences.html:259
 msgid "Missing credentials"
 msgstr "Identifiants manquants"
 
-#: preferences/templates/preferences/display_preferences.html:283
+#: preferences/templates/preferences/display_preferences.html:263
 msgid "Switch management credentials"
 msgstr "Identifiants de gestion de commutateur réseau"
 
-#: preferences/templates/preferences/display_preferences.html:285
-msgid " Add switch management credentials"
-msgstr " Ajouter des identifiants de gestion de commutateur réseau"
+#: preferences/templates/preferences/display_preferences.html:265
+msgid "Add switch management credentials"
+msgstr "Ajouter des identifiants de gestion de commutateur réseau"
 
-#: preferences/templates/preferences/display_preferences.html:296
+#: preferences/templates/preferences/display_preferences.html:276
 msgid "RADIUS preferences"
 msgstr "Préférences RADIUS"
 
-#: preferences/templates/preferences/display_preferences.html:310
+#: preferences/templates/preferences/display_preferences.html:285
+msgid "Current RADIUS attributes"
+msgstr "Attributs RADIUS actuels"
+
+#: preferences/templates/preferences/display_preferences.html:286
+msgid "Add an attribute"
+msgstr "Ajouter un attribut"
+
+#: preferences/templates/preferences/display_preferences.html:294
 msgid "Information about the organisation"
 msgstr "Informations sur l'association"
 
-#: preferences/templates/preferences/display_preferences.html:341
+#: preferences/templates/preferences/display_preferences.html:325
 msgid "User object of the organisation"
 msgstr "Objet utilisateur de l'association"
 
-#: preferences/templates/preferences/display_preferences.html:343
+#: preferences/templates/preferences/display_preferences.html:327
 msgid "Description of the organisation"
 msgstr "Description de l'association"
 
-#: preferences/templates/preferences/display_preferences.html:356
-msgid "Document templates"
-msgstr ""
+#: preferences/templates/preferences/display_preferences.html:331
+msgid "Mandates"
+msgstr "Mandats"
 
-#: preferences/templates/preferences/display_preferences.html:362
+#: preferences/templates/preferences/display_preferences.html:334
+msgid "Add a mandate"
+msgstr "Ajouter un mandat"
+
+#: preferences/templates/preferences/display_preferences.html:343
+msgid "Document templates"
+msgstr "Modèles de document"
+
+#: preferences/templates/preferences/display_preferences.html:349
 msgid "Add a document template"
 msgstr "Ajouter un modèle de document"
 
-#: preferences/templates/preferences/display_preferences.html:366
+#: preferences/templates/preferences/display_preferences.html:353
 msgid "Delete one or several document templates"
 msgstr " Supprimer un ou plusieurs modèles de document"
 
-#: preferences/templates/preferences/display_preferences.html:375
-msgid "Cotisation's options"
-msgstr "options de cotisation"
+#: preferences/templates/preferences/display_preferences.html:362
+msgid "Subscription preferences"
+msgstr "Préférences de cotisation"
 
-#: preferences/templates/preferences/display_preferences.html:384
+#: preferences/templates/preferences/display_preferences.html:371
 msgid "Send voucher by email"
-msgstr ""
+msgstr "Envoyer le reçu par mail"
 
-#: preferences/templates/preferences/display_preferences.html:388
+#: preferences/templates/preferences/display_preferences.html:375
 msgid "Invoices' template"
-msgstr ""
+msgstr "Modèle des factures"
 
-#: preferences/templates/preferences/display_preferences.html:392
+#: preferences/templates/preferences/display_preferences.html:379
 msgid "Vouchers' template"
-msgstr ""
+msgstr "Modèle des reçus"
 
-#: preferences/templates/preferences/display_preferences.html:403
+#: preferences/templates/preferences/display_preferences.html:390
 msgid "Message for emails"
 msgstr "Message pour les mails"
 
-#: preferences/templates/preferences/display_preferences.html:416
+#: preferences/templates/preferences/display_preferences.html:403
 msgid "Welcome email (in French)"
 msgstr "Mail de bienvenue (en français)"
 
-#: preferences/templates/preferences/display_preferences.html:420
+#: preferences/templates/preferences/display_preferences.html:407
 msgid "Welcome email (in English)"
 msgstr "Mail de bienvenue (en anglais)"
 
-#: preferences/templates/preferences/display_preferences.html:430
-msgid "Options for the membership's end email"
-msgstr "Options pour le mail de fin d'adhésion"
+#: preferences/templates/preferences/display_preferences.html:417
+msgid "Preferences for the membership's end email"
+msgstr "Préférences pour le mail de fin d'adhésion"
 
-#: preferences/templates/preferences/display_preferences.html:436
-msgid " Add a reminder"
-msgstr " Ajouter un rappel"
+#: preferences/templates/preferences/display_preferences.html:423
+msgid "Add a reminder"
+msgstr "Ajouter un rappel"
 
-#: preferences/templates/preferences/display_preferences.html:447
+#: preferences/templates/preferences/display_preferences.html:434
 msgid "List of services and homepage preferences"
 msgstr "Liste des services et préférences de page d'accueil"
 
-#: preferences/templates/preferences/display_preferences.html:453
-msgid " Add a service"
-msgstr " Ajouter un service"
+#: preferences/templates/preferences/display_preferences.html:440
+msgid "Add a service"
+msgstr "Ajouter un service"
 
-#: preferences/templates/preferences/display_preferences.html:464
+#: preferences/templates/preferences/display_preferences.html:451
 msgid "List of contact email addresses"
 msgstr "Liste des adresses mail de contact"
 
-#: preferences/templates/preferences/display_preferences.html:470
-msgid " Add an address"
-msgstr " Ajouter une adresse"
+#: preferences/templates/preferences/display_preferences.html:457
+msgid "Add an address"
+msgstr "Ajouter une adresse"
 
-#: preferences/templates/preferences/display_preferences.html:472
-msgid " Delete one or several addresses"
-msgstr " Supprimer une ou plusieurs adresses"
+#: preferences/templates/preferences/display_preferences.html:459
+msgid "Delete one or several addresses"
+msgstr "Supprimer une ou plusieurs adresses"
 
-#: preferences/templates/preferences/display_preferences.html:481
+#: preferences/templates/preferences/display_preferences.html:468
 msgid "Social networks"
 msgstr "Réseaux sociaux"
 
-#: preferences/templates/preferences/display_preferences.html:493
+#: preferences/templates/preferences/display_preferences.html:480
 msgid "Twitter account URL"
 msgstr "URL du compte Twitter"
 
-#: preferences/templates/preferences/display_preferences.html:499
+#: preferences/templates/preferences/display_preferences.html:486
 msgid "Facebook account URL"
 msgstr "URL du compte Facebook"
 
@@ -1082,89 +1286,75 @@ msgstr "URL du compte Facebook"
 msgid "Editing of preferences"
 msgstr "Modification des préférences"
 
-#: preferences/views.py:129
+#: preferences/views.py:160
 msgid "Unknown object."
 msgstr "Objet inconnu."
 
-#: preferences/views.py:135
-msgid "You don't have the right to edit this option."
-msgstr "Vous n'avez pas le droit de modifier cette option."
-
-#: preferences/views.py:152
+#: preferences/views.py:179
 msgid "The preferences were edited."
 msgstr "Les préférences ont été modifiées."
 
-#: preferences/views.py:170
+#: preferences/views.py:191
 msgid "The service was added."
 msgstr "Le service a été ajouté."
 
-#: preferences/views.py:173
-msgid "Add a service"
-msgstr "Ajouter un service"
+#: preferences/views.py:194 preferences/views.py:243 preferences/views.py:292
+#: preferences/views.py:349 preferences/views.py:412 preferences/views.py:471
+#: preferences/views.py:554 preferences/views.py:603
+msgid "Add"
+msgstr "Ajouter"
 
-#: preferences/views.py:190
+#: preferences/views.py:209
 msgid "The service was edited."
 msgstr "Le service a été modifié."
 
-#: preferences/views.py:204
+#: preferences/views.py:224
 msgid "The service was deleted."
 msgstr "Le service a été supprimé."
 
-#: preferences/views.py:219
+#: preferences/views.py:240
 msgid "The reminder was added."
 msgstr "Le rappel a été ajouté."
 
-#: preferences/views.py:222
-msgid "Add a reminder"
-msgstr "Ajouter un rappel"
-
-#: preferences/views.py:238
+#: preferences/views.py:258
 msgid "The reminder was edited."
 msgstr "Le rappel a été modifié."
 
-#: preferences/views.py:254
+#: preferences/views.py:273
 msgid "The reminder was deleted."
 msgstr "Le rappel a été supprimé."
 
-#: preferences/views.py:270
+#: preferences/views.py:289
 msgid "The RADIUS key was added."
 msgstr "La clé RADIUS a été ajoutée."
 
-#: preferences/views.py:273
-msgid "Add a RADIUS key"
-msgstr "Ajouter une clé RADIUS"
-
-#: preferences/views.py:284
+#: preferences/views.py:304
 msgid "The RADIUS key was edited."
 msgstr "La clé RADIUS a été modifiée."
 
-#: preferences/views.py:300
+#: preferences/views.py:320
 msgid "The RADIUS key was deleted."
 msgstr "La clé RADIUS a été supprimée."
 
-#: preferences/views.py:302
+#: preferences/views.py:325
 msgid "The RADIUS key is assigned to at least one switch, you can't delete it."
 msgstr ""
 "La clé RADIUS est assignée a au moins un commutateur réseau, vous ne pouvez "
 "pas la supprimer."
 
-#: preferences/views.py:319
+#: preferences/views.py:344
 msgid "The switch management credentials were added."
 msgstr "Les identifiants de gestion de commutateur réseay ont été ajoutés."
 
-#: preferences/views.py:322
-msgid "Add switch management credentials"
-msgstr "Ajouter des identifiants de gestion de commutateur réseau"
-
-#: preferences/views.py:333
+#: preferences/views.py:364
 msgid "The switch management credentials were edited."
 msgstr "Les identifiants de gestion de commutateur réseau ont été modifiés."
 
-#: preferences/views.py:349
+#: preferences/views.py:381
 msgid "The switch management credentials were deleted."
 msgstr "Les identifiants de gestion de commutateur réseau ont été supprimés."
 
-#: preferences/views.py:351
+#: preferences/views.py:387
 msgid ""
 "The switch management credentials are assigned to at least one switch, you "
 "can't delete them."
@@ -1172,58 +1362,76 @@ msgstr ""
 "Les identifiants de gestion de commutateur réseau sont assignés à au moins "
 "un commutateur réseau , vous ne pouvez pas les supprimer."
 
-#: preferences/views.py:372
+#: preferences/views.py:407
 msgid "The contact email address was created."
 msgstr "L'adresse mail de contact a été supprimée."
 
-#: preferences/views.py:376
-msgid "Add a contact email address"
-msgstr "Ajouter une adresse mail de contact"
-
-#: preferences/views.py:393
+#: preferences/views.py:428
 msgid "The contact email address was edited."
 msgstr "L'adresse mail de contact a été modifiée."
 
-#: preferences/views.py:415
+#: preferences/views.py:446
 msgid "The contact email adress was deleted."
 msgstr "L'adresse mail de contact a été supprimée."
 
-#: preferences/views.py:418 preferences/views.py:503
+#: preferences/views.py:449 preferences/views.py:536
 msgid "Delete"
 msgstr "Supprimer"
 
-#: preferences/views.py:438
+#: preferences/views.py:466
 msgid "The document template was created."
 msgstr "Le modèle de document a été créé."
 
-#: preferences/views.py:443
-msgid "Add"
-msgstr "Ajouter"
-
-#: preferences/views.py:444
+#: preferences/views.py:472
 msgid "New document template"
 msgstr "Nouveau modèle de document"
 
-#: preferences/views.py:463
+#: preferences/views.py:491
 msgid "The document template was edited."
 msgstr "Le modèle de document a été édité."
 
-#: preferences/views.py:469
+#: preferences/views.py:497
 msgid "Edit document template"
 msgstr "Modifier le modèle de document"
 
-#: preferences/views.py:488
+#: preferences/views.py:520
 #, python-format
 msgid "The document template %(document_template)s was deleted."
 msgstr "Le modèle de document %(document_template)s a été supprimé."
 
-#: preferences/views.py:495
+#: preferences/views.py:527
 #, python-format
 msgid ""
-"The document template %(document_template)s can't be "
-"deleted                     because it is currently being used."
+"The document template %(document_template)s can't be deleted because it is "
+"currently being used."
 msgstr ""
+"Le modèle de document %(document_template)s ne peut pas être supprimé car il "
+"est actuellement utilisé."
 
-#: preferences/views.py:504
+#: preferences/views.py:537
 msgid "Delete document template"
 msgstr "Supprimer le modèle de document"
+
+#: preferences/views.py:551
+msgid "The attribute was added."
+msgstr "L'attribut a été ajouté."
+
+#: preferences/views.py:569
+msgid "The attribute was edited."
+msgstr "L'attribut a été modifié."
+
+#: preferences/views.py:584
+msgid "The attribute was deleted."
+msgstr "L'attribut a été supprimé."
+
+#: preferences/views.py:600
+msgid "The mandate was added."
+msgstr "Le mandat a été ajouté."
+
+#: preferences/views.py:616
+msgid "The mandate was edited."
+msgstr "Le mandat a été modifié."
+
+#: preferences/views.py:631
+msgid "The mandate was deleted."
+msgstr "Le mandat été supprimé."
diff --git a/preferences/migrations/0067_auto_20191120_0159.py b/preferences/migrations/0067_auto_20191120_0159.py
new file mode 100644
index 00000000..47f93ad4
--- /dev/null
+++ b/preferences/migrations/0067_auto_20191120_0159.py
@@ -0,0 +1,289 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-11-20 00:59
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import preferences.models
+import re2o.aes_field
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0066_optionalmachine_default_dns_ttl'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='assooption',
+            options={'permissions': (('view_assooption', 'Can view the organisation preferences'),), 'verbose_name': 'organisation preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='cotisationsoption',
+            options={'verbose_name': 'subscription preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='generaloption',
+            options={'permissions': (('view_generaloption', 'Can view the general preferences'),), 'verbose_name': 'general preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='homeoption',
+            options={'permissions': (('view_homeoption', 'Can view the homepage preferences'),), 'verbose_name': 'homepage preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='mailmessageoption',
+            options={'permissions': (('view_mailmessageoption', 'Can view the email message preferences'),), 'verbose_name': 'email message preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='mandate',
+            options={'permissions': (('view_mandate', 'Can view a mandate object'),), 'verbose_name': 'mandate', 'verbose_name_plural': 'mandates'},
+        ),
+        migrations.AlterModelOptions(
+            name='optionalmachine',
+            options={'permissions': (('view_optionalmachine', 'Can view the machine preferences'),), 'verbose_name': 'machine preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='optionaltopologie',
+            options={'permissions': (('view_optionaltopologie', 'Can view the topology preferences'),), 'verbose_name': 'topology preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='optionaluser',
+            options={'permissions': (('view_optionaluser', 'Can view the user preferences'),), 'verbose_name': 'user preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='service',
+            options={'permissions': (('view_service', 'Can view the service preferences'),), 'verbose_name': 'service', 'verbose_name_plural': 'services'},
+        ),
+        migrations.AlterField(
+            model_name='cotisationsoption',
+            name='invoice_template',
+            field=models.OneToOneField(default=preferences.models.default_invoice, on_delete=django.db.models.deletion.PROTECT, related_name='invoice_template', to='preferences.DocumentTemplate', verbose_name='template for invoices'),
+        ),
+        migrations.AlterField(
+            model_name='cotisationsoption',
+            name='send_voucher_mail',
+            field=models.BooleanField(default=False, help_text='Be careful, if no mandate is defined on the preferences page, errors will be triggered when generating vouchers.', verbose_name='send voucher by email when the invoice is controlled'),
+        ),
+        migrations.AlterField(
+            model_name='cotisationsoption',
+            name='voucher_template',
+            field=models.OneToOneField(default=preferences.models.default_voucher, on_delete=django.db.models.deletion.PROTECT, related_name='voucher_template', to='preferences.DocumentTemplate', verbose_name='template for subscription vouchers'),
+        ),
+        migrations.AlterField(
+            model_name='generaloption',
+            name='general_message_en',
+            field=models.TextField(blank=True, default='', help_text='General message displayed on the English version of the website (e.g. in case of maintenance).'),
+        ),
+        migrations.AlterField(
+            model_name='generaloption',
+            name='general_message_fr',
+            field=models.TextField(blank=True, default='', help_text='General message displayed on the French version of the website (e.g. in case of maintenance).'),
+        ),
+        migrations.AlterField(
+            model_name='mailcontact',
+            name='address',
+            field=models.EmailField(default='contact@example.org', help_text='Contact email address.', max_length=254),
+        ),
+        migrations.AlterField(
+            model_name='mailmessageoption',
+            name='welcome_mail_en',
+            field=models.TextField(blank=True, default='', help_text='Welcome email in English.'),
+        ),
+        migrations.AlterField(
+            model_name='mailmessageoption',
+            name='welcome_mail_fr',
+            field=models.TextField(blank=True, default='', help_text='Welcome email in French.'),
+        ),
+        migrations.AlterField(
+            model_name='mandate',
+            name='president',
+            field=models.ForeignKey(blank=True, help_text='Displayed on subscription vouchers.', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='president of the association'),
+        ),
+        migrations.AlterField(
+            model_name='optionalmachine',
+            name='default_dns_ttl',
+            field=models.PositiveIntegerField(default=172800, verbose_name='default Time To Live (TTL) for CNAME, A and AAAA records'),
+        ),
+        migrations.AlterField(
+            model_name='optionalmachine',
+            name='ipv6_mode',
+            field=models.CharField(choices=[('SLAAC', 'Automatic configuration by RA'), ('DHCPV6', 'IP addresses assignment by DHCPv6'), ('DISABLED', 'Disabled')], default='DISABLED', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='sftp_login',
+            field=models.CharField(blank=True, help_text='SFTP login for switches.', max_length=32, null=True),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='sftp_pass',
+            field=re2o.aes_field.AESEncryptedField(blank=True, help_text='SFTP password.', max_length=63, null=True),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='switchs_ip_type',
+            field=models.OneToOneField(blank=True, help_text='IP range for the management of switches.', null=True, on_delete=django.db.models.deletion.PROTECT, to='machines.IpType'),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='switchs_provision',
+            field=models.CharField(choices=[('sftp', 'SFTP'), ('tftp', 'TFTP')], default='tftp', help_text='Provision of configuration mode for switches.', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='switchs_rest_management',
+            field=models.BooleanField(default=False, help_text='REST management, activated in case of automatic provision.'),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='switchs_web_management',
+            field=models.BooleanField(default=False, help_text='Web management, activated in case of automatic provision.'),
+        ),
+        migrations.AlterField(
+            model_name='optionaltopologie',
+            name='switchs_web_management_ssl',
+            field=models.BooleanField(default=False, help_text='SSL web management, make sure that a certificate is installed on the switch.'),
+        ),
+        migrations.AlterField(
+            model_name='optionaluser',
+            name='local_email_domain',
+            field=models.CharField(default='@example.org', help_text='Domain to use for local email accounts.', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='radiusattribute',
+            name='attribute',
+            field=models.CharField(help_text='See https://freeradius.org/rfc/attributes.html.', max_length=255, verbose_name='attribute'),
+        ),
+        migrations.AlterField(
+            model_name='radiusattribute',
+            name='comment',
+            field=models.TextField(blank=True, default='', help_text='Use this field to document this attribute.', verbose_name='comment'),
+        ),
+        migrations.AlterField(
+            model_name='radiusattribute',
+            name='value',
+            field=models.CharField(max_length=255, verbose_name='value'),
+        ),
+        migrations.AlterField(
+            model_name='radiuskey',
+            name='comment',
+            field=models.CharField(blank=True, help_text='Comment for this key.', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='radiuskey',
+            name='default_switch',
+            field=models.BooleanField(default=False, help_text='Default key for switches.'),
+        ),
+        migrations.AlterField(
+            model_name='radiuskey',
+            name='radius_key',
+            field=re2o.aes_field.AESEncryptedField(help_text='RADIUS key.', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='banned',
+            field=models.CharField(choices=[('REJECT', 'Reject the machine'), ('SET_VLAN', 'Place the machine on the VLAN')], default='REJECT', max_length=32, verbose_name='policy for banned users'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='banned_attributes',
+            field=models.ManyToManyField(blank=True, help_text='Answer attributes for banned users.', related_name='banned_attribute', to='preferences.RadiusAttribute', verbose_name='banned users attributes'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='banned_vlan',
+            field=models.ForeignKey(blank=True, help_text='VLAN for banned users if not rejected.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='banned_vlan', to='machines.Vlan', verbose_name='banned users VLAN'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='non_member',
+            field=models.CharField(choices=[('REJECT', 'Reject the machine'), ('SET_VLAN', 'Place the machine on the VLAN')], default='REJECT', max_length=32, verbose_name='policy for non members'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='non_member_attributes',
+            field=models.ManyToManyField(blank=True, help_text='Answer attributes for non members.', related_name='non_member_attribute', to='preferences.RadiusAttribute', verbose_name='non members attributes'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='non_member_vlan',
+            field=models.ForeignKey(blank=True, help_text='VLAN for non members if not rejected.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='non_member_vlan', to='machines.Vlan', verbose_name='non members VLAN'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='ok_attributes',
+            field=models.ManyToManyField(blank=True, help_text='Answer attributes for accepted users.', related_name='ok_attribute', to='preferences.RadiusAttribute', verbose_name='accepted users attributes'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='radius_general_policy',
+            field=models.CharField(choices=[('MACHINE', "On the IP range's VLAN of the machine"), ('DEFINED', 'Preset in "VLAN for machines accepted by RADIUS"')], default='DEFINED', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_machine',
+            field=models.CharField(choices=[('REJECT', 'Reject the machine'), ('SET_VLAN', 'Place the machine on the VLAN')], default='REJECT', max_length=32, verbose_name='policy for unknown machines'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_machine_attributes',
+            field=models.ManyToManyField(blank=True, help_text='Answer attributes for unknown machines.', related_name='unknown_machine_attribute', to='preferences.RadiusAttribute', verbose_name='unknown machines attributes'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_machine_vlan',
+            field=models.ForeignKey(blank=True, help_text='VLAN for unknown machines if not rejected.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='unknown_machine_vlan', to='machines.Vlan', verbose_name='unknown machines VLAN'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_port',
+            field=models.CharField(choices=[('REJECT', 'Reject the machine'), ('SET_VLAN', 'Place the machine on the VLAN')], default='REJECT', max_length=32, verbose_name='policy for unknown ports'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_port_attributes',
+            field=models.ManyToManyField(blank=True, help_text='Answer attributes for unknown ports.', related_name='unknown_port_attribute', to='preferences.RadiusAttribute', verbose_name='unknown ports attributes'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_port_vlan',
+            field=models.ForeignKey(blank=True, help_text='VLAN for unknown ports if not rejected.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='unknown_port_vlan', to='machines.Vlan', verbose_name='unknown ports VLAN'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_room_attributes',
+            field=models.ManyToManyField(blank=True, help_text='Answer attributes for unknown rooms.', related_name='unknown_room_attribute', to='preferences.RadiusAttribute', verbose_name='unknown rooms attributes'),
+        ),
+        migrations.AlterField(
+            model_name='radiusoption',
+            name='unknown_room_vlan',
+            field=models.ForeignKey(blank=True, help_text='VLAN for unknown rooms if not rejected.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='unknown_room_vlan', to='machines.Vlan', verbose_name='unknown rooms VLAN'),
+        ),
+        migrations.AlterField(
+            model_name='reminder',
+            name='days',
+            field=models.IntegerField(default=7, help_text="Delay between the email and the membership's end.", unique=True),
+        ),
+        migrations.AlterField(
+            model_name='reminder',
+            name='message',
+            field=models.TextField(blank=True, default='', help_text='Message displayed specifically for this reminder.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='switchmanagementcred',
+            name='default_switch',
+            field=models.BooleanField(default=True, help_text='Default credentials for switches.', unique=True),
+        ),
+        migrations.AlterField(
+            model_name='switchmanagementcred',
+            name='management_id',
+            field=models.CharField(help_text='Switch login.', max_length=63),
+        ),
+        migrations.AlterField(
+            model_name='switchmanagementcred',
+            name='management_pass',
+            field=re2o.aes_field.AESEncryptedField(help_text='Password.', max_length=63),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 7ef8979b..b8189384 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -95,16 +95,16 @@ class OptionalUser(AclMixin, PreferencesModel):
     local_email_domain = models.CharField(
         max_length=32,
         default="@example.org",
-        help_text=_("Domain to use for local email accounts"),
+        help_text=_("Domain to use for local email accounts."),
     )
     max_email_address = models.IntegerField(
         default=15,
-        help_text=_("Maximum number of local email addresses for a standard" " user."),
+        help_text=_("Maximum number of local email addresses for a standard user."),
     )
     delete_notyetactive = models.IntegerField(
         default=15,
         help_text=_(
-            "Not yet active users will be deleted after this number of" " days."
+            "Not yet active users will be deleted after this number of days."
         ),
     )
     self_adhesion = models.BooleanField(
@@ -122,15 +122,15 @@ class OptionalUser(AclMixin, PreferencesModel):
     )
 
     class Meta:
-        permissions = (("view_optionaluser", _("Can view the user options")),)
-        verbose_name = _("user options")
+        permissions = (("view_optionaluser", _("Can view the user preferences")),)
+        verbose_name = _("user preferences")
 
     def clean(self):
         """Clean model:
         Check the mail_extension
         """
         if self.local_email_domain[0] != "@":
-            raise ValidationError(_("Email domain must begin with @"))
+            raise ValidationError(_("Email domain must begin with @."))
 
 
 @receiver(post_save, sender=OptionalUser)
@@ -148,8 +148,8 @@ class OptionalMachine(AclMixin, PreferencesModel):
     DHCPV6 = "DHCPV6"
     DISABLED = "DISABLED"
     CHOICE_IPV6 = (
-        (SLAAC, _("Autoconfiguration by RA")),
-        (DHCPV6, _("IP addresses assigning by DHCPv6")),
+        (SLAAC, _("Automatic configuration by RA")),
+        (DHCPV6, _("IP addresses assignment by DHCPv6")),
         (DISABLED, _("Disabled")),
     )
 
@@ -159,7 +159,7 @@ class OptionalMachine(AclMixin, PreferencesModel):
     ipv6_mode = models.CharField(max_length=32, choices=CHOICE_IPV6, default="DISABLED")
     create_machine = models.BooleanField(default=True)
     default_dns_ttl = models.PositiveIntegerField(
-        verbose_name=_("Default Time To Live (TTL) for CNAME, A and AAA records."),
+        verbose_name=_("default Time To Live (TTL) for CNAME, A and AAAA records"),
         default=172800,  # 2 days
     )
 
@@ -169,8 +169,8 @@ class OptionalMachine(AclMixin, PreferencesModel):
         return not self.get_cached_value("ipv6_mode") == "DISABLED"
 
     class Meta:
-        permissions = (("view_optionalmachine", _("Can view the machine options")),)
-        verbose_name = _("machine options")
+        permissions = (("view_optionalmachine", _("Can view the machine preferences")),)
+        verbose_name = _("machine preferences")
 
 
 @receiver(post_save, sender=OptionalMachine)
@@ -191,43 +191,43 @@ class OptionalTopologie(AclMixin, PreferencesModel):
     DEFINED = "DEFINED"
     CHOICE_RADIUS = (
         (MACHINE, _("On the IP range's VLAN of the machine")),
-        (DEFINED, _("Preset in 'VLAN for machines accepted by RADIUS'")),
+        (DEFINED, _("Preset in \"VLAN for machines accepted by RADIUS\"")),
     )
-    CHOICE_PROVISION = (("sftp", "sftp"), ("tftp", "tftp"))
+    CHOICE_PROVISION = (("sftp", "SFTP"), ("tftp", "TFTP"))
 
     switchs_web_management = models.BooleanField(
         default=False,
-        help_text=_("Web management, activated in case of automatic provision"),
+        help_text=_("Web management, activated in case of automatic provision."),
     )
     switchs_web_management_ssl = models.BooleanField(
         default=False,
         help_text=_(
             "SSL web management, make sure that a certificate is"
-            " installed on the switch"
+            " installed on the switch."
         ),
     )
     switchs_rest_management = models.BooleanField(
         default=False,
-        help_text=_("REST management, activated in case of automatic provision"),
+        help_text=_("REST management, activated in case of automatic provision."),
     )
     switchs_ip_type = models.OneToOneField(
         "machines.IpType",
         on_delete=models.PROTECT,
         blank=True,
         null=True,
-        help_text=_("IP range for the management of switches"),
+        help_text=_("IP range for the management of switches."),
     )
     switchs_provision = models.CharField(
         max_length=32,
         choices=CHOICE_PROVISION,
         default="tftp",
-        help_text=_("Provision of configuration mode for switches"),
+        help_text=_("Provision of configuration mode for switches."),
     )
     sftp_login = models.CharField(
-        max_length=32, null=True, blank=True, help_text=_("SFTP login for switches")
+        max_length=32, null=True, blank=True, help_text=_("SFTP login for switches.")
     )
     sftp_pass = AESEncryptedField(
-        max_length=63, null=True, blank=True, help_text=_("SFTP password")
+        max_length=63, null=True, blank=True, help_text=_("SFTP password.")
     )
 
     @cached_property
@@ -331,8 +331,8 @@ class OptionalTopologie(AclMixin, PreferencesModel):
         )
 
     class Meta:
-        permissions = (("view_optionaltopologie", _("Can view the topology options")),)
-        verbose_name = _("topology options")
+        permissions = (("view_optionaltopologie", _("Can view the topology preferences")),)
+        verbose_name = _("topology preferences")
 
 
 @receiver(post_save, sender=OptionalTopologie)
@@ -345,12 +345,12 @@ def optionaltopologie_post_save(**kwargs):
 class RadiusKey(AclMixin, models.Model):
     """Class of a radius key"""
 
-    radius_key = AESEncryptedField(max_length=255, help_text=_("RADIUS key"))
+    radius_key = AESEncryptedField(max_length=255, help_text=_("RADIUS key."))
     comment = models.CharField(
-        max_length=255, null=True, blank=True, help_text=_("Comment for this key")
+        max_length=255, null=True, blank=True, help_text=_("Comment for this key.")
     )
     default_switch = models.BooleanField(
-        default=False, help_text=_("Default key for switches")
+        default=False, help_text=_("Default key for switches.")
     )
 
     class Meta:
@@ -363,7 +363,7 @@ class RadiusKey(AclMixin, models.Model):
         Check default switch is unique
         """
         if RadiusKey.objects.filter(default_switch=True).count() > 1:
-            raise ValidationError(_("Default radiuskey for switchs already exist"))
+            raise ValidationError(_("Default RADIUS key for switches already exists."))
 
     def __str__(self):
         return _("RADIUS key ") + str(self.id) + " " + str(self.comment)
@@ -372,17 +372,17 @@ class RadiusKey(AclMixin, models.Model):
 class SwitchManagementCred(AclMixin, models.Model):
     """Class of a management creds of a switch, for rest management"""
 
-    management_id = models.CharField(max_length=63, help_text=_("Switch login"))
-    management_pass = AESEncryptedField(max_length=63, help_text=_("Password"))
+    management_id = models.CharField(max_length=63, help_text=_("Switch login."))
+    management_pass = AESEncryptedField(max_length=63, help_text=_("Password."))
     default_switch = models.BooleanField(
-        default=True, unique=True, help_text=_("Default credentials for switches")
+        default=True, unique=True, help_text=_("Default credentials for switches.")
     )
 
     class Meta:
         permissions = (
             (
                 "view_switchmanagementcred",
-                _("Can view a switch management" " credentials object"),
+                _("Can view a switch management credentials object"),
             ),
         )
         verbose_name = _("switch management credentials")
@@ -400,13 +400,13 @@ class Reminder(AclMixin, models.Model):
     days = models.IntegerField(
         default=7,
         unique=True,
-        help_text=_("Delay between the email and the membership's end"),
+        help_text=_("Delay between the email and the membership's end."),
     )
     message = models.TextField(
         default="",
         null=True,
         blank=True,
-        help_text=_("Message displayed specifically for this reminder"),
+        help_text=_("Message displayed specifically for this reminder."),
     )
 
     class Meta:
@@ -434,7 +434,7 @@ class GeneralOption(AclMixin, PreferencesModel):
         blank=True,
         help_text=_(
             "General message displayed on the French version of the"
-            " website (e.g. in case of maintenance)"
+            " website (e.g. in case of maintenance)."
         ),
     )
     general_message_en = models.TextField(
@@ -442,7 +442,7 @@ class GeneralOption(AclMixin, PreferencesModel):
         blank=True,
         help_text=_(
             "General message displayed on the English version of the"
-            " website (e.g. in case of maintenance)"
+            " website (e.g. in case of maintenance)."
         ),
     )
     search_display_page = models.IntegerField(default=15)
@@ -456,8 +456,8 @@ class GeneralOption(AclMixin, PreferencesModel):
     GTU = models.FileField(upload_to="", default="", null=True, blank=True)
 
     class Meta:
-        permissions = (("view_generaloption", _("Can view the general options")),)
-        verbose_name = _("general options")
+        permissions = (("view_generaloption", _("Can view the general preferences")),)
+        verbose_name = _("general preferences")
 
 
 @receiver(post_save, sender=GeneralOption)
@@ -477,7 +477,7 @@ class Service(AclMixin, models.Model):
     image = models.ImageField(upload_to="logo", blank=True)
 
     class Meta:
-        permissions = (("view_service", _("Can view the service options")),)
+        permissions = (("view_service", _("Can view the service preferences")),)
         verbose_name = _("service")
         verbose_name_plural = _("services")
 
@@ -489,7 +489,7 @@ class MailContact(AclMixin, models.Model):
     """Contact email adress with a commentary."""
 
     address = models.EmailField(
-        default="contact@example.org", help_text=_("Contact email address")
+        default="contact@example.org", help_text=_("Contact email address.")
     )
 
     commentary = models.CharField(
@@ -516,17 +516,17 @@ class MailContact(AclMixin, models.Model):
 
 class Mandate(RevMixin, AclMixin, models.Model):
     class Meta:
-        verbose_name = _("Mandate")
-        verbose_name_plural = _("Mandates")
-        permissions = (("view_mandate", _("Can view a mandate")),)
+        verbose_name = _("mandate")
+        verbose_name_plural = _("mandates")
+        permissions = (("view_mandate", _("Can view a mandate object")),)
 
     president = models.ForeignKey(
         "users.User",
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        verbose_name=_("President of the association"),
-        help_text=_("Displayed on subscription vouchers"),
+        verbose_name=_("president of the association"),
+        help_text=_("Displayed on subscription vouchers."),
     )
     start_date = models.DateTimeField(verbose_name=_("start date"))
     end_date = models.DateTimeField(verbose_name=_("end date"), blank=True, null=True)
@@ -542,7 +542,7 @@ class Mandate(RevMixin, AclMixin, models.Model):
         )
         if not mandate:
             raise cls.DoesNotExist(
-                "No mandate have been created. Please go to the preferences page to create one."
+                _("No mandates have been created. Please go to the preferences page to create one.")
             )
         return mandate
 
@@ -571,8 +571,8 @@ class AssoOption(AclMixin, PreferencesModel):
     description = models.TextField(null=True, blank=True)
 
     class Meta:
-        permissions = (("view_assooption", _("Can view the organisation options")),)
-        verbose_name = _("organisation options")
+        permissions = (("view_assooption", _("Can view the organisation preferences")),)
+        verbose_name = _("organisation preferences")
 
 
 @receiver(post_save, sender=AssoOption)
@@ -590,8 +590,8 @@ class HomeOption(AclMixin, PreferencesModel):
     twitter_account_name = models.CharField(max_length=32, null=True, blank=True)
 
     class Meta:
-        permissions = (("view_homeoption", _("Can view the homepage options")),)
-        verbose_name = _("homepage options")
+        permissions = (("view_homeoption", _("Can view the homepage preferences")),)
+        verbose_name = _("homepage preferences")
 
 
 @receiver(post_save, sender=HomeOption)
@@ -605,17 +605,17 @@ class MailMessageOption(AclMixin, models.Model):
     """Reglages, mail de bienvenue et autre"""
 
     welcome_mail_fr = models.TextField(
-        default="", blank=True, help_text=_("Welcome email in French")
+        default="", blank=True, help_text=_("Welcome email in French.")
     )
     welcome_mail_en = models.TextField(
-        default="", blank=True, help_text=_("Welcome email in English")
+        default="", blank=True, help_text=_("Welcome email in English.")
     )
 
     class Meta:
         permissions = (
-            ("view_mailmessageoption", _("Can view the email message" " options")),
+            ("view_mailmessageoption", _("Can view the email message preferences")),
         )
-        verbose_name = _("email message options")
+        verbose_name = _("email message preferences")
 
 
 class RadiusAttribute(RevMixin, AclMixin, models.Model):
@@ -625,12 +625,12 @@ class RadiusAttribute(RevMixin, AclMixin, models.Model):
 
     attribute = models.CharField(
         max_length=255,
-        verbose_name=_("Attribute"),
-        help_text=_("See http://freeradius.org/rfc/attributes.html"),
+        verbose_name=_("attribute"),
+        help_text=_("See https://freeradius.org/rfc/attributes.html."),
     )
-    value = models.CharField(max_length=255, verbose_name=_("Value"))
+    value = models.CharField(max_length=255, verbose_name=_("value"))
     comment = models.TextField(
-        verbose_name=_("Comment"),
+        verbose_name=_("comment"),
         help_text=_("Use this field to document this attribute."),
         blank=True,
         default="",
@@ -649,7 +649,7 @@ class RadiusOption(AclMixin, PreferencesModel):
     DEFINED = "DEFINED"
     CHOICE_RADIUS = (
         (MACHINE, _("On the IP range's VLAN of the machine")),
-        (DEFINED, _("Preset in 'VLAN for machines accepted by RADIUS'")),
+        (DEFINED, _("Preset in \"VLAN for machines accepted by RADIUS\"")),
     )
     REJECT = "REJECT"
     SET_VLAN = "SET_VLAN"
@@ -664,7 +664,7 @@ class RadiusOption(AclMixin, PreferencesModel):
         max_length=32,
         choices=CHOICE_POLICY,
         default=REJECT,
-        verbose_name=_("Policy for unknown machines"),
+        verbose_name=_("policy for unknown machines"),
     )
     unknown_machine_vlan = models.ForeignKey(
         "machines.Vlan",
@@ -672,21 +672,21 @@ class RadiusOption(AclMixin, PreferencesModel):
         related_name="unknown_machine_vlan",
         blank=True,
         null=True,
-        verbose_name=_("Unknown machines VLAN"),
-        help_text=_("VLAN for unknown machines if not rejected"),
+        verbose_name=_("unknown machines VLAN"),
+        help_text=_("VLAN for unknown machines if not rejected."),
     )
     unknown_machine_attributes = models.ManyToManyField(
         RadiusAttribute,
         related_name="unknown_machine_attribute",
         blank=True,
-        verbose_name=_("Unknown machines attributes."),
+        verbose_name=_("unknown machines attributes"),
         help_text=_("Answer attributes for unknown machines."),
     )
     unknown_port = models.CharField(
         max_length=32,
         choices=CHOICE_POLICY,
         default=REJECT,
-        verbose_name=_("Policy for unknown ports"),
+        verbose_name=_("policy for unknown ports"),
     )
     unknown_port_vlan = models.ForeignKey(
         "machines.Vlan",
@@ -694,14 +694,14 @@ class RadiusOption(AclMixin, PreferencesModel):
         related_name="unknown_port_vlan",
         blank=True,
         null=True,
-        verbose_name=_("Unknown ports VLAN"),
-        help_text=_("VLAN for unknown ports if not rejected"),
+        verbose_name=_("unknown ports VLAN"),
+        help_text=_("VLAN for unknown ports if not rejected."),
     )
     unknown_port_attributes = models.ManyToManyField(
         RadiusAttribute,
         related_name="unknown_port_attribute",
         blank=True,
-        verbose_name=_("Unknown ports attributes."),
+        verbose_name=_("unknown ports attributes"),
         help_text=_("Answer attributes for unknown ports."),
     )
     unknown_room = models.CharField(
@@ -719,21 +719,21 @@ class RadiusOption(AclMixin, PreferencesModel):
         on_delete=models.PROTECT,
         blank=True,
         null=True,
-        verbose_name=_("Unknown rooms VLAN"),
-        help_text=_("VLAN for unknown rooms if not rejected"),
+        verbose_name=_("unknown rooms VLAN"),
+        help_text=_("VLAN for unknown rooms if not rejected."),
     )
     unknown_room_attributes = models.ManyToManyField(
         RadiusAttribute,
         related_name="unknown_room_attribute",
         blank=True,
-        verbose_name=_("Unknown rooms attributes."),
+        verbose_name=_("unknown rooms attributes"),
         help_text=_("Answer attributes for unknown rooms."),
     )
     non_member = models.CharField(
         max_length=32,
         choices=CHOICE_POLICY,
         default=REJECT,
-        verbose_name=_("Policy for non members"),
+        verbose_name=_("policy for non members"),
     )
     non_member_vlan = models.ForeignKey(
         "machines.Vlan",
@@ -741,21 +741,21 @@ class RadiusOption(AclMixin, PreferencesModel):
         on_delete=models.PROTECT,
         blank=True,
         null=True,
-        verbose_name=_("Non members VLAN"),
-        help_text=_("VLAN for non members if not rejected"),
+        verbose_name=_("non members VLAN"),
+        help_text=_("VLAN for non members if not rejected."),
     )
     non_member_attributes = models.ManyToManyField(
         RadiusAttribute,
         related_name="non_member_attribute",
         blank=True,
-        verbose_name=_("Non member attributes."),
+        verbose_name=_("non members attributes"),
         help_text=_("Answer attributes for non members."),
     )
     banned = models.CharField(
         max_length=32,
         choices=CHOICE_POLICY,
         default=REJECT,
-        verbose_name=_("Policy for banned users"),
+        verbose_name=_("policy for banned users"),
     )
     banned_vlan = models.ForeignKey(
         "machines.Vlan",
@@ -763,14 +763,14 @@ class RadiusOption(AclMixin, PreferencesModel):
         on_delete=models.PROTECT,
         blank=True,
         null=True,
-        verbose_name=_("Banned users VLAN"),
-        help_text=_("VLAN for banned users if not rejected"),
+        verbose_name=_("banned users VLAN"),
+        help_text=_("VLAN for banned users if not rejected."),
     )
     banned_attributes = models.ManyToManyField(
         RadiusAttribute,
         related_name="banned_attribute",
         blank=True,
-        verbose_name=_("Banned attributes."),
+        verbose_name=_("banned users attributes"),
         help_text=_("Answer attributes for banned users."),
     )
     vlan_decision_ok = models.OneToOneField(
@@ -784,7 +784,7 @@ class RadiusOption(AclMixin, PreferencesModel):
         RadiusAttribute,
         related_name="ok_attribute",
         blank=True,
-        verbose_name=_("Accepted users attributes."),
+        verbose_name=_("accepted users attributes"),
         help_text=_("Answer attributes for accepted users."),
     )
 
@@ -812,26 +812,27 @@ def default_voucher():
 
 class CotisationsOption(AclMixin, PreferencesModel):
     class Meta:
-        verbose_name = _("cotisations options")
+        verbose_name = _("subscription preferences")
 
     invoice_template = models.OneToOneField(
         "preferences.DocumentTemplate",
-        verbose_name=_("Template for invoices"),
+        verbose_name=_("template for invoices"),
         related_name="invoice_template",
         on_delete=models.PROTECT,
         default=default_invoice,
     )
     voucher_template = models.OneToOneField(
         "preferences.DocumentTemplate",
-        verbose_name=_("Template for subscription voucher"),
+        verbose_name=_("template for subscription vouchers"),
         related_name="voucher_template",
         on_delete=models.PROTECT,
         default=default_voucher,
     )
     send_voucher_mail = models.BooleanField(
-        verbose_name=_("Send voucher by email when the invoice is controlled."),
+        verbose_name=_("send voucher by email when the invoice is controlled"),
         help_text=_(
-            "Be carefull, if no mandate is defined on the preferences page, errors will be triggered when generating vouchers."
+            "Be careful, if no mandate is defined on the preferences page,"
+            " errors will be triggered when generating vouchers."
         ),
         default=False,
     )
diff --git a/preferences/templates/preferences/aff_mandate.html b/preferences/templates/preferences/aff_mandate.html
index 38017985..10393200 100644
--- a/preferences/templates/preferences/aff_mandate.html
+++ b/preferences/templates/preferences/aff_mandate.html
@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% for mandate in mandate_list %}
     <tr>
         <td>{{mandate.start_date|date:"d/m/Y"}}</td>
-        <td>{% if mandate.end_date %}{{mandate.end_date|date:"d/m/Y"}}{% else %}{% trans "In progress." %}{% endif %}</td>
+        <td>{% if mandate.end_date %}{{mandate.end_date|date:"d/m/Y"}}{% else %}{% trans "In progress" %}{% endif %}</td>
         <td><a href="{% url 'users:profil' userid=mandate.president.id %}">{{mandate.president.name}} {{mandate.president.surname}}</a></td>
         <td class="text-right">
             {% can_edit mandate%}
diff --git a/preferences/templates/preferences/aff_radiuskey.html b/preferences/templates/preferences/aff_radiuskey.html
index b12288fb..f3b6fc9f 100644
--- a/preferences/templates/preferences/aff_radiuskey.html
+++ b/preferences/templates/preferences/aff_radiuskey.html
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>{% trans "RADIUS key ID" %}</th>
             <th>{% trans "Comment" %}</th>
             <th>{% trans "Default RADIUS key for switches" %}</th>
-            <th>{% trans "RADIUS key used by the swithes" %}</th>
+            <th>{% trans "Switches using the RADIUS key" %}</th>
             <th></th>
             <th></th>
             </tr>
diff --git a/preferences/templates/preferences/aff_radiusoptions.html b/preferences/templates/preferences/aff_radiusoptions.html
index 0e84b44c..fad2dbb4 100644
--- a/preferences/templates/preferences/aff_radiusoptions.html
+++ b/preferences/templates/preferences/aff_radiusoptions.html
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <tr>
         <th>{% trans "General policy for VLAN setting" %}</th>
         <td>{{ radiusoptions.radius_general_policy }}</td>
-        <td>{% trans "This setting defines the VLAN policy after acceptance by RADIUS: either on the IP range's VLAN of the machine, or a VLAN preset in 'VLAN for machines accepted by RADIUS'" %}</td>
+	<td>{% blocktrans %}This setting defines the VLAN policy after acceptance by RADIUS: either on the IP range's VLAN of the machine, or a VLAN preset in "VLAN for machines accepted by RADIUS".{% endblocktrans %}</td>
     </tr>
     <tr>
         <th>{% trans "VLAN for machines accepted by RADIUS" %}</th>
diff --git a/preferences/templates/preferences/aff_service.html b/preferences/templates/preferences/aff_service.html
index ff2d80af..fa7df1a3 100644
--- a/preferences/templates/preferences/aff_service.html
+++ b/preferences/templates/preferences/aff_service.html
@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ service.description }}</td>
             <td>{{ service.image }}</td>
             <td class="text-right">
-            {% can_edit service%}
+            {% can_edit service %}
             {% include 'buttons/edit.html' with href='preferences:edit-service' id=service.id %}
             {% acl_end %}
             {% can_delete service %}
diff --git a/preferences/templates/preferences/aff_switchmanagementcred.html b/preferences/templates/preferences/aff_switchmanagementcred.html
index 8f2f7ff6..88c680b7 100644
--- a/preferences/templates/preferences/aff_switchmanagementcred.html
+++ b/preferences/templates/preferences/aff_switchmanagementcred.html
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <th>{% trans "Switch login" %}</th>
             <th>{% trans "Default switch management credentials" %}</th>
-            <th>{% trans "Management credentials used by the switches" %}</th>
+            <th>{% trans "Switches using the management credentials" %}</th>
             <th></th>
             <th></th>
         </tr>
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index aae99d74..8e00962e 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -125,7 +125,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <tr>
                     <th>{% trans "All users are active by default" %}</th>
                     <td>{{ useroptions.all_users_active|tick }}</td>
-                    <th>{% trans "Allow archived users to log-in" %}</th>
+                    <th>{% trans "Allow archived users to log in" %}</th>
                     <td>{{ useroptions.allow_archived_connexion|tick }}</td>
                 </tr>
             </table>
@@ -156,7 +156,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="panel panel-default" id="machines">
     <div class="panel-heading" data-toggle="collapse" href="#collapse_machines">
         <h4 class ="panel-title">
-            <a><i class="fa fa-desktop"></i>   {% trans "Machines preferences" %}</a>
+            <a><i class="fa fa-desktop"></i>   {% trans "Machine preferences" %}</a>
         </h4>
     </div>
 
@@ -177,7 +177,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <tr>
                 <th>{% trans "Maximum number of DNS aliases allowed for a standard user" %}</th>
                 <td>{{ machineoptions.max_lambdauser_aliases }}</td>
-                <th>{% trans "Default Time To Live (TTL) for CNAME, A and AAA records." %}</th>
+                <th>{% trans "Default Time To Live (TTL) for CNAME, A and AAAA records." %}</th>
                 <td>{{ machineoptions.default_dns_ttl }}</td>
             </tr>
             <tr>
@@ -200,7 +200,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 	<h4>{% trans "RADIUS keys" %}</h4>
         {% can_create RadiusKey%}
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-radiuskey'  %}"><i class="fa fa-plus"></i>{% trans " Add a RADIUS key" %}</a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-radiuskey'  %}"><i class="fa fa-plus"></i>{% trans "Add a RADIUS key" %}</a>
         {% acl_end %}
         {%  include 'preferences/aff_radiuskey.html' with  radiuskey_list=radiuskey_list %}
 
@@ -262,7 +262,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
         <h6>{% trans "Switch management credentials" %}</h6>
         {% can_create SwitchManagementCred%}
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-switchmanagementcred'  %}"><i class="fa fa-plus"></i>{% trans " Add switch management credentials" %}</a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-switchmanagementcred'  %}"><i class="fa fa-plus"></i>{% trans "Add switch management credentials" %}</a>
         {% acl_end %}
         <p>
         </p>
@@ -282,8 +282,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% trans "Edit" %}
         </a>
         {% include 'preferences/aff_radiusoptions.html' %}
-        <h5>{% trans "Available RADIUS attributes"%}</h5>
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-radiusattribute'  %}"><i class="fa fa-plus"></i>{% trans " Add an attribute" %}</a>
+        <h5>{% trans "Current RADIUS attributes"%}</h5>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-radiusattribute'  %}"><i class="fa fa-plus"></i>{% trans "Add an attribute" %}</a>
         {% include 'preferences/aff_radiusattributes.html' %}
     </div>
 </div>
@@ -346,7 +346,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="collapse_templates" class="panel-collapse panel-body collapse">
         {% can_create DocumentTemplate %}
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-document-template' %}">
-            <i class="fa fa-cart-plus"></i> {% trans "Add a document template" %}
+            <i class="fa fa-plus"></i> {% trans "Add a document template" %}
         </a>
         {% acl_end %}
         <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-document-template' %}">
@@ -359,7 +359,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div  class="panel panel-default" id="cotisation">
     <div class="panel-heading" data-toggle="collapse" href="#collapse_cotisation">
         <h4 class="panel-title">
-            <a><i class="fa fa-eur"></i>   {% trans "Cotisation's options" %}</a>
+            <a><i class="fa fa-eur"></i>   {% trans "Subscription preferences" %}</a>
         </h4>
     </div>
     <div id="collapse_cotisation" class="panel-collapse panel-body collapse">
@@ -414,13 +414,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div  class="panel panel-default" id="rappels">
     <div class="panel-heading" data-toggle="collapse" href="#collapse_rappels">
         <h4 class="panel-title">
-                <a><i class="fa fa-bell"></i> {% trans "Options for the membership's end email" %}</a>
+                <a><i class="fa fa-bell"></i> {% trans "Preferences for the membership's end email" %}</a>
         </h4>
     </div>
     <div id="collapse_rappels" class="panel-collapse panel-body collapse">
         {% can_create preferences.Reminder%}
 
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-reminder'  %}"><i class="fa fa-plus"></i>{% trans " Add a reminder" %}</a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-reminder'  %}"><i class="fa fa-plus"></i>{% trans "Add a reminder" %}</a>
         <p></p>
         {% acl_end %}
         {%  include 'preferences/aff_reminder.html' with  reminder_list=reminder_list %}
@@ -437,7 +437,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="collapse_services" class="panel-collapse panel-body collapse">
         {% can_create preferences.Service%}
 
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-service'  %}"><i class="fa fa-plus"></i>{% trans " Add a service" %}</a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-service'  %}"><i class="fa fa-plus"></i>{% trans "Add a service" %}</a>
         <p></p>
         {% acl_end %}
         {%  include 'preferences/aff_service.html' with  service_list=service_list %}
@@ -454,9 +454,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="collapse_contact" class="panel-collapse panel-body collapse">
 
         {% can_create preferences.MailContact %}
-        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mailcontact'  %}"><i class="fa fa-plus"></i>{% trans " Add an address" %}</a>
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mailcontact'  %}"><i class="fa fa-plus"></i>{% trans "Add an address" %}</a>
         {% acl_end %}
-        <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-mailcontact'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several addresses" %}</a>
+        <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-mailcontact'  %}"><i class="fa fa-trash"></i>{% trans "Delete one or several addresses" %}</a>
         <p></p>
         {%  include 'preferences/aff_mailcontact.html' with  mailcontact_list=mailcontact_list %}
     </div>
@@ -465,7 +465,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="panel panel-default" id="social">
     <div class="panel-heading" data-toggle="collapse" href="#collapse_social">
         <h4 class="panel-title">
-                <i class="fa fa-twitter"></i> {% trans "Social networks" %}</a>
+                <a><i class="fa fa-twitter"></i> {% trans "Social networks" %}</a>
         </h4>
     </div>
     <div id="collapse_social" class="panel-collapse panel-body collapse">
diff --git a/preferences/views.py b/preferences/views.py
index 91ced9b3..a7df9cef 100644
--- a/preferences/views.py
+++ b/preferences/views.py
@@ -191,7 +191,7 @@ def add_service(request):
         messages.success(request, _("The service was added."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"preferenceform": service, "action_name": _("Add a service")},
+        {"preferenceform": service, "action_name": _("Add")},
         "preferences/preferences.html",
         request,
     )
@@ -224,7 +224,7 @@ def del_service(request, service_instance, **_kwargs):
         messages.success(request, _("The service was deleted."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"objet": service_instance, "objet_name": "service"},
+        {"objet": service_instance, "objet_name": _("service")},
         "preferences/delete.html",
         request,
     )
@@ -240,7 +240,7 @@ def add_reminder(request):
         messages.success(request, _("The reminder was added."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"preferenceform": reminder, "action_name": _("Add a reminder")},
+        {"preferenceform": reminder, "action_name": _("Add")},
         "preferences/preferences.html",
         request,
     )
@@ -273,7 +273,7 @@ def del_reminder(request, reminder_instance, **_kwargs):
         messages.success(request, _("The reminder was deleted."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"objet": reminder_instance, "objet_name": "reminder"},
+        {"objet": reminder_instance, "objet_name": _("reminder")},
         "preferences/delete.html",
         request,
     )
@@ -289,7 +289,7 @@ def add_radiuskey(request):
         messages.success(request, _("The RADIUS key was added."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"preferenceform": radiuskey, "action_name": _("Add a RADIUS key")},
+        {"preferenceform": radiuskey, "action_name": _("Add")},
         "preferences/preferences.html",
         request,
     )
@@ -328,7 +328,7 @@ def del_radiuskey(request, radiuskey_instance, **_kwargs):
             )
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"objet": radiuskey_instance, "objet_name": "radiuskey"},
+        {"objet": radiuskey_instance, "objet_name": _("RADIUS key")},
         "preferences/delete.html",
         request,
     )
@@ -346,7 +346,7 @@ def add_switchmanagementcred(request):
     return form(
         {
             "preferenceform": switchmanagementcred,
-            "action_name": _("Add switch management credentials"),
+            "action_name": _("Add"),
         },
         "preferences/preferences.html",
         request,
@@ -391,7 +391,7 @@ def del_switchmanagementcred(request, switchmanagementcred_instance, **_kwargs):
             )
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"objet": switchmanagementcred_instance, "objet_name": "switchmanagementcred"},
+        {"objet": switchmanagementcred_instance, "objet_name": _("switch management credentials")},
         "preferences/delete.html",
         request,
     )
@@ -409,7 +409,7 @@ def add_mailcontact(request):
     return form(
         {
             "preferenceform": mailcontact,
-            "action_name": _("Add a contact email address"),
+            "action_name": _("Add"),
         },
         "preferences/preferences.html",
         request,
@@ -524,8 +524,8 @@ def del_document_template(request, instances):
                 messages.error(
                     request,
                     _(
-                        "The document template %(document_template)s can't be deleted \
-                    because it is currently being used."
+                        "The document template %(document_template)s can't be"
+                        " deleted because it is currently being used."
                     )
                     % {"document_template": document_template},
                 )
@@ -551,7 +551,7 @@ def add_radiusattribute(request):
         messages.success(request, _("The attribute was added."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"preferenceform": attribute, "action_name": _("Add a RADIUS attribute")},
+        {"preferenceform": attribute, "action_name": _("Add")},
         "preferences/preferences.html",
         request,
     )
@@ -584,7 +584,7 @@ def del_radiusattribute(request, radiusattribute_instance, **_kwargs):
         messages.success(request, _("The attribute was deleted."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"objet": radiusattribute_instance, "objet_name": "attribute"},
+        {"objet": radiusattribute_instance, "objet_name": _("attribute")},
         "preferences/delete.html",
         request,
     )
@@ -600,7 +600,7 @@ def add_mandate(request):
         messages.success(request, _("The mandate was added."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"preferenceform": mandate, "action_name": _("Add a mandate")},
+        {"preferenceform": mandate, "action_name": _("Add")},
         "preferences/preferences.html",
         request,
     )
@@ -631,7 +631,7 @@ def del_mandate(request, mandate_instance, **_kwargs):
         messages.success(request, _("The mandate was deleted."))
         return redirect(reverse("preferences:display-options"))
     return form(
-        {"objet": mandate_instance, "objet_name": "attribute"},
+        {"objet": mandate_instance, "objet_name": _("mandate")},
         "preferences/delete.html",
         request,
     )
diff --git a/re2o/acl.py b/re2o/acl.py
index 5991df02..fd149a97 100644
--- a/re2o/acl.py
+++ b/re2o/acl.py
@@ -44,14 +44,14 @@ def acl_error_message(msg, permissions):
     if permissions is None:
         return msg
     groups = ", ".join([g.name for g in get_group_having_permission(*permissions)])
-    message = msg or _("You don't have the right to edit" " this option.")
+    message = msg or _("You don't have the right to edit this option.")
     if groups:
         return (
             message
-            + _(" You need to be a member of one of those" " groups : %s") % groups
+            + _("You need to be a member of one of these groups: %s.") % groups
         )
     else:
-        return message + " No group have the %s permission(s) !" % " or ".join(
+        return message + _("No group has the %s permission(s)!") % " or ".join(
             [",".join(permissions[:-1]), permissions[-1]]
             if len(permissions) > 2
             else permissions
@@ -190,7 +190,7 @@ ModelC)
                 for msg in error_messages:
                     messages.error(
                         request,
-                        msg or _("You don't have the right to access" " this menu."),
+                        msg or _("You don't have the right to access this menu."),
                     )
                 if request.user.id is not None:
                     return redirect(
diff --git a/re2o/base.py b/re2o/base.py
index e70c6612..6b12a4a6 100644
--- a/re2o/base.py
+++ b/re2o/base.py
@@ -96,9 +96,9 @@ def convert_datetime_format(format):
 def get_input_formats_help_text(input_formats):
     """Returns a help text about the possible input formats"""
     if len(input_formats) > 1:
-        help_text_template = "Format: {main} {more}"
+        help_text_template = _("Format: {main} {more}")
     else:
-        help_text_template = "Format: {main}"
+        help_text_template = _("Format: {main}")
     more_text_template = '<i class="fa fa-question-circle" title="{}"></i>'
     help_text = help_text_template.format(
         main=convert_datetime_format(input_formats[0]),
diff --git a/re2o/locale/fr/LC_MESSAGES/django.po b/re2o/locale/fr/LC_MESSAGES/django.po
index 347d570c..6f5dbd0b 100644
--- a/re2o/locale/fr/LC_MESSAGES/django.po
+++ b/re2o/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
 "PO-Revision-Date: 2018-03-31 16:09+0002\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,15 +30,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: re2o/acl.py:142
+#: re2o/acl.py:47
+msgid "You don't have the right to edit this option."
+msgstr "Vous n'avez pas le droit de modifier cette option."
+
+#: re2o/acl.py:51
+#, python-format
+msgid "You need to be a member of one of these groups: %s."
+msgstr "Vous devez être membre de l'un de ces groupes : %s."
+
+#: re2o/acl.py:54
+#, python-format
+msgid "No group has the %s permission(s)!"
+msgstr "Aucun groupe ne possède la ou les permissions %s !"
+
+#: re2o/acl.py:167
 msgid "Nonexistent entry."
 msgstr "Entrée inexistante."
 
-#: re2o/acl.py:159 re2o/acl.py:229
+#: re2o/acl.py:193 re2o/acl.py:264
 msgid "You don't have the right to access this menu."
 msgstr "Vous n'avez pas le droit d'accéder à ce menu."
 
-#: re2o/acl.py:279
+#: re2o/acl.py:314
 msgid "You don't have the right to edit the history."
 msgstr "Vous n'avez pas le droit de modifier l'historique."
 
@@ -50,57 +64,94 @@ msgstr "Ce domaine est déjà pris."
 msgid "SMTP unreachable."
 msgstr "SMTP injoignable."
 
-#: re2o/mixins.py:111
+#: re2o/base.py:99
+#, python-brace-format
+msgid "Format: {main} {more}"
+msgstr "Format : {main} {more}"
+
+#: re2o/base.py:101
+#, python-brace-format
+msgid "Format: {main}"
+msgstr "Format : {main}"
+
+#: re2o/mixins.py:113
 #, python-format
 msgid "You don't have the right to create a %s object."
 msgstr "Vous n'avez pas le droit de créer un objet %s."
 
-#: re2o/mixins.py:125
+#: re2o/mixins.py:129
 #, python-format
 msgid "You don't have the right to edit a %s object."
 msgstr "Vous n'avez pas le droit de modifier un objet %s."
 
-#: re2o/mixins.py:139
+#: re2o/mixins.py:145
 #, python-format
 msgid "You don't have the right to delete a %s object."
 msgstr "Vous n'avez pas le droit de supprimer un objet %s."
 
-#: re2o/mixins.py:153
+#: re2o/mixins.py:161
 #, python-format
 msgid "You don't have the right to view every %s object."
 msgstr "Vous n'avez pas le droit de voir tous les objets %s."
 
-#: re2o/mixins.py:167
+#: re2o/mixins.py:177
 #, python-format
 msgid "You don't have the right to view a %s object."
 msgstr "Vous n'avez pas le droit de voir un objet %s."
 
-#: re2o/settings.py:158
+#: re2o/settings.py:150
 msgid "English"
 msgstr "Anglais"
 
-#: re2o/settings.py:159
+#: re2o/settings.py:150
 msgid "French"
 msgstr "Français"
 
-#: re2o/templates/re2o/about.html:29 re2o/templates/re2o/about.html:35
+#: re2o/templates/re2o/about.html:29 re2o/templates/re2o/about.html:54
 msgid "About Re2o"
 msgstr "À propos de Re2o"
 
 #: re2o/templates/re2o/about.html:32
-#, python-format
-msgid "About %(AssoName)s"
-msgstr "À propos de %(AssoName)s"
+msgid "Legal notes"
+msgstr "Mentions légales"
 
-#: re2o/templates/re2o/about.html:36
+#: re2o/templates/re2o/about.html:34
+msgid "Legal entity"
+msgstr "Entité légale"
+
+#: re2o/templates/re2o/about.html:37
+msgid "Registered office"
+msgstr "Siège enregistré"
+
+#: re2o/templates/re2o/about.html:41
+msgid "SIRET: "
+msgstr "SIRET : "
+
+#: re2o/templates/re2o/about.html:43
+msgid "Publication manager"
+msgstr "Gestionnaire de publication"
+
+#: re2o/templates/re2o/about.html:44
+msgid "President of "
+msgstr "Président de "
+
+#: re2o/templates/re2o/about.html:46
+msgid "General Terms of Use"
+msgstr "Conditions Générales d'Utilisation"
+
+#: re2o/templates/re2o/about.html:50
+msgid "Additional information"
+msgstr "Informations supplémentaires"
+
+#: re2o/templates/re2o/about.html:55
 msgid ""
 "Re2o is an administration tool initiated by <a href=\"https://rezometz.org/"
 "\">Rezo Metz</a> and a few members of other <a href=\"https://federez.net"
 "\">FedeRez</a> associations around the summer 2016.<br /> It is intended to "
-"be a tool independant from any network infrastructure so it can be setup in "
+"be a tool independent from any network infrastructure so it can be setup in "
 "\"a few steps\". This tool is entirely free and available under a GNU Public "
 "License v2 (GPLv2) license on <a href=\"https://gitlab.federez.net/federez/"
-"re2o/\">FedeRez gitlab</a>.<br /> Re2o's mainteners are volunteers mainly "
+"re2o/\">FedeRez gitlab</a>.<br /> Re2o's maintainers are volunteers mainly "
 "from French schools. <br /> If you want to get involved in the development "
 "process, we will be glad to welcome you so do not hesitate to contact us and "
 "come help us build the future of Re2o."
@@ -109,7 +160,7 @@ msgstr ""
 "\">Rézo Metz</a> et quelques membres d'autres associations de <a href="
 "\"https://federez.net\">FedeRez</a> autour de l'été 2016.<br /> Il se veut "
 "être un outil indépendant de toute infrastructure réseau pour pouvoir être "
-"installé en \"quelques étapes\". Cet outil est entièrement gratuit et est "
+"installé en « quelques étapes ». Cet outil est entièrement gratuit et est "
 "disponible sous licence GNU Public Licence v2 (GPLv2) sur le <a href="
 "\"https://gitlab.federez.net/federez/re2o/\">gitlab de FedeRez</a>.<br />\n"
 "Les mainteneurs de Re2o sont de fiers bénévoles venant principalement "
@@ -119,35 +170,35 @@ msgstr ""
 "développement, nous serons heureux de vous accueillir donc n'hésitez pas à "
 "nous contacter et à venir nous aider à construire le futur de Re2o."
 
-#: re2o/templates/re2o/about.html:55
+#: re2o/templates/re2o/about.html:74
 msgid "Contributors list"
 msgstr "Liste des contributeurs"
 
-#: re2o/templates/re2o/about.html:64
+#: re2o/templates/re2o/about.html:83
 msgid "Version information"
 msgstr "Informations de versions"
 
-#: re2o/templates/re2o/about.html:66
+#: re2o/templates/re2o/about.html:85
 #, python-format
 msgid "<b>Remote URL</b>: %(git_info_remote)s"
 msgstr "<b>URL distante</b> : %(git_info_remote)s"
 
-#: re2o/templates/re2o/about.html:69
+#: re2o/templates/re2o/about.html:88
 #, python-format
 msgid "<b>Branch</b>: %(git_info_branch)s"
 msgstr "<b>Branche</b> : %(git_info_branch)s"
 
-#: re2o/templates/re2o/about.html:72
+#: re2o/templates/re2o/about.html:91
 #, python-format
 msgid "<b>Commit</b>: %(git_info_commit)s"
 msgstr "<b>Commit</b> : %(git_info_commit)s"
 
-#: re2o/templates/re2o/about.html:75
+#: re2o/templates/re2o/about.html:94
 #, python-format
 msgid "<b>Commit date</b>: %(git_info_commit_date)s"
 msgstr "<b>Date du commit</b> : %(git_info_commit_date)s"
 
-#: re2o/templates/re2o/about.html:80
+#: re2o/templates/re2o/about.html:99
 msgid "Dependencies"
 msgstr "Dépendances"
 
@@ -265,11 +316,9 @@ msgid "Follow @%(twitter_account_name)s"
 msgstr "Suivre @%(twitter_account_name)s"
 
 #: re2o/urls.py:57
-#, fuzzy
-#| msgid "Home"
 msgid "Homepage"
-msgstr "Accueil"
+msgstr "Page d'accueil"
 
-#: re2o/views.py:89
+#: re2o/views.py:96
 msgid "Unable to get the information."
 msgstr "Impossible d'obtenir l'information."
diff --git a/re2o/login.py b/re2o/login.py
index 1f6989f3..e7b385b1 100644
--- a/re2o/login.py
+++ b/re2o/login.py
@@ -80,21 +80,21 @@ def hash_password_salt(hashed_password):
         try:
             digest = b64decode(hashed_password[6:])
         except TypeError as error:
-            raise ValueError("b64 error for `hashed_password` : %s" % error)
+            raise ValueError("b64 error for `hashed_password`: %s." % error)
         if len(digest) < 20:
-            raise ValueError("`hashed_password` too short")
+            raise ValueError("`hashed_password` too short.")
         return digest[20:]
     elif hashed_password.upper().startswith("{SMD5}"):
         try:
             digest = b64decode(hashed_password[7:])
         except TypeError as error:
-            raise ValueError("b64 error for `hashed_password` : %s" % error)
+            raise ValueError("b64 error for `hashed_password`: %s." % error)
         if len(digest) < 16:
-            raise ValueError("`hashed_password` too short")
+            raise ValueError("`hashed_password` too short.")
         return digest[16:]
     else:
         raise ValueError(
-            "`hashed_password` should start with '{SSHA}' or '{CRYPT}' or '{SMD5}'"
+            "`hashed_password` should start with '{SSHA}' or '{CRYPT}' or '{SMD5}'."
         )
 
 
diff --git a/re2o/management/commands/gen_contrib.py b/re2o/management/commands/gen_contrib.py
index e8de851b..430c2bc3 100644
--- a/re2o/management/commands/gen_contrib.py
+++ b/re2o/management/commands/gen_contrib.py
@@ -64,7 +64,7 @@ class Command(BaseCommand):
             for item in os.popen("git shortlog -s -n").read().split("\n")
             if "\t" in item
         ]
-        self.stdout.write(self.style.SUCCESS("Exportation Successful"))
+        self.stdout.write(self.style.SUCCESS("Exportation successful!"))
         with open("re2o/contributors.py", "w") as contrib_file:
             content = self._contrib_file_generator(contributors)
             contrib_file.write(content)
diff --git a/re2o/mixins.py b/re2o/mixins.py
index 4766d657..4e42daa1 100644
--- a/re2o/mixins.py
+++ b/re2o/mixins.py
@@ -61,7 +61,7 @@ class FormRevMixin(object):
             )
         elif self.changed_data:
             reversion.set_comment(
-                "Field(s) altered : %s"
+                "Field(s) edited: %s"
                 % ", ".join(field for field in self.changed_data)
             )
         return super(FormRevMixin, self).save(*args, **kwargs)
diff --git a/re2o/script_utils.py b/re2o/script_utils.py
index 539f4723..c6adbeab 100644
--- a/re2o/script_utils.py
+++ b/re2o/script_utils.py
@@ -53,7 +53,7 @@ def get_user(pseudo):
         raise CommandError("Invalid user.")
     if len(user) > 1:
         raise CommandError(
-            "Several users match this username. This SHOULD" " NOT happen."
+            "Several users match this username. This SHOULD NOT happen."
         )
     return user[0]
 
@@ -95,5 +95,5 @@ def form_cli(Form, user, action, *args, **kwargs):
         reversion.set_comment(action)
 
     sys.stdout.write(
-        "%s : done. The edit may take several minutes to" " apply.\n" % action
+        "%s: done. The edit may take several minutes to apply.\n" % action
     )
diff --git a/re2o/templates/re2o/about.html b/re2o/templates/re2o/about.html
index c2a226e1..03b8beca 100644
--- a/re2o/templates/re2o/about.html
+++ b/re2o/templates/re2o/about.html
@@ -38,16 +38,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <p>{{ option.adresse1 | safe }}</p>
     <p>{{ option.adresse2 | safe }}</p>
 
-    <p>SIRET : {{ option.siret | safe }}</p>
+    <p>{% trans "SIRET: " %}{{ option.siret | safe }}</p>
 
     <h4>{% trans "Publication manager" %}</h4>
     <p>{{ president }} - {% trans "President of " %} {{ option.pseudo }}</p>
 
-    <h4>{% trans "General conditions of use" %}</h4>
+    <h4>{% trans "General Terms of Use" %}</h4>
     <p><a href='{{ gtu.url }}' download='CGU'>{{ gtu }}</a></p>
 
     {% if option.description %}
-    <h4>Extra informations</h4>
+    <h4>{% trans "Additional information" %}</h4>
     <p>{{ option.description | safe }}</p>
     {% endif %}
 
@@ -57,11 +57,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <a href="https://rezometz.org/">Rezo Metz</a> and a few
         members of other <a href="https://federez.net">FedeRez</a> associations
         around the summer 2016.<br />
-        It is intended to be a tool independant from any network infrastructure
+        It is intended to be a tool independent from any network infrastructure
         so it can be setup in "a few steps". This tool is entirely free and
         available under a GNU Public License v2 (GPLv2) license on
         <a href="https://gitlab.federez.net/federez/re2o/">FedeRez gitlab</a>.<br />
-		Re2o's mainteners are volunteers mainly from French schools. <br />
+		Re2o's maintainers are volunteers mainly from French schools. <br />
         If you want to get involved in the development process, we will be glad to
         welcome you so do not hesitate to contact us and come help us build the
         future of Re2o.
diff --git a/re2o/templatetags/acl.py b/re2o/templatetags/acl.py
index 095a3717..f34dfb7f 100644
--- a/re2o/templatetags/acl.py
+++ b/re2o/templatetags/acl.py
@@ -88,7 +88,7 @@ def get_model(model_name):
             app_label, name = splitted
         except ValueError:
             raise template.TemplateSyntaxError(
-                "%r is an inconsistent model name" % model_name
+                "%r is an inconsistent model name." % model_name
             )
     else:
         app_label, name = None, splitted[0]
@@ -101,7 +101,7 @@ def get_model(model_name):
             content_type = ContentType.objects.get(model=name.lower())
     except ContentType.DoesNotExist:
         raise template.TemplateSyntaxError(
-            "%r is not a valid model for an acl tag" % model_name
+            "%r is not a valid model for an acl tag." % model_name
         )
     except ContentType.MultipleObjectsReturned:
         raise template.TemplateSyntaxError(
@@ -178,7 +178,7 @@ def get_callback(tag_name, obj=None):
             True,
         )
 
-    raise template.TemplateSyntaxError("%r tag is not a valid can_xxx tag" % tag_name)
+    raise template.TemplateSyntaxError("%r tag is not a valid can_xxx tag." % tag_name)
 
 
 def acl_fct(callback, reverse):
@@ -264,7 +264,7 @@ def acl_change_filter(parser, token):
         args = tag_content[3:]
     except ValueError:
         raise template.TemplateSyntaxError(
-            "%r tag require at least 2 argument: the model and the field"
+            "%r tag require at least 2 argument: the model and the field."
             % token.contents.split()[0]
         )
 
@@ -306,7 +306,7 @@ def acl_model_filter(parser, token):
         args = tag_content[2:]
     except ValueError:
         raise template.TemplateSyntaxError(
-            "%r tag require at least 1 argument: the model" % token.contents.split()[0]
+            "%r tag require at least 1 argument: the model." % token.contents.split()[0]
         )
 
     model = get_model(model_name)
@@ -345,7 +345,7 @@ def acl_instance_filter(parser, token):
         args = tag_content[2:]
     except ValueError:
         raise template.TemplateSyntaxError(
-            "%r tag require at least 1 argument: the instance"
+            "%r tag require at least 1 argument: the instance."
             % token.contents.split()[0]
         )
 
diff --git a/re2o/urls.py b/re2o/urls.py
index a589d63c..146fc3b9 100644
--- a/re2o/urls.py
+++ b/re2o/urls.py
@@ -46,7 +46,7 @@ from __future__ import unicode_literals
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from django.views.generic import RedirectView
 
 from .settings_local import OPTIONNAL_APPS_RE2O
diff --git a/search/forms.py b/search/forms.py
index 0c979458..259f739c 100644
--- a/search/forms.py
+++ b/search/forms.py
@@ -34,7 +34,7 @@ CHOICES_USER = (
     ("1", _("Disabled")),
     ("2", _("Archived")),
     ("3", _("Not yet active")),
-    ("4", _("Full archived")),
+    ("4", _("Fully archived")),
 )
 
 CHOICES_AFF = (
diff --git a/search/locale/fr/LC_MESSAGES/django.po b/search/locale/fr/LC_MESSAGES/django.po
index 89303a02..6c317169 100644
--- a/search/locale/fr/LC_MESSAGES/django.po
+++ b/search/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-19 23:43+0100\n"
 "PO-Revision-Date: 2018-06-24 20:10+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -47,10 +47,8 @@ msgid "Not yet active"
 msgstr "Pas encore adhéré"
 
 #: search/forms.py:37
-#, fuzzy
-#| msgid "Archived"
-msgid "Full archived"
-msgstr "Archivés"
+msgid "Fully archived"
+msgstr "Complètement archivés"
 
 #: search/forms.py:41
 msgid "Users"
@@ -84,12 +82,12 @@ msgstr "Ports"
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
-#: search/forms.py:61 search/forms.py:73 search/templates/search/search.html:29
+#: search/forms.py:62 search/forms.py:77 search/templates/search/search.html:29
 #: search/templates/search/search.html:48
 msgid "Search"
 msgstr "Rechercher"
 
-#: search/forms.py:63 search/forms.py:75
+#: search/forms.py:65 search/forms.py:80
 msgid ""
 "Use « » and «,» to specify distinct words, «\"query\"» for an exact search "
 "and «\\» to escape a character."
@@ -97,19 +95,19 @@ msgstr ""
 "Utilisez « » et «,» pour spécifier différents mots, «\"query\"» pour une "
 "recherche exacte et «\\» pour échapper un caractère."
 
-#: search/forms.py:82
+#: search/forms.py:88
 msgid "Users filter"
 msgstr "Filtre utilisateurs"
 
-#: search/forms.py:89
+#: search/forms.py:95
 msgid "Display filter"
 msgstr "Filtre affichage"
 
-#: search/forms.py:97
+#: search/forms.py:101
 msgid "Start date"
 msgstr "Date de début"
 
-#: search/forms.py:101
+#: search/forms.py:102
 msgid "End date"
 msgstr "Date de fin"
 
@@ -159,10 +157,10 @@ msgstr "Pas de résultat"
 
 #: search/templates/search/index.html:71
 #, python-format
-msgid "(Only the first %(max_result)s results are displayed in each category)"
+msgid "Only the first %(max_result)s results are displayed in each category."
 msgstr ""
-"(Seulement les %(max_result)s premiers résultats sont affichés dans chaque "
-"catégorie)"
+"Seulement les %(max_result)s premiers résultats sont affichés dans chaque "
+"catégorie."
 
 #: search/templates/search/sidebar.html:31
 msgid "Simple search"
diff --git a/search/templates/search/index.html b/search/templates/search/index.html
index 8f1174fb..e7f05a88 100644
--- a/search/templates/search/index.html
+++ b/search/templates/search/index.html
@@ -68,7 +68,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% if not users and not machines and not factures and not whitelists and not bans and not rooms and not ports and not switches %}
         <h3>{% trans "No result" %}</h3>
     {% else %}
-        <h6>{% blocktrans %}(Only the first {{ max_result }} results are displayed in each category){% endblocktrans %}</h6>
+        <h6>{% blocktrans %}Only the first {{ max_result }} results are displayed in each category.{% endblocktrans %}</h6>
     {% endif %}
     <br />
     <br />
diff --git a/templates/admin/custom_index.html b/templates/admin/custom_index.html
index df0a330c..30447c2f 100644
--- a/templates/admin/custom_index.html
+++ b/templates/admin/custom_index.html
@@ -14,8 +14,7 @@ Copyright © 2019  Alexandre Iooss
 {% block content %}
     <div id="content-main">
         <p>
-            {% blocktrans %}You are on the operator interface. Here you will be able to manage the network and users
-                from the top left menu. You can also go read the developer documentation.{% endblocktrans %}
+            {% blocktrans %}You are on the operator interface. Here you will be able to manage the network and users from the top left menu. You can also go read the developer documentation.{% endblocktrans %}
         </p>
         <p>
             {% blocktrans %}To go back to the main site, click "View site" button in top right menu.{% endblocktrans %}
@@ -26,12 +25,12 @@ Copyright © 2019  Alexandre Iooss
 {% block sidebar %}
     <div id="content-related">
         <div class="module" id="recent-actions-module">
-            <h2>{% trans 'My account' %}</h2>
-            <h3>{% trans 'My recent actions' %}</h3>
+            <h2>{% trans "My account" %}</h2>
+            <h3>{% trans "Recent actions" %}</h3>
             {% load log %}
             {% get_admin_log 10 as admin_log for_user user %}
             {% if not admin_log %}
-                <p>{% trans 'None available' %}</p>
+                <p>{% trans "None available" %}</p>
             {% else %}
                 <ul class="actionlist">
                     {% for entry in admin_log %}
@@ -46,7 +45,7 @@ Copyright © 2019  Alexandre Iooss
                                 <span class="mini quiet">{% filter capfirst %}
                                     {{ entry.content_type }}{% endfilter %}</span>
                             {% else %}
-                                <span class="mini quiet">{% trans 'Unknown content' %}</span>
+                                <span class="mini quiet">{% trans "Unknown content" %}</span>
                             {% endif %}
                         </li>
                     {% endfor %}
diff --git a/templates/base.html b/templates/base.html
index 122c7c3a..ced8061e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <meta property="og:image" content="{% static 'images/logo_re2o.svg' %}"/>
         <meta property="og:image:type" content="image/svg"/>
         <meta property="og:image:alt" content="The Re2o logo"/>
-        <meta property="og:description" content="{% trans "Networking managing website endorsed by FedeRez." %}" />
+        <meta property="og:description" content="Networking managing website endorsed by FedeRez." />
 
         {# Preload JavaScript #}
         {% bootstrap_javascript %}
@@ -142,7 +142,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                 <li><a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> {% trans "About" %}</a></li>
                                 <li><a href="{% url 'contact' %}"><i class="fa fa-at"></i> {% trans "Contact" %}</a></li>
                                 {% comment %}
-                                <li><a href="{% url 'tickets:new-ticket' %}"><i class="fa fa-ticket"></i> {% trans "Ouvrir un ticket" %}</a><li>
+                                <li><a href="{% url 'tickets:new-ticket' %}"><i class="fa fa-ticket"></i> {% trans "Open a ticket" %}</a><li>
                                 {% endcomment %}
                             </ul>
                         </li>
@@ -284,7 +284,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <p class="pull-right">
                   <a href="#">{% trans "Back to top" %}</a>
                 </p>
-                <p>{{ name_website }} {% trans "powered by" %} Re2o 2016&ndash;2018</p>
+		<p>{{ name_website }} {% trans "powered by" %} Re2o 2016&ndash;2019</p>
                 <p>
                     {% blocktrans trimmed %}
                     Brought to you with <i class="fa fa-heart text-danger"></i>.
diff --git a/templates/buttons/history.html b/templates/buttons/history.html
index c4bee631..730023e8 100644
--- a/templates/buttons/history.html
+++ b/templates/buttons/history.html
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load i18n %}
-<a {% if class%}class="btn btn-info btn-sm"{% endif %} role="button" title="{% trans 'History' %}" href="{% url 'logs:history' application name id %}">
-    <i class="fa fa-history"></i> {% if text %}{% trans 'History' %}{% endif %}
+<a {% if class%}class="btn btn-info btn-sm"{% endif %} role="button" title="{% trans "History" %}" href="{% url 'logs:history' application name id %}">
+    <i class="fa fa-history"></i> {% if text %}{% trans "History" %}{% endif %}
 </a>
 
diff --git a/templates/errors/404.html b/templates/errors/404.html
index 6edaee64..2f743532 100644
--- a/templates/errors/404.html
+++ b/templates/errors/404.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <meta property="og:image" content="{% static 'images/logo_re2o.svg' %}"/>
         <meta property="og:image:type" content="image/svg"/>
         <meta property="og:image:alt" content="The Re2o logo"/>
-	<meta property="og:description" content="{% trans "Networking managing website endorsed by FedeRez." %}" />
+	<meta property="og:description" content="Networking managing website endorsed by FedeRez." />
 
         <meta charset="utf-8">
         <link rel="shortcut icon" type="image/svg" href="{% static 'images/logo_re2o.svg' %}">
diff --git a/templates/errors/500.html b/templates/errors/500.html
index e7148f7b..b15341ee 100644
--- a/templates/errors/500.html
+++ b/templates/errors/500.html
@@ -38,7 +38,7 @@
         </p>
         <p>
 	    <b>{% blocktrans trimmed %}An email has been automatically sent to the site administrators. Please avoid
-	    spamming them by trigerring the same issue multiple times.{% endblocktrans %}</b>{% blocktrans trimmed %} The mail should
+	    spamming them by trigerring the same issue multiple times.{% endblocktrans %}</b>{% blocktrans trimmed %} The email should
             contains all the details necessary to understand what went wrong but if your help were
 	    needed, you will probably be contacted by them.{% endblocktrans %}
         </p>
diff --git a/templates/locale/fr/LC_MESSAGES/django.po b/templates/locale/fr/LC_MESSAGES/django.po
index 814fb3ac..80131b1d 100644
--- a/templates/locale/fr/LC_MESSAGES/django.po
+++ b/templates/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-19 23:43+0100\n"
 "PO-Revision-Date: 2018-03-31 16:09+0002\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,11 +30,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/admin/base_site.html:65 templates/base.html:281
+#: templates/admin/base_site.html:65 templates/base.html:288
 msgid "powered by"
 msgstr "propulsé par"
 
-#: templates/admin/base_site.html:69 templates/base.html:289
+#: templates/admin/base_site.html:69 templates/base.html:296
 msgid ""
 "This software is under the terms of the <a href=\"http://www.gnu.org/"
 "licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a> License."
@@ -45,41 +45,41 @@ msgstr ""
 #: templates/admin/custom_index.html:11
 #, python-format
 msgid "Welcome to %(name_website)s"
-msgstr ""
+msgstr "Bienvenue sur %(name_website)s"
 
 #: templates/admin/custom_index.html:17
 msgid ""
 "You are on the operator interface. Here you will be able to manage the "
-"network and users\n"
-"                from the top left menu. You can also go read the developer "
+"network and users from the top left menu. You can also go read the developer "
 "documentation."
 msgstr ""
+"Vous êtes dans l'interface opérateur. Ici vous pourrez gérer le réseau et "
+"les utilisateurs depuis le menu en haut à gauche. Vous pouvez aussi lire la "
+"documentation du développeur."
 
-#: templates/admin/custom_index.html:21
+#: templates/admin/custom_index.html:20
 msgid ""
 "To go back to the main site, click \"View site\" button in top right menu."
 msgstr ""
+"Pour revenir au site principal, cliquez sur le bouton « Voir le site » dans "
+"le menu en haut à droite."
+
+#: templates/admin/custom_index.html:28
+msgid "My account"
+msgstr "Mon compte"
 
 #: templates/admin/custom_index.html:29
-msgid "My account"
+msgid "Recent actions"
 msgstr ""
 
-#: templates/admin/custom_index.html:30
-msgid "My recent actions"
-msgstr ""
-
-#: templates/admin/custom_index.html:34
+#: templates/admin/custom_index.html:33
 msgid "None available"
 msgstr ""
 
-#: templates/admin/custom_index.html:49
+#: templates/admin/custom_index.html:48
 msgid "Unknown content"
 msgstr ""
 
-#: templates/base.html:43 templates/errors/404.html:35
-msgid "Networking managing website endorsed by FedeRez."
-msgstr "Site de gestion de réseau soutenu par FedeRez."
-
 #: templates/base.html:70 templates/registration/logged_out.html:11
 #: templates/registration/password_change_done.html:11
 #: templates/registration/password_change_form.html:11
@@ -88,7 +88,7 @@ msgstr "Site de gestion de réseau soutenu par FedeRez."
 #: templates/registration/password_reset_done.html:11
 #: templates/registration/password_reset_form.html:11
 msgid "Home"
-msgstr "Accueil"
+msgstr ""
 
 #: templates/base.html:91
 msgid "Users"
@@ -110,139 +110,139 @@ msgstr "Gérer les machines"
 msgid "Manage the subscriptions"
 msgstr "Gérer les cotisations"
 
-#: templates/base.html:112
+#: templates/base.html:114
 msgid "Topology"
 msgstr "Topologie"
 
-#: templates/base.html:114
+#: templates/base.html:116
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
-#: templates/base.html:115
+#: templates/base.html:117
 msgid "Access points"
 msgstr "Points d'accès sans fil"
 
-#: templates/base.html:116
+#: templates/base.html:118
 msgid "Rooms"
 msgstr "Chambres"
 
-#: templates/base.html:121
+#: templates/base.html:128
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: templates/base.html:126
-msgid "Administration"
-msgstr "Administration"
-
 #: templates/base.html:133
-msgid "Information and contact"
+msgid "Administration"
 msgstr ""
 
-#: templates/base.html:135
+#: templates/base.html:140
+msgid "Information and contact"
+msgstr "Informations et contact"
+
+#: templates/base.html:142
 msgid "About"
 msgstr "À propos"
 
-#: templates/base.html:136
+#: templates/base.html:143
 msgid "Contact"
 msgstr "Contact"
 
-#: templates/base.html:150
+#: templates/base.html:157
 msgid "Sign up"
 msgstr "S'inscrire"
 
-#: templates/base.html:156 templates/registration/login.html:29
+#: templates/base.html:163 templates/registration/login.html:29
 #: templates/registration/login.html:36
 msgid "Log in"
-msgstr "Se connecter"
+msgstr ""
 
-#: templates/base.html:164
+#: templates/base.html:171
 msgid "Search"
-msgstr "Rechercher"
+msgstr ""
 
-#: templates/base.html:178
+#: templates/base.html:185
 msgid "My profile"
 msgstr "Mon profil"
 
-#: templates/base.html:179
+#: templates/base.html:186
 msgid "Log out"
-msgstr "Se déconnecter"
+msgstr ""
 
-#: templates/base.html:214
+#: templates/base.html:221
 msgid "Username"
 msgstr "Pseudo"
 
-#: templates/base.html:218
+#: templates/base.html:225
 msgid "Room"
 msgstr "Chambre"
 
-#: templates/base.html:222
+#: templates/base.html:229
 msgid "Internet access"
 msgstr "Accès Internet"
 
-#: templates/base.html:225
+#: templates/base.html:232
 #, python-format
 msgid "Until %(end_access_date)s"
 msgstr "Jusqu'au %(end_access_date)s"
 
-#: templates/base.html:227
+#: templates/base.html:234
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: templates/base.html:232
+#: templates/base.html:239
 msgid "Membership"
 msgstr "Adhésion"
 
-#: templates/base.html:235
+#: templates/base.html:242
 #, python-format
 msgid "Until %(end_adhesion_date)s"
 msgstr "Jusqu'au %(end_adhesion_date)s"
 
-#: templates/base.html:237
+#: templates/base.html:244
 msgid "Non member"
 msgstr "Non adhérent"
 
-#: templates/base.html:245
+#: templates/base.html:252
 msgid "View my profile"
 msgstr "Voir mon profil"
 
-#: templates/base.html:250
+#: templates/base.html:257
 msgid "You are not logged in."
 msgstr "Vous n'êtes pas connecté."
 
-#: templates/base.html:257
+#: templates/base.html:264
 #, python-format
 msgid "%(nb)s active machine"
 msgid_plural "%(nb)s active machines"
 msgstr[0] "%(nb)s machine active"
 msgstr[1] "%(nb)s machines actives"
 
-#: templates/base.html:266
+#: templates/base.html:273
 msgid "View my machines"
 msgstr "Voir mes machines"
 
-#: templates/base.html:279
+#: templates/base.html:286
 msgid "Back to top"
 msgstr "Retour en haut"
 
-#: templates/base.html:283
+#: templates/base.html:290
 msgid "Brought to you with <i class=\"fa fa-heart text-danger\"></i>."
 msgstr "Codé avec <i class=\"fa fa-heart text-danger\"></i>."
 
-#: templates/base.html:286
+#: templates/base.html:293
 msgid "About this website"
 msgstr "À propos de ce site"
 
 #: templates/buttons/add.html:27
 msgid "Add"
-msgstr "Ajouter"
+msgstr ""
 
-#: templates/buttons/edit.html:27 tickets/templates/tickets/preferences.html:14
+#: templates/buttons/edit.html:27
 msgid "Edit"
 msgstr "Modifier"
 
 #: templates/buttons/history.html:26 templates/buttons/history.html:27
 msgid "History"
-msgstr "Historique"
+msgstr ""
 
 #: templates/buttons/setlang.html:34
 msgid "Translation in development"
@@ -258,7 +258,7 @@ msgstr "Tri décroissant"
 
 #: templates/buttons/suppr.html:27
 msgid "Delete"
-msgstr "Supprimer"
+msgstr ""
 
 #: templates/errors/404.html:39
 msgid "404 error: page not found"
@@ -312,7 +312,7 @@ msgstr ""
 
 #: templates/errors/500.html:41
 msgid ""
-"The mail should contains all the details necessary to understand what went "
+"The email should contains all the details necessary to understand what went "
 "wrong but if your help were needed, you will probably be contacted by them."
 msgstr ""
 " Le courrier électronique devrait contenir tous les détails nécessaires à la "
@@ -360,10 +360,8 @@ msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 
 #: templates/registration/logged_out.html:17
-#, fuzzy
-#| msgid "Log in"
 msgid "Log in again"
-msgstr "Se connecter"
+msgstr ""
 
 #: templates/registration/login.html:40
 msgid "Forgotten password?"
@@ -381,10 +379,8 @@ msgid "Password reset"
 msgstr ""
 
 #: templates/registration/password_reset_confirm.html:11
-#, fuzzy
-#| msgid "More information"
 msgid "Password reset confirmation"
-msgstr "Plus d'informations"
+msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
@@ -405,186 +401,3 @@ msgstr ""
 #, python-format
 msgid "The %(site_name)s team"
 msgstr ""
-
-#: tickets/models.py:27
-msgid "Title of the ticket"
-msgstr ""
-
-#: tickets/models.py:32
-msgid "Description of the ticket"
-msgstr ""
-
-#: tickets/models.py:37
-msgid "An email address to get back to you"
-msgstr ""
-
-#: tickets/models.py:43 tickets/templates/tickets/form_preferences.html:30
-#: tickets/templates/tickets/form_ticket.html:31
-msgid "Ticket"
-msgstr ""
-
-#: tickets/models.py:44 tickets/templates/tickets/aff_ticket.html:30
-#: tickets/templates/tickets/aff_tickets.html:35
-#: tickets/templates/tickets/index.html:29
-#: tickets/templates/tickets/index.html:32
-#: tickets/templates/tickets/navbar.html:2
-#: tickets/templates/tickets/preferences.html:6
-msgid "Tickets"
-msgstr ""
-
-#: tickets/models.py:75
-msgid "You don't have the right to view other tickets than yours."
-msgstr ""
-
-#: tickets/models.py:84
-msgid "You don't have the right to view the list of tickets."
-msgstr ""
-
-#: tickets/preferences/models.py:8
-msgid ""
-"Email address to publish the new tickets (leave empty for no publications)"
-msgstr ""
-
-#: tickets/preferences/models.py:14
-msgid "Français"
-msgstr ""
-
-#: tickets/preferences/models.py:15
-msgid "English"
-msgstr ""
-
-#: tickets/preferences/models.py:19
-msgid "Ticket's settings"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:36
-msgid "Solved"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:38
-msgid "Not Solved"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:44
-#, fuzzy
-#| msgid "powered by"
-msgid "Opened by"
-msgstr "propulsé par"
-
-#: tickets/templates/tickets/aff_ticket.html:50
-msgid "Anonymous User"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:54
-msgid "Response address: "
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:54
-msgid "Response to your ticket"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:59
-msgid "Title:"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:60
-msgid "Description"
-msgstr ""
-
-#: tickets/templates/tickets/aff_ticket.html:79
-msgid "Tous les tickets"
-msgstr ""
-
-#: tickets/templates/tickets/aff_tickets.html:38
-msgid "Not Solved Tickets"
-msgstr ""
-
-#: tickets/templates/tickets/aff_tickets.html:41
-msgid "Last Ticket:"
-msgstr ""
-
-#: tickets/templates/tickets/contact.html:8
-#, python-format
-msgid ""
-"If you are experiencing issues with the services offered by %(asso_name)s, "
-"you can open a ticket that will be taken care of. If you want to contact us "
-"on any other topic, please choose one address below."
-msgstr ""
-
-#: tickets/templates/tickets/contact.html:10
-#: tickets/templates/tickets/navbar_logout.html:4
-msgid "Ouvrir un ticket"
-msgstr ""
-
-#: tickets/templates/tickets/form_preferences.html:33
-msgid "Tickets settings modification"
-msgstr ""
-
-#: tickets/templates/tickets/form_ticket.html:39
-msgid ""
-"Vous n'êtes pas authentifié. Veuillez fournir une adresse mail afin que nous "
-"puissions vous recontacter."
-msgstr ""
-
-#: tickets/templates/tickets/form_ticket.html:44
-msgid ""
-"Description de votre problème. Veuillez fournir le plus d'informations "
-"possible afin de faciliter la recherche de solution. Voici quelques "
-"informations dont nous pourions avoir besoin:"
-msgstr ""
-
-#: tickets/templates/tickets/form_ticket.html:47
-msgid "Le type de votre problème (adhesion, connexion, paiement ou autre)."
-msgstr ""
-
-#: tickets/templates/tickets/form_ticket.html:50
-msgid ""
-"Les conditions dans lesquelles vous rencontrez le problème (Wifi/filaire, "
-"sur tout les apareils ou sur un seul. Est-ce une nouvelle machine ?"
-msgstr ""
-
-#: tickets/templates/tickets/form_ticket.html:53
-msgid ""
-"Les endroits dans lequels le problème survient (chez vous, dans une partie "
-"commune, dans un batiment en particulier)."
-msgstr ""
-
-#: tickets/templates/tickets/preferences.html:21
-msgid "Publication email address"
-msgstr ""
-
-#: tickets/templates/tickets/preferences.html:25
-msgid "Pas d'adresse, les tickets ne sont pas annoncés"
-msgstr ""
-
-#: tickets/templates/tickets/preferences.html:29
-msgid "Email language"
-msgstr ""
-
-#: tickets/templates/tickets/profil.html:6
-msgid " Tickets"
-msgstr ""
-
-#: tickets/templates/tickets/profil.html:12
-msgid " Open a Ticket"
-msgstr ""
-
-#: tickets/templates/tickets/profil.html:19
-msgid "No tickets"
-msgstr ""
-
-#: tickets/views.py:83 tickets/views.py:87
-msgid ""
-"Your ticket has been succesfully open. We will take care of it as soon as "
-"possible."
-msgstr ""
-
-#: tickets/views.py:90
-msgid ""
-"You are not authenticated. Please login or provide an email address so we "
-"can get back to you."
-msgstr ""
-
-#: tickets/views.py:117 tickets/views.py:163
-msgid "Never"
-msgstr ""
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html
index b700f171..dc4845bf 100644
--- a/templates/registration/logged_out.html
+++ b/templates/registration/logged_out.html
@@ -8,11 +8,11 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a>
+        <a href="{% url 'index' %}">{% trans "Home" %}</a>
     </div>
 {% endblock %}
 
 {% block content %}
     <p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
-    <p><a href="{% url 'login' %}">{% trans 'Log in again' %}</a></p>
+    <p><a href="{% url 'login' %}">{% trans "Log in again" %}</a></p>
 {% endblock %}
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
index 0e514b53..a0f46597 100644
--- a/templates/registration/password_change_done.html
+++ b/templates/registration/password_change_done.html
@@ -8,6 +8,6 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}
+        <a href="{% url 'index' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Password change" %}
     </div>
 {% endblock %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index 5524bfa0..56dcb6c1 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -8,6 +8,6 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}
+        <a href="{% url 'index' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Password change" %}
     </div>
 {% endblock %}
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
index 506c0981..4182b519 100644
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@@ -8,6 +8,6 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}
+        <a href="{% url 'index' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Password reset" %}
     </div>
 {% endblock %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index de710a83..b25773a8 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -8,6 +8,6 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset confirmation' %}
+        <a href="{% url 'index' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Password reset confirmation" %}
     </div>
 {% endblock %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
index 5e008001..f1609de6 100644
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@@ -8,6 +8,6 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}
+        <a href="{% url 'index' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Password reset" %}
     </div>
 {% endblock %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index 26c1e282..d02d98e5 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -8,6 +8,6 @@ Copyright © 2019  Alexandre Iooss
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-        <a href="{% url 'index' %}">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}
+        <a href="{% url 'index' %}">{% trans "Home" %}</a> &rsaquo; {% trans "Password reset" %}
     </div>
 {% endblock %}
diff --git a/tickets/locale/fr/LC_MESSAGES/django.po b/tickets/locale/fr/LC_MESSAGES/django.po
new file mode 100644
index 00000000..1ccfe87f
--- /dev/null
+++ b/tickets/locale/fr/LC_MESSAGES/django.po
@@ -0,0 +1,300 @@
+# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+# se veut agnostique au réseau considéré, de manière à être installable en
+# quelques clics.
+#
+# Copyright © 2018 Maël Kervella
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
+"PO-Revision-Date: 2019-11-16 00:35+0100\n"
+"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: tickets/models.py:28
+msgid "Title of the ticket."
+msgstr "Titre du ticket."
+
+#: tickets/models.py:32
+msgid "Description of the ticket."
+msgstr "Description du ticket."
+
+#: tickets/models.py:38
+msgid "An email address to get back to you."
+msgstr "Une adresse mail pour vous recontacter."
+
+#: tickets/models.py:43
+msgid "Can view a ticket object"
+msgstr "Peut voir un objet ticket"
+
+#: tickets/models.py:44
+msgid "ticket"
+msgstr "ticket"
+
+#: tickets/models.py:45
+msgid "tickets"
+msgstr "tickets"
+
+#: tickets/models.py:49
+#, python-format
+msgid "Ticket from %(name)s. Date: %(date)s."
+msgstr "Ticket de %(name)s. Date : %(date)s."
+
+#: tickets/models.py:51
+#, python-format
+msgid "Anonymous ticket. Date: %s."
+msgstr "Ticket anonyme. Date : %s."
+
+#: tickets/models.py:82
+msgid "You don't have the right to view other tickets than yours."
+msgstr "Vous n'avez pas le droit de voir d'autres tickets que les vôtres."
+
+#: tickets/models.py:94
+msgid "You don't have the right to view the list of tickets."
+msgstr "Vous n'avez pas le droit de voir la liste des tickets."
+
+#: tickets/preferences/models.py:10
+msgid ""
+"Email address to publish the new tickets (leave empty for no publication)."
+msgstr ""
+"Adresse mail où publier les nouveaux tickets (laissez vide pour ne pas "
+"publier)."
+
+#: tickets/preferences/models.py:17
+msgid "French"
+msgstr "Français"
+
+#: tickets/preferences/models.py:17
+msgid "English"
+msgstr "Anglais"
+
+#: tickets/preferences/models.py:21
+msgid "tickets preferences"
+msgstr "préférences de tickets"
+
+#: tickets/templates/tickets/aff_ticket.html:30
+#: tickets/templates/tickets/contact.html:4
+#: tickets/templates/tickets/index.html:29
+#: tickets/templates/tickets/preferences.html:6
+#: tickets/templates/tickets/profil.html:6
+msgid "Tickets"
+msgstr "Tickets"
+
+#: tickets/templates/tickets/aff_ticket.html:34
+#, python-format
+msgid "Ticket #%(id)s"
+msgstr "Ticket #%(id)s"
+
+#: tickets/templates/tickets/aff_ticket.html:36
+#: tickets/templates/tickets/aff_tickets.html:58
+msgid "Solved"
+msgstr "Résolu"
+
+#: tickets/templates/tickets/aff_ticket.html:38
+msgid "Not solved"
+msgstr "Non résolu"
+
+#: tickets/templates/tickets/aff_ticket.html:44
+msgid "Opened by"
+msgstr "Ouvert par"
+
+#: tickets/templates/tickets/aff_ticket.html:50
+msgid "Anonymous user"
+msgstr "Utilisateur anonyme"
+
+#: tickets/templates/tickets/aff_ticket.html:54
+msgid "Response address: "
+msgstr "Adresse de réponse : "
+
+#: tickets/templates/tickets/aff_ticket.html:54
+msgid "Response to your ticket"
+msgstr "Réponse à votre ticket"
+
+#: tickets/templates/tickets/aff_ticket.html:59
+msgid "Title:"
+msgstr "Titre :"
+
+#: tickets/templates/tickets/aff_ticket.html:60
+msgid "Description:"
+msgstr "Description :"
+
+#: tickets/templates/tickets/aff_ticket.html:68
+msgid "Mark as solved"
+msgstr "Marquer comme résolu"
+
+#: tickets/templates/tickets/aff_ticket.html:71
+msgid "Mark as not solved"
+msgstr "Marquer comme non résolu"
+
+#: tickets/templates/tickets/aff_ticket.html:81
+msgid "All tickets"
+msgstr "Tous les tickets"
+
+#: tickets/templates/tickets/aff_tickets.html:35
+#: tickets/templates/tickets/form_preferences.html:30
+#: tickets/templates/tickets/form_ticket.html:31
+msgid "Ticket"
+msgid_plural "Tickets"
+msgstr[0] "Ticket"
+msgstr[1] "Tickets"
+
+#: tickets/templates/tickets/aff_tickets.html:38
+msgid "Ticket not solved"
+msgid_plural "Tickets not solved"
+msgstr[0] "Ticket non résolu"
+msgstr[1] "Tickets non résolus"
+
+#: tickets/templates/tickets/aff_tickets.html:41
+msgid "Last ticket:"
+msgstr "Dernier ticket :"
+
+#: tickets/templates/tickets/aff_tickets.html:55
+msgid "User"
+msgstr "Utilisateur"
+
+#: tickets/templates/tickets/aff_tickets.html:56
+msgid "Title"
+msgstr "Titre"
+
+#: tickets/templates/tickets/aff_tickets.html:57
+msgid "Date"
+msgstr "Date"
+
+#: tickets/templates/tickets/aff_tickets.html:70
+msgid "Anonymous"
+msgstr "Anonyme"
+
+#: tickets/templates/tickets/contact.html:8
+#, python-format
+msgid ""
+"If you are experiencing issues with the services offered by %(asso_name)s, "
+"you can open a ticket that will be taken care of. If you want to contact us "
+"on any other topic, please choose one address below."
+msgstr ""
+"Si vous rencontrez des problèmes avec les services proposés par "
+"%(asso_name)s, vous pouvez ouvrir un ticket qui sera pris en compte. Si vous "
+"voulez nous contacter pour n'importe quel autre sujet, veuillez choisir une "
+"adresse ci-dessous."
+
+#: tickets/templates/tickets/contact.html:10
+#: tickets/templates/tickets/navbar_logout.html:4
+#: tickets/templates/tickets/profil.html:12
+msgid "Open a ticket"
+msgstr "Ouvrir un ticket"
+
+#: tickets/templates/tickets/form_preferences.html:33
+msgid "Editing of tickets preferences"
+msgstr "Modification des préférences de tickets"
+
+#: tickets/templates/tickets/form_preferences.html:46
+#: tickets/templates/tickets/preferences.html:14
+msgid "Edit"
+msgstr "Modifier"
+
+#: tickets/templates/tickets/form_ticket.html:34
+msgid "Ticket opening"
+msgstr "Ouverture de ticket"
+
+#: tickets/templates/tickets/form_ticket.html:39 tickets/views.py:88
+msgid ""
+"You are not authenticated. Please log in or provide an email address so we "
+"can get back to you."
+msgstr ""
+"Vous n'êtes pas authentifié. Veuillez vous connecter ou fournir une adresse "
+"mail pour que nous puissions vous recontacter."
+
+#: tickets/templates/tickets/form_ticket.html:44
+msgid ""
+"Description of your problem. Please give as much information as possible to "
+"help us searching for a solution. Here is some information we might need:"
+msgstr ""
+"Description de votre problème. Veuillez donner le plus d'informations "
+"possible pour nous aider à chercher une solution. Voici quelques "
+"informations dont nous pourrions avoir besoin :"
+
+#: tickets/templates/tickets/form_ticket.html:47
+msgid "The type of your problem (membership, connection, payment etc.)."
+msgstr "Le type de votre problème (adhésion, connexion, paiement etc.)."
+
+#: tickets/templates/tickets/form_ticket.html:50
+msgid ""
+"The conditions in which you encounter the problem (Wi-Fi/wired connection, "
+"on every machines or only one, on a new machine etc.)."
+msgstr ""
+"Les conditions dans lesquelles vous rencontrez le problème (connexion Wi-Fi/"
+"filaire, sur toutes les machines ou une seule, sur une nouvelle machine "
+"etc.)."
+
+#: tickets/templates/tickets/form_ticket.html:53
+msgid ""
+"The locations where you encounter the problem (in your room, in a common "
+"space, in a specific building etc.)."
+msgstr ""
+"Les lieux où vous rencontrez le problème (dans votre chambre, dans un espace "
+"commun, dans un bâtiment en particulier etc.)."
+
+#: tickets/templates/tickets/form_ticket.html:56
+msgid "Open the ticket"
+msgstr "Ouvrir le ticket"
+
+#: tickets/templates/tickets/index.html:32
+msgid "List of tickets"
+msgstr "Liste des tickets"
+
+#: tickets/templates/tickets/navbar.html:2
+msgid "Manage the tickets"
+msgstr "Gérer les tickets"
+
+#: tickets/templates/tickets/preferences.html:21
+msgid "Publication email address"
+msgstr "Adresse mail de publication"
+
+#: tickets/templates/tickets/preferences.html:25
+msgid "No email address, the tickets will not be published."
+msgstr "Pas d'adresse mail, les tickets ne seront pas publiés."
+
+#: tickets/templates/tickets/preferences.html:29
+msgid "Email language"
+msgstr "Langue du mail"
+
+#: tickets/templates/tickets/profil.html:19
+msgid "No tickets"
+msgstr "Pas de tickets"
+
+#: tickets/views.py:69 tickets/views.py:80
+msgid ""
+"Your ticket has been succesfully opened. We will take care of it as soon as "
+"possible."
+msgstr ""
+"Votre ticket a bien été ouvert. Nous nous en occuperons dès que possible."
+
+#: tickets/views.py:125 tickets/views.py:175
+msgid "Never"
+msgstr "Jamais"
+
+#: tickets/views.py:152
+msgid "The tickets preferences were edited."
+msgstr "Les préférences de tickets ont été modifiées."
+
+#: tickets/views.py:155
+msgid "Invalid form."
+msgstr "Formulaire invalide."
diff --git a/tickets/migrations/0002_auto_20191120_0159.py b/tickets/migrations/0002_auto_20191120_0159.py
new file mode 100644
index 00000000..05ae5a68
--- /dev/null
+++ b/tickets/migrations/0002_auto_20191120_0159.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-11-20 00:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='preferences',
+            options={'verbose_name': 'tickets preferences'},
+        ),
+        migrations.AlterModelOptions(
+            name='ticket',
+            options={'permissions': (('view_tickets', 'Can view a ticket object'),), 'verbose_name': 'ticket', 'verbose_name_plural': 'tickets'},
+        ),
+        migrations.AlterField(
+            model_name='preferences',
+            name='mail_language',
+            field=models.IntegerField(choices=[(0, 'French'), (1, 'English')], default=0),
+        ),
+        migrations.AlterField(
+            model_name='preferences',
+            name='publish_address',
+            field=models.EmailField(help_text='Email address to publish the new tickets (leave empty for no publication).', max_length=1000, null=True),
+        ),
+        migrations.AlterField(
+            model_name='ticket',
+            name='description',
+            field=models.TextField(help_text='Description of the ticket.', max_length=3000),
+        ),
+        migrations.AlterField(
+            model_name='ticket',
+            name='email',
+            field=models.EmailField(help_text='An email address to get back to you.', max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='ticket',
+            name='title',
+            field=models.CharField(help_text='Title of the ticket.', max_length=255),
+        ),
+    ]
diff --git a/tickets/models.py b/tickets/models.py
index 5bc37856..3308c6db 100644
--- a/tickets/models.py
+++ b/tickets/models.py
@@ -25,30 +25,30 @@ class Ticket(AclMixin, models.Model):
         null=True,
     )
     title = models.CharField(
-        max_length=255, help_text=_("Title of the ticket"), blank=False, null=False
+        max_length=255, help_text=_("Title of the ticket."), blank=False, null=False
     )
     description = models.TextField(
         max_length=3000,
-        help_text=_("Description of the ticket"),
+        help_text=_("Description of the ticket."),
         blank=False,
         null=False,
     )
     date = models.DateTimeField(auto_now_add=True)
     email = models.EmailField(
-        help_text=_("An email address to get back to you"), max_length=100, null=True
+        help_text=_("An email address to get back to you."), max_length=100, null=True
     )
     solved = models.BooleanField(default=False)
 
     class Meta:
         permissions = (("view_tickets", _("Can view a ticket object")),)
-        verbose_name = _("Ticket")
-        verbose_name_plural = _("Tickets")
+        verbose_name = _("ticket")
+        verbose_name_plural = _("tickets")
 
     def __str__(self):
         if self.user:
-            return "Ticket from {}. Date: {}".format(self.user.surname, self.date)
+            return _("Ticket from %(name)s. Date: %(date)s.").format(name=self.user.surname, date=self.date)
         else:
-            return "Anonymous Ticket. Date: {}".format(self.date)
+            return _("Anonymous ticket. Date: %s.") % (self.date)
 
     def publish_mail(self):
         site_url = GeneralOption.objects.first().main_site_url
@@ -57,7 +57,7 @@ class Ticket(AclMixin, models.Model):
 
         lang = Preferences.objects.first().mail_language
         if lang == 0:
-            obj = "Nouvelle ouverture de ticket"
+            obj = "Nouveau ticket ouvert"
             template = loader.get_template("tickets/publication_mail_fr")
         else:
             obj = "New ticket opened"
diff --git a/tickets/preferences/models.py b/tickets/preferences/models.py
index 8add48bd..27922303 100644
--- a/tickets/preferences/models.py
+++ b/tickets/preferences/models.py
@@ -7,15 +7,15 @@ class Preferences(models.Model):
 
     publish_address = models.EmailField(
         help_text=_(
-            "Email address to publish the new tickets (leave empty for no publications)"
+            "Email address to publish the new tickets (leave empty for no publication)."
         ),
         max_length=1000,
         null=True,
     )
     LANG_FR = 0
     LANG_EN = 1
-    LANGUES = ((0, _("Français")), (1, _("English")))
+    LANGUES = ((0, _("French")), (1, _("English")))
     mail_language = models.IntegerField(choices=LANGUES, default=LANG_FR)
 
     class Meta:
-        verbose_name = _("Ticket's settings")
+        verbose_name = _("tickets preferences")
diff --git a/tickets/templates/tickets/aff_ticket.html b/tickets/templates/tickets/aff_ticket.html
index c5605863..b66ad1c5 100644
--- a/tickets/templates/tickets/aff_ticket.html
+++ b/tickets/templates/tickets/aff_ticket.html
@@ -31,11 +31,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
 
-<h2> Ticket #{{ticket.id}} 
+<h2>{% blocktrans with id=ticket.id %}Ticket #{{id}}{% endblocktrans %} 
 {% if ticket.solved %}
 <span class="badge badge-success">{% trans "Solved" %}</span>
 {% else %}
-<span class="badge badge-danger">{% trans "Not Solved" %}</span>
+<span class="badge badge-danger">{% trans "Not solved" %}</span>
 {% endif %}
 </h2>
 
@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {{ ticket.user.get_full_name }}
         </a>
     {% else %}
-        {% trans "Anonymous User" %}
+        {% trans "Anonymous user" %}
     {% endif %}
     {{ ticket.date | naturalday}}.
     {% if not ticket.user %}
@@ -57,7 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="panel-body">
 
     <p><b>{% trans "Title:" %}</b> {{ticket.title}}</p>
-    <p><b>{% trans "Description" %}</b> {{ ticket.description }}</p>
+    <p><b>{% trans "Description:" %}</b> {{ ticket.description }}</p>
     
 <div class="text-right">
 <form class="form" method="post">
@@ -65,9 +65,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% bootstrap_form changestatusform %}
 
     {% if not ticket.solved %}
-        {% bootstrap_button "Mark as Solved" button_type="submit" button_class='btn-info' %}
+        {% trans "Mark as solved" as tr_mark_solved %}
+        {% bootstrap_button tr_mark_solved button_type="submit" button_class='btn-info' %}
     {% else %}
-        {% bootstrap_button "Mark as not Solved" button_type="submit" button_class='btn-warning' %}
+        {% trans "Mark as not solved" as tr_mark_not_solved %}
+        {% bootstrap_button tr_mark_not_solved button_type="submit" button_class='btn-warning' %}
     {% endif %}
 </form>
 </div>
@@ -76,7 +78,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 <div class="text-right">
-    <a type="button" href="{% url 'tickets:aff-tickets' %}" class="btn btn-primary"><p>{% trans "Tous les tickets" %}</p></a>
+    <a type="button" href="{% url 'tickets:aff-tickets' %}" class="btn btn-primary"><p>{% trans "All tickets" %}</p></a>
 </div>
 
 {% endblock %}
diff --git a/tickets/templates/tickets/aff_tickets.html b/tickets/templates/tickets/aff_tickets.html
index 1f0c963e..218c6f0d 100644
--- a/tickets/templates/tickets/aff_tickets.html
+++ b/tickets/templates/tickets/aff_tickets.html
@@ -32,13 +32,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <hr class="col-sm-12">
   <div class="row justify-content-start">
     <div class="col-sm-4">
-      <span class="badge badge-light">{{ nbr_tickets }}</span> {% trans "Tickets" %}
+      <span class="badge badge-light">{{ nbr_tickets }}</span> {% blocktrans count nb=nbr_tickets %}Ticket{% plural %}Tickets{% endblocktrans %}
     </div>
     <div class="col-sm-4">
-      <span class="badge badge-light"> {{ nbr_tickets_unsolved }}</span>{% trans "Not Solved Tickets" %}
+      <span class="badge badge-light"> {{ nbr_tickets_unsolved }}</span> {% blocktrans count nb=nbr_tickets_unsolved %}Ticket not solved{% plural %}Tickets not solved{% endblocktrans %}
     </div>
     <div class="col-sm-4">
-      <span>{% trans "Last Ticket:" %} {{ last_ticket_date }}</span>
+      <span>{% trans "Last ticket:" %} {{ last_ticket_date }}</span>
     </div>
   </div>
 <hr class="col-sm-12">
@@ -52,10 +52,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <thead>
         <tr>
             <th scope="col"></th>
-            <th scope="col">User</th>
-            <th scope="col">Titre</th>
-            <th scope="col">Date</th>
-            <th scope="col">Résolu</th> 
+	    <th scope="col">{% trans "User" %}</th>
+	    <th scope="col">{% trans "Title" %}</th>
+	    <th scope="col">{% trans "Date" %}</th>
+	    <th scope="col">{% trans "Solved" %}</th> 
         </tr>
         {% for ticket in tickets_list %}
         <tr>
@@ -67,7 +67,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% if ticket.user %}
             <td><a href="{% url 'users:profil' ticket.user.id%}" role="button">{{ ticket.user.get_short_name }}</a></td>
             {% else %}
-            <td> Anonyme </td>
+	    <td>{% trans "Anonymous" %}</td>
             {% endif %}
             <td>{{ ticket.title }}</td>
             <td>{{ ticket.date }}</td>
diff --git a/tickets/templates/tickets/contact.html b/tickets/templates/tickets/contact.html
index 475af26d..f6c9561b 100644
--- a/tickets/templates/tickets/contact.html
+++ b/tickets/templates/tickets/contact.html
@@ -1,13 +1,13 @@
 {% load i18n %}
 
 <div class="panel panel-info">
-    <div class="panel-heading"><h4>Tickets</h4></div>
+	<div class="panel-heading"><h4>{% trans "Tickets" %}</h4></div>
     <div class="panel-body">
         <div class="row">
         <div class="col-sm-9">
         {% blocktrans %}If you are experiencing issues with the services offered by {{asso_name}}, you can open a ticket that will be taken care of. If you want to contact us on any other topic, please choose one address below.{% endblocktrans %}
 		</div>
-        <div class="col-sm-3"><a class="btn btn-primary" href="{% url 'tickets:new-ticket' %}"><i class="fa fa-ticket"></i> {% trans "Ouvrir un ticket" %}</a></div>
+        <div class="col-sm-3"><a class="btn btn-primary" href="{% url 'tickets:new-ticket' %}"><i class="fa fa-ticket"></i> {% trans "Open a ticket" %}</a></div>
     </div> 
     </div>
 </div>
diff --git a/tickets/templates/tickets/form_preferences.html b/tickets/templates/tickets/form_preferences.html
index d6521a8b..d5dd223b 100644
--- a/tickets/templates/tickets/form_preferences.html
+++ b/tickets/templates/tickets/form_preferences.html
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Ticket" %}{% endblock %}
 
 {% block content %}
-<h2> {% trans "Tickets settings modification" %}</h2>
+<h2> {% trans "Editing of tickets preferences" %}</h2>
 
 {% for message in messages %}
 <div class="{{ message| bootstrap_message_classes }} alert-dismissable">
@@ -43,6 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
         {% bootstrap_field preferencesform.publish_address %}
         {% bootstrap_field preferencesform.mail_language %}
-    {% bootstrap_button "Editer" button_type="submit" icon='ok' button_class='btn-success' %}
+    {% trans "Edit" as tr_edit %}
+    {% bootstrap_button tr_edit button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
 {% endblock %}
diff --git a/tickets/templates/tickets/form_ticket.html b/tickets/templates/tickets/form_ticket.html
index f4c90147..b05803bc 100644
--- a/tickets/templates/tickets/form_ticket.html
+++ b/tickets/templates/tickets/form_ticket.html
@@ -1,4 +1,4 @@
-{% extends 'machines/sidebar.html' %}
+{% extends 'users/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -31,28 +31,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Ticket" %}{% endblock %}
 
 {% block content %}
-<h2> Ouverture d'un Ticket </h2>
+<h2>{% trans "Ticket opening" %}</h2>
 
 <form class="form" method="post">
     {% csrf_token %}
     {% if not user.is_authenticated %}
-    <p>{% trans "Vous n'êtes pas authentifié. Veuillez fournir une adresse mail afin que nous puissions vous recontacter." %}</p>
+    <p>{% trans "You are not authenticated. Please log in or provide an email address so we can get back to you." %}</p>
         {% bootstrap_field ticketform.email %}
     {% endif %}
         {% bootstrap_field ticketform.title %}
         <br>
-        <p>{% trans "Description de votre problème. Veuillez fournir le plus d'informations possible afin de faciliter la recherche de solution. Voici quelques informations dont nous pourions avoir besoin:" %}</p>
+        <p>{% trans "Description of your problem. Please give as much information as possible to help us searching for a solution. Here is some information we might need:" %}</p>
         <ul class="list">
             <li>
-                <p> {% trans "Le type de votre problème (adhesion, connexion, paiement ou autre)." %}</p>
+                <p> {% trans "The type of your problem (membership, connection, payment etc.)." %}</p>
             </li>
             <li>
-                <p> {% trans "Les conditions dans lesquelles vous rencontrez le problème (Wifi/filaire, sur tout les apareils ou sur un seul. Est-ce une nouvelle machine ?" %}</p>
+                <p> {% trans "The conditions in which you encounter the problem (Wi-Fi/wired connection, on every machines or only one, on a new machine etc.)." %}</p>
             </li>
             <li>
-                <p> {% trans "Les endroits dans lequels le problème survient (chez vous, dans une partie commune, dans un batiment en particulier)." %}</p>
+                <p> {% trans "The locations where you encounter the problem (in your room, in a common space, in a specific building etc.)." %}</p>
         </ul>
         {% bootstrap_field ticketform.description %}
-    {% bootstrap_button "Ouvrir le Ticket" button_type="submit" icon='ok' button_class='btn-success' %}
+    {% trans "Open the ticket" as tr_open %}
+    {% bootstrap_button tr_open button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
 {% endblock %}
diff --git a/tickets/templates/tickets/index.html b/tickets/templates/tickets/index.html
index ba5730e6..80b11351 100644
--- a/tickets/templates/tickets/index.html
+++ b/tickets/templates/tickets/index.html
@@ -29,6 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title%}{% trans "Tickets" %}{% endblock %}
 
 {% block content %}
-	<h2>{% trans "Tickets" %}</h2>
+	<h2>{% trans "List of tickets" %}</h2>
 	{% include 'tickets/aff_tickets.html' with tickets_list=tickets_list %}
 {% endblock %}
diff --git a/tickets/templates/tickets/navbar.html b/tickets/templates/tickets/navbar.html
index 11473229..d344f822 100644
--- a/tickets/templates/tickets/navbar.html
+++ b/tickets/templates/tickets/navbar.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-<li><a href="{% url 'tickets:aff-tickets' %}"><i class="fa fa-ticket"></i> {% trans "Tickets" %}</a></li>
+<li><a href="{% url 'tickets:aff-tickets' %}"><i class="fa fa-ticket"></i> {% trans "Manage the tickets" %}</a></li>
diff --git a/tickets/templates/tickets/navbar_logout.html b/tickets/templates/tickets/navbar_logout.html
index 8a7114f3..7c4dcd20 100644
--- a/tickets/templates/tickets/navbar_logout.html
+++ b/tickets/templates/tickets/navbar_logout.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <li>
     <a href="{% url 'tickets:new-ticket' %}">
-        <i class="fa fa-ticket"></i> {% trans "Ouvrir un ticket" %}
+        <i class="fa fa-ticket"></i> {% trans "Open a ticket" %}
     </a>
 </li>
diff --git a/tickets/templates/tickets/preferences.html b/tickets/templates/tickets/preferences.html
index 60cbfac6..df51f3e1 100644
--- a/tickets/templates/tickets/preferences.html
+++ b/tickets/templates/tickets/preferences.html
@@ -18,11 +18,11 @@
         <div class="table-responsive">
         <table class="table">
 			<tr>
-                <th><p>{% trans "Publication email address"%}</p></th>
+                <th><p>{% trans "Publication email address" %}</p></th>
                 {% if preferences.publish_address %}
 			        <td><p>{{ preferences.publish_address }}</p></td>
                 {% else %}
-                    <td><p>{% trans "Pas d'adresse, les tickets ne sont pas annoncés" %}</p></td>
+                    <td><p>{% trans "No email address, the tickets will not be published." %}</p></td>
                 {% endif %}
 			</tr>
             <tr>
diff --git a/tickets/templates/tickets/profil.html b/tickets/templates/tickets/profil.html
index 06b727a4..05d03ccf 100644
--- a/tickets/templates/tickets/profil.html
+++ b/tickets/templates/tickets/profil.html
@@ -3,13 +3,13 @@
 <div class="panel panel-default">
     <div class="panel-heading clearfix profil" data-parent="#accordion" data-toggle="collapse" data-target="#ticket">
         <h3 class="panel-title pull-left">
-            <i class="fa fa-ticket"></i>{% trans " Tickets" %}
+            <i class="fa fa-ticket"></i> {% trans "Tickets" %}
         </h3> 
     </div>
     <div id="ticket" class="panel-collapse collapse">
         <div class="panel-body">
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'tickets:new-ticket' %}">
-            <i class="fa fa-ticket"></i>{% trans " Open a Ticket" %}
+            <i class="fa fa-ticket"></i> {% trans "Open a ticket" %}
         </a>
         </div>
         <div class="panel-body">
diff --git a/tickets/templates/tickets/publication_mail_en b/tickets/templates/tickets/publication_mail_en
index 969ed1f9..5224a80b 100644
--- a/tickets/templates/tickets/publication_mail_en
+++ b/tickets/templates/tickets/publication_mail_en
@@ -1,5 +1,5 @@
 {% if ticket.user %} {{ ticket.user.get_full_name }} opened a ticket.
-Profil: {{site_url}}{% url 'users:profil' ticket.user.id%}
+Profile: {{site_url}}{% url 'users:profil' ticket.user.id%}
 Answer to the address: {{ticket.user.get_mail}}.
 
 {% else %}  
diff --git a/tickets/templates/tickets/publication_mail_fr b/tickets/templates/tickets/publication_mail_fr
index 1f3752be..ef1099da 100644
--- a/tickets/templates/tickets/publication_mail_fr
+++ b/tickets/templates/tickets/publication_mail_fr
@@ -1,12 +1,12 @@
-{% if ticket.user %} {{ ticket.user.get_full_name }} à ouvert un ticket.
-Profile: {{site_url}}{% url 'users:profil' ticket.user.id%}
-Répondre à l'adresse: {{ticket.user.get_mail}}.
+{% if ticket.user %} {{ ticket.user.get_full_name }} a ouvert un ticket.
+Profil : {{site_url}}{% url 'users:profil' ticket.user.id%}
+Répondre à l'adresse : {{ticket.user.get_mail}}.
 
 {% else %} 
-Un utilisateur anonyme (non connecté) à ouvert un ticket.
-Répondre à l'adresse: {{ticket.email}}.
+Un utilisateur anonyme (non connecté) a ouvert un ticket.
+Répondre à l'adresse : {{ticket.email}}.
 {% endif %}
 
-Titre: {{ticket.title}}
+Titre : {{ticket.title}}
 
-Description: {{ticket.description}}
+Description : {{ticket.description}}
diff --git a/tickets/views.py b/tickets/views.py
index 04ecee6d..d330719a 100644
--- a/tickets/views.py
+++ b/tickets/views.py
@@ -66,7 +66,7 @@ def new_ticket(request):
                 messages.success(
                     request,
                     _(
-                        "Your ticket has been succesfully open. We will take care of it as soon as possible."
+                        "Your ticket has been succesfully opened. We will take care of it as soon as possible."
                     ),
                 )
                 return redirect(
@@ -77,7 +77,7 @@ def new_ticket(request):
                 messages.success(
                     request,
                     _(
-                        "Your ticket has been succesfully open. We will take care of it as soon as possible."
+                        "Your ticket has been succesfully opened. We will take care of it as soon as possible."
                     ),
                 )
                 return redirect(reverse("index"))
@@ -85,7 +85,7 @@ def new_ticket(request):
                 messages.error(
                     request,
                     _(
-                        "You are not authenticated. Please login or provide an email address so we can get back to you."
+                        "You are not authenticated. Please log in or provide an email address so we can get back to you."
                     ),
                 )
                 return form(
@@ -149,10 +149,10 @@ def edit_preferences(request):
     if preferencesform.is_valid():
         if preferencesform.changed_data:
             preferencesform.save()
-            messages.success(request, "Préférences des Tickets mises à jour")
+            messages.success(request, _("The tickets preferences were edited."))
             return redirect(reverse("preferences:display-options"))
         else:
-            messages.error(request, "Formulaire Invalide")
+            messages.error(request, _("Invalid form."))
             return form(
                 {"preferencesform": preferencesform},
                 "tickets/form_preferences.html",
diff --git a/topologie/acl.py b/topologie/acl.py
index c0a37084..d1aa6a0d 100644
--- a/topologie/acl.py
+++ b/topologie/acl.py
@@ -41,6 +41,6 @@ def can_view(user):
     can = user.has_module_perms("topologie")
     return (
         can,
-        None if can else _("You don't have the right to view this" " application."),
+        None if can else _("You don't have the right to view this application."),
         ("topologie",),
     )
diff --git a/topologie/locale/fr/LC_MESSAGES/django.po b/topologie/locale/fr/LC_MESSAGES/django.po
index 23172f31..ef0afb98 100644
--- a/topologie/locale/fr/LC_MESSAGES/django.po
+++ b/topologie/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-20 01:24+0100\n"
 "PO-Revision-Date: 2018-06-25 14:53+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,268 +30,268 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: topologie/acl.py:42
+#: topologie/acl.py:44
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: topologie/forms.py:183
+#: topologie/forms.py:202
 msgid "Start:"
 msgstr "Début :"
 
-#: topologie/forms.py:184
+#: topologie/forms.py:203
 msgid "End:"
 msgstr "Fin :"
 
-#: topologie/models.py:75
+#: topologie/models.py:70
 msgid "Can view a stack object"
 msgstr "Peut voir un objet pile"
 
-#: topologie/models.py:77
+#: topologie/models.py:71
 msgid "switches stack"
 msgstr "pile de commutateurs réseau"
 
-#: topologie/models.py:78
+#: topologie/models.py:72
 msgid "switches stacks"
 msgstr "piles de commutateurs réseau"
 
-#: topologie/models.py:93
+#: topologie/models.py:87
 msgid "The maximum ID is less than the minimum ID."
 msgstr "L'ID maximum est inférieur l'ID minimum."
 
-#: topologie/models.py:106
-msgid "Details about the AP's location"
-msgstr "Détails sur l'emplacement du point d'accès sans fil"
+#: topologie/models.py:99
+msgid "Details about the AP's location."
+msgstr "Détails sur l'emplacement du point d'accès sans fil."
 
-#: topologie/models.py:113
+#: topologie/models.py:105
 msgid "Can view an access point object"
 msgstr "Peut voir un objet point d'accès sans fil"
 
-#: topologie/models.py:115
+#: topologie/models.py:106 topologie/views.py:664 topologie/views.py:716
 msgid "access point"
 msgstr "point d'accès sans fil"
 
-#: topologie/models.py:116
+#: topologie/models.py:107
 msgid "access points"
 msgstr "points d'accès sans fil"
 
-#: topologie/models.py:212
-msgid "Number of ports"
-msgstr "Nombre de ports"
+#: topologie/models.py:190
+msgid "Number of ports."
+msgstr "Nombre de ports."
 
-#: topologie/models.py:229 topologie/templates/topologie/aff_switch.html:48
-#: topologie/templates/topologie/index_p.html:38 topologie/views.py:860
-msgid "Switch model"
-msgstr "Modèle de commutateur réseau"
+#: topologie/models.py:200
+msgid "Switch model."
+msgstr "Modèle de commutateur réseau."
 
-#: topologie/models.py:242
-msgid "RADIUS key of the switch"
-msgstr "Clé RADIUS du commutateur réseau"
+#: topologie/models.py:210
+msgid "RADIUS key of the switch."
+msgstr "Clé RADIUS du commutateur réseau."
 
-#: topologie/models.py:249
-msgid "Management credentials for the switch"
-msgstr "Identifiants de gestion du commutateur réseau"
+#: topologie/models.py:217
+msgid "Management credentials for the switch."
+msgstr "Identifiants de gestion du commutateur réseau."
 
-#: topologie/models.py:253
-msgid "Automatic provision for the switch"
-msgstr "Provision automatique pour le commutateur réseau"
+#: topologie/models.py:220
+msgid "Automatic provision for the switch."
+msgstr "Provision automatique pour le commutateur réseau."
 
-#: topologie/models.py:260
+#: topologie/models.py:225
 msgid "Can view a switch object"
 msgstr "Peut voir un objet commutateur réseau"
 
-#: topologie/models.py:262
+#: topologie/models.py:226 topologie/views.py:542 topologie/views.py:615
 msgid "switch"
 msgstr "commutateur réseau"
 
-#: topologie/models.py:263
+#: topologie/models.py:227
 msgid "switches"
 msgstr "commutateurs réseau"
 
-#: topologie/models.py:274
+#: topologie/models.py:241
 msgid "The switch ID exceeds the limits allowed by the stack."
 msgstr "L'ID du commutateur réseau dépasse les bornes autorisées par la pile."
 
-#: topologie/models.py:279
+#: topologie/models.py:248
 msgid "The stack member ID can't be void."
 msgstr "L'ID de membre dans la pile ne peut-être vide."
 
-#: topologie/models.py:287
+#: topologie/models.py:255
 msgid "The end port is less than the start port."
 msgstr "Le port de fin est inférieur au port de début."
 
-#: topologie/models.py:294
+#: topologie/models.py:263
 msgid "This switch can't have that many ports."
 msgstr "Ce commutateur réseau ne peut pas avoir autant de ports."
 
-#: topologie/models.py:296
-msgid "Creation"
-msgstr "Création"
-
-#: topologie/models.py:459
+#: topologie/models.py:471
 msgid "The switch model is modular."
 msgstr "Le modèle de commutateur réseau est modulaire."
 
-#: topologie/models.py:463
+#: topologie/models.py:474
 msgid "The switch is considered as a module."
 msgstr "Le commutateur réseau est considéré comme un module."
 
-#: topologie/models.py:468
+#: topologie/models.py:478
 msgid "Can view a switch model object"
 msgstr "Peut voir un objet modèle de commutateur réseau"
 
-#: topologie/models.py:470
+#: topologie/models.py:479 topologie/views.py:832
 msgid "switch model"
 msgstr "modèle de commutateur réseau"
 
-#: topologie/models.py:471
+#: topologie/models.py:480
 msgid "switch models"
 msgstr "modèles de commutateur réseau"
 
-#: topologie/models.py:484
-msgid "Reference of a module"
-msgstr "Référence d'un module"
+#: topologie/models.py:494
+msgid "Reference of a module."
+msgstr "Référence d'un module."
 
-#: topologie/models.py:485
-msgid "Module reference"
-msgstr "Référence de module"
+#: topologie/models.py:495
+msgid "module reference"
+msgstr "référence de module"
 
-#: topologie/models.py:491 topologie/models.py:492
-#: topologie/templates/topologie/aff_modules.html:37
-msgid "Comment"
-msgstr "Commentaire"
+#: topologie/models.py:501
+msgid "Comment."
+msgstr "Commentaire."
 
-#: topologie/models.py:497
+#: topologie/models.py:502
+msgid "comment"
+msgstr "commentaire"
+
+#: topologie/models.py:506
 msgid "Can view a switch module object"
 msgstr "Peut voir un objet module de commutateur réseau"
 
-#: topologie/models.py:499
+#: topologie/models.py:507
 msgid "switch module"
 msgstr "module de commutateur réseau"
 
-#: topologie/models.py:500
+#: topologie/models.py:508
 msgid "switch modules"
 msgstr "modules de commutateur réseau"
 
-#: topologie/models.py:513
-msgid "Slot on switch"
-msgstr "Emplacement sur le commutateur réseau"
+#: topologie/models.py:520
+msgid "Slot on switch."
+msgstr "Emplacement sur le commutateur réseau."
 
-#: topologie/models.py:514 topologie/templates/topologie/aff_modules.html:48
-#: topologie/templates/topologie/aff_modules.html:82
-msgid "Slot"
-msgstr "Emplacement"
+#: topologie/models.py:520
+msgid "slot"
+msgstr "emplacement "
 
-#: topologie/models.py:519
+#: topologie/models.py:527
 msgid "Can view a link between switch and module object"
 msgstr "Peut voir un objet lien entre commutateur réseau et module"
 
-#: topologie/models.py:522
+#: topologie/models.py:530
 msgid "link between switch and module"
 msgstr "lien entre commutateur réseau et module"
 
-#: topologie/models.py:523
+#: topologie/models.py:531
 msgid "links between switch and module"
 msgstr "liens entre commutateur réseau et module"
 
-#: topologie/models.py:527
-msgid "On slot "
-msgstr "Sur l'emplacement "
+#: topologie/models.py:535
+#, python-format
+msgid "On slot %(slot)s of %(switch)s"
+msgstr "Sur l'emplacement %(slot)s de %(switch)s"
 
-#: topologie/models.py:527
-msgid " of "
-msgstr " de "
-
-#: topologie/models.py:537
+#: topologie/models.py:545
 msgid "Can view a switch constructor object"
 msgstr "Peut voir un objet constructeur de commutateur réseau"
 
-#: topologie/models.py:540
+#: topologie/models.py:547 topologie/views.py:1079
 msgid "switch constructor"
 msgstr "constructeur de commutateur réseau"
 
-#: topologie/models.py:563
+#: topologie/models.py:548
+msgid "switch constructors"
+msgstr "constructeurs de commutateur réseau"
+
+#: topologie/models.py:562
 msgid "Can view a switch bay object"
 msgstr "Peut voir un objet baie de brassage"
 
-#: topologie/models.py:565
+#: topologie/models.py:563 topologie/views.py:892
 msgid "switch bay"
 msgstr "baie de brassage"
 
-#: topologie/models.py:566
+#: topologie/models.py:564
 msgid "switch bays"
 msgstr "baies de brassage"
 
-#: topologie/models.py:581
-#, fuzzy
-#| msgid "Can view a port object"
+#: topologie/models.py:577
 msgid "Can view a dormitory object"
-msgstr "Peut voir un objet port"
+msgstr "Peut voir un objet résidence"
 
-#: topologie/models.py:583
+#: topologie/models.py:578 topologie/views.py:1016
 msgid "dormitory"
-msgstr ""
+msgstr "résidence"
 
-#: topologie/models.py:584
+#: topologie/models.py:579
 msgid "dormitories"
-msgstr ""
+msgstr "résidences"
 
-#: topologie/models.py:614
+#: topologie/models.py:605
 msgid "Can view a building object"
 msgstr "Peut voir un objet bâtiment"
 
-#: topologie/models.py:616
+#: topologie/models.py:606 topologie/views.py:953
 msgid "building"
 msgstr "bâtiment"
 
-#: topologie/models.py:617
+#: topologie/models.py:607
 msgid "buildings"
 msgstr "bâtiments"
 
-#: topologie/models.py:686 topologie/models.py:687
-msgid "Port state Active"
-msgstr "État du port Actif"
+#: topologie/models.py:658
+msgid "Port state Active."
+msgstr "État du port Actif."
 
-#: topologie/models.py:694
+#: topologie/models.py:659
+msgid "port state Active"
+msgstr "état du port Actif"
+
+#: topologie/models.py:665
 msgid "Can view a port object"
 msgstr "Peut voir un objet port"
 
-#: topologie/models.py:696
+#: topologie/models.py:666
 msgid "port"
 msgstr "port"
 
-#: topologie/models.py:697
+#: topologie/models.py:667
 msgid "ports"
 msgstr "ports"
 
-#: topologie/models.py:703
+#: topologie/models.py:673
 msgid "Uplink: "
 msgstr "Liaison montante : "
 
-#: topologie/models.py:705
+#: topologie/models.py:675
 msgid "Machine: "
 msgstr "Machine : "
 
-#: topologie/models.py:707
+#: topologie/models.py:677
 msgid "Room: "
 msgstr "Chambre : "
 
-#: topologie/models.py:709
+#: topologie/models.py:679
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: topologie/models.py:769
+#: topologie/models.py:740
 msgid "The port can't exist, its number is too great."
 msgstr "Le port ne peut pas exister, son numéro est trop grand."
 
-#: topologie/models.py:775
+#: topologie/models.py:751
 msgid "Room, interface and related port are mutually exclusive."
 msgstr "Chambre, interface et port relié sont mutuellement exclusifs."
 
-#: topologie/models.py:778
+#: topologie/models.py:754
 msgid "A port can't be related to itself."
 msgstr "Un port ne peut être relié à lui-même."
 
-#: topologie/models.py:782
+#: topologie/models.py:759
 msgid ""
 "The related port is already used, please clear it before creating the "
 "relation."
@@ -299,156 +299,155 @@ msgstr ""
 "Le port relié est déjà utilisé, veuillez le modifier avant de créer la "
 "relation."
 
-#: topologie/models.py:807
+#: topologie/models.py:781
 msgid "Can view a room object"
 msgstr "Peut voir un objet chambre"
 
-#: topologie/models.py:809
+#: topologie/models.py:782 topologie/views.py:773
 msgid "room"
 msgstr "chambre"
 
-#: topologie/models.py:810
+#: topologie/models.py:783
 msgid "rooms"
 msgstr "chambres"
 
-#: topologie/models.py:822
+#: topologie/models.py:793
 msgid "MAC-RADIUS"
 msgstr "MAC-RADIUS"
 
-#: topologie/models.py:839 topologie/templates/topologie/aff_chambres.html:36
-#: topologie/templates/topologie/aff_port.html:38 topologie/views.py:801
+#: topologie/models.py:806 topologie/templates/topologie/aff_chambres.html:36
+#: topologie/templates/topologie/aff_port.html:38
 msgid "Room"
 msgstr "Chambre"
 
-#: topologie/models.py:840 topologie/templates/topologie/aff_ap.html:36
+#: topologie/models.py:807 topologie/templates/topologie/aff_ap.html:36
 msgid "Access point"
 msgstr "Point d'accès sans fil"
 
-#: topologie/models.py:841
+#: topologie/models.py:808
 msgid "Uplink"
 msgstr "Liaison montante"
 
-#: topologie/models.py:842
+#: topologie/models.py:809
 msgid "Organisation machine"
 msgstr "Machine d'association"
 
-#: topologie/models.py:843
+#: topologie/models.py:810
 msgid "Nothing"
 msgstr "Rien"
 
-#: topologie/models.py:845
-#: topologie/templates/topologie/aff_port_profile.html:37
-#: topologie/templates/topologie/aff_vlanoptions.html:34
-msgid "Name"
-msgstr "Nom"
+#: topologie/models.py:812
+msgid "name"
+msgstr "nom"
 
-#: topologie/models.py:851
-msgid "Default profile"
-msgstr "Profil par défaut"
+#: topologie/models.py:818
+msgid "default profile"
+msgstr "profil par défaut"
 
-#: topologie/models.py:859
-msgid "Profil on dormitory"
-msgstr ""
+#: topologie/models.py:826
+msgid "profile on dormitory"
+msgstr "profil sur la résidence"
 
-#: topologie/models.py:867
+#: topologie/models.py:834
 msgid "VLAN untagged"
 msgstr "VLAN untagged"
 
-#: topologie/models.py:873
+#: topologie/models.py:840
 msgid "VLAN(s) tagged"
 msgstr "VLAN(s) tagged"
 
-#: topologie/models.py:878
-msgid "Type of RADIUS authentication : inactive, MAC-address or 802.1X"
-msgstr "Type d'authentification RADIUS : inactive, MAC-address ou 802.1X"
+#: topologie/models.py:846
+msgid "Type of RADIUS authentication: inactive, MAC-address or 802.1X."
+msgstr "Type d'authentification RADIUS : inactive, MAC-address ou 802.1X."
 
-#: topologie/models.py:880
+#: topologie/models.py:848
 msgid "RADIUS type"
 msgstr "Type de RADIUS"
 
-#: topologie/models.py:886
-msgid "In case of MAC-authentication : mode COMMON or STRICT on this port"
+#: topologie/models.py:855
+msgid "In case of MAC-authentication: mode COMMON or STRICT on this port."
 msgstr ""
 "Dans le cas d'authentification par adresse MAC : mode COMMON ou STRICT sur "
-"ce port"
+"ce port."
 
-#: topologie/models.py:888
+#: topologie/models.py:857
 msgid "RADIUS mode"
 msgstr "Mode de RADIUS"
 
-#: topologie/models.py:894
-msgid "Port speed limit"
-msgstr "Limite de vitesse du port"
+#: topologie/models.py:860
+msgid "Port speed limit."
+msgstr "Limite de vitesse du port."
 
-#: topologie/models.py:899
-msgid "Limit of MAC-address on this port"
-msgstr "Limite de MAC-address sur ce port"
+#: topologie/models.py:865
+msgid "Limit of MAC-address on this port."
+msgstr "Limite de MAC-address sur ce port."
 
-#: topologie/models.py:900
+#: topologie/models.py:866
 msgid "MAC limit"
 msgstr "Limite MAC"
 
-#: topologie/models.py:904
-msgid "Flow control"
-msgstr "Contrôle du flux"
+#: topologie/models.py:868
+msgid "Flow control."
+msgstr "Contrôle du flux."
 
-#: topologie/models.py:908
-msgid "Protect against rogue DHCP"
-msgstr "Protège contre les DHCP pirates"
+#: topologie/models.py:871
+msgid "Protect against rogue DHCP."
+msgstr "Protège contre les DHCP pirates."
 
-#: topologie/models.py:909
+#: topologie/models.py:872
 #: topologie/templates/topologie/aff_vlanoptions.html:36
 msgid "DHCP snooping"
 msgstr "DHCP snooping"
 
-#: topologie/models.py:913
-msgid "Protect against rogue DHCPv6"
-msgstr "Protège contre les DHCPv6 pirates"
+#: topologie/models.py:876
+msgid "Protect against rogue DHCPv6."
+msgstr "Protège contre les DHCPv6 pirates."
 
-#: topologie/models.py:914
+#: topologie/models.py:877
 #: topologie/templates/topologie/aff_vlanoptions.html:37
 msgid "DHCPv6 snooping"
 msgstr "DHCPv6 snooping"
 
-#: topologie/models.py:918
-msgid "Check if IP adress is DHCP assigned"
-msgstr "Vérifie si l'adresse IP est attribuée par DHCP"
+#: topologie/models.py:881
+msgid "Check if IP address is DHCP assigned."
+msgstr "Vérifie si l'adresse IP est attribuée par DHCP."
 
-#: topologie/models.py:919
+#: topologie/models.py:882
 msgid "ARP protection"
 msgstr "Protection ARP"
 
-#: topologie/models.py:923
-msgid "Protect against rogue RA"
-msgstr "Protège contre les RA pirates"
+#: topologie/models.py:886
+msgid "Protect against rogue RA."
+msgstr "Protège contre les RA pirates."
 
-#: topologie/models.py:924
+#: topologie/models.py:887
 msgid "RA guard"
 msgstr "RA guard"
 
-#: topologie/models.py:928
-msgid "Protect against loop"
-msgstr "Protège contre une boucle"
+#: topologie/models.py:891
+msgid "Protect against loop."
+msgstr "Protège contre une boucle."
 
-#: topologie/models.py:929
-msgid "Loop protection"
-msgstr "Protection contre une boucle"
+#: topologie/models.py:892
+msgid "loop protection"
+msgstr "protection contre une boucle"
 
-#: topologie/models.py:934
+#: topologie/models.py:896
 msgid "Can view a port profile object"
 msgstr "Peut voir un objet profil de port"
 
-#: topologie/models.py:936
+#: topologie/models.py:897 topologie/views.py:1130
 msgid "port profile"
 msgstr "profil de port"
 
-#: topologie/models.py:937
+#: topologie/models.py:898
 msgid "port profiles"
 msgstr "profils de port"
 
-#: topologie/models.py:966
-msgid "A default profile for all dormitory of that type already exists."
+#: topologie/models.py:936
+msgid "A default profile for all dormitories of that type already exists."
 msgstr ""
+"Un profil par défaut pour toutes les résidences de ce type existe déjà. "
 
 #: topologie/templates/topologie/aff_ap.html:38
 msgid "MAC address"
@@ -474,8 +473,7 @@ msgstr "Emplacement"
 
 #: topologie/templates/topologie/aff_building.html:36
 #: topologie/templates/topologie/aff_chambres.html:37
-#: topologie/templates/topologie/aff_dormitory.html:38
-#: topologie/templates/topologie/aff_switch_bay.html:38 topologie/views.py:973
+#: topologie/templates/topologie/aff_switch_bay.html:38
 msgid "Building"
 msgstr "Bâtiment"
 
@@ -487,13 +485,17 @@ msgstr "Points d'accès sans fil"
 
 #: topologie/templates/topologie/aff_constructor_switch.html:36
 #: topologie/templates/topologie/aff_model_switch.html:40
-#: topologie/views.py:1091
 msgid "Switch constructor"
 msgstr "Constructeur de commutateur réseau"
 
-#: topologie/templates/topologie/aff_dormitory.html:36 topologie/views.py:1031
+#: topologie/templates/topologie/aff_dormitory.html:36
 msgid "Dormitory"
-msgstr ""
+msgstr "Résidence"
+
+#: topologie/templates/topologie/aff_dormitory.html:38
+#: topologie/templates/topologie/index_physical_grouping.html:50
+msgid "Buildings"
+msgstr "Bâtiments"
 
 #: topologie/templates/topologie/aff_model_switch.html:36
 #: topologie/templates/topologie/aff_modules.html:36
@@ -505,6 +507,10 @@ msgstr "Référence"
 msgid "Commercial name"
 msgstr "Nom commercial"
 
+#: topologie/templates/topologie/aff_model_switch.html:39
+msgid "Firmware"
+msgstr "Micrologiciel"
+
 #: topologie/templates/topologie/aff_model_switch.html:42
 #: topologie/templates/topologie/aff_modules.html:38
 #: topologie/templates/topologie/index.html:66
@@ -512,6 +518,15 @@ msgstr "Nom commercial"
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
+#: topologie/templates/topologie/aff_modules.html:37
+msgid "Comment"
+msgstr "Commentaire"
+
+#: topologie/templates/topologie/aff_modules.html:48
+#: topologie/templates/topologie/aff_modules.html:82
+msgid "Slot"
+msgstr "Emplacement"
+
 #: topologie/templates/topologie/aff_modules.html:48
 msgid "of"
 msgstr "de"
@@ -541,7 +556,7 @@ msgstr "Port relié"
 msgid "Port state"
 msgstr "État du port"
 
-#: topologie/templates/topologie/aff_port.html:45 topologie/views.py:1143
+#: topologie/templates/topologie/aff_port.html:45
 msgid "Port profile"
 msgstr "Profil de port"
 
@@ -557,10 +572,13 @@ msgstr "Désactivé"
 msgid "Default: "
 msgstr "Par défaut : "
 
+#: topologie/templates/topologie/aff_port_profile.html:37
+#: topologie/templates/topologie/aff_vlanoptions.html:34
+msgid "Name"
+msgstr "Nom"
+
 #: topologie/templates/topologie/aff_port_profile.html:38
-#, fuzzy
-#| msgid "Default for"
-msgid "Default for and place"
+msgid "Default for"
 msgstr "Par défaut pour"
 
 #: topologie/templates/topologie/aff_port_profile.html:39
@@ -583,6 +601,15 @@ msgstr "Limite d'adresse MAC"
 msgid "Security"
 msgstr "Sécurité"
 
+#: topologie/templates/topologie/aff_port_profile.html:50
+#, python-format
+msgid " on %(dorm)s"
+msgstr " sur %(dorm)s"
+
+#: topologie/templates/topologie/aff_port_profile.html:50
+msgid "Everywhere"
+msgstr "Partout"
+
 #: topologie/templates/topologie/aff_port_profile.html:53
 msgid "Untagged: "
 msgstr "Untagged :"
@@ -627,7 +654,7 @@ msgstr "Nom DNS"
 
 #: topologie/templates/topologie/aff_switch.html:41
 #: topologie/templates/topologie/aff_switch_bay.html:36
-#: topologie/templates/topologie/index_p.html:37 topologie/views.py:915
+#: topologie/templates/topologie/index_p.html:37
 msgid "Switch bay"
 msgstr "Baie de brassage"
 
@@ -636,9 +663,13 @@ msgid "Ports"
 msgstr "Ports"
 
 #: topologie/templates/topologie/aff_switch.html:47
-#: topologie/templates/topologie/edit_stack_sw.html:33
-msgid "Stack ID"
-msgstr "ID de la pile"
+msgid "Stack member ID"
+msgstr "ID de membre dans la pile"
+
+#: topologie/templates/topologie/aff_switch.html:48
+#: topologie/templates/topologie/index_p.html:38
+msgid "Switch model"
+msgstr "Modèle de commutateur réseau"
 
 #: topologie/templates/topologie/aff_switch.html:76
 msgid "Creation of ports"
@@ -689,36 +720,42 @@ msgstr ""
 "( %(objet)s ) ?"
 
 #: topologie/templates/topologie/delete.html:36
+#: topologie/templates/topologie/switch.html:46
+#: topologie/templates/topologie/topo_more.html:59
 msgid "Confirm"
 msgstr "Confirmer"
 
+#: topologie/templates/topologie/edit_stack_sw.html:33
+msgid "Stack ID"
+msgstr "ID de la pile"
+
 #: topologie/templates/topologie/index.html:55
 msgid "Topology of the switches"
 msgstr "Topologie des commutateurs réseau"
 
 #: topologie/templates/topologie/index.html:68
-msgid " Add a switch"
-msgstr " Ajouter un commutateur réseau"
+msgid "Add a switch"
+msgstr "Ajouter un commutateur réseau"
 
 #: topologie/templates/topologie/index_ap.html:35
-msgid " Add an access point"
-msgstr " Ajouter un point d'accès sans fil"
+msgid "Add an access point"
+msgstr "Ajouter un point d'accès sans fil"
 
 #: topologie/templates/topologie/index_model_switch.html:33
 msgid "Switch models"
 msgstr "Modèles de commutateur réseau"
 
 #: topologie/templates/topologie/index_model_switch.html:36
-msgid " Add a switch model"
-msgstr " Ajouter un modèle de commutateur réseau"
+msgid "Add a switch model"
+msgstr "Ajouter un modèle de commutateur réseau"
 
 #: topologie/templates/topologie/index_model_switch.html:42
 msgid "Switch constructors"
 msgstr "Constructeurs de commutateur réseau"
 
 #: topologie/templates/topologie/index_model_switch.html:45
-msgid " Add a switch constructor"
-msgstr " Ajouter un constructeur de commutateur réseau"
+msgid "Add a switch constructor"
+msgstr "Ajouter un constructeur de commutateur réseau"
 
 #: topologie/templates/topologie/index_module.html:33
 #: topologie/templates/topologie/sidebar.html:39
@@ -726,46 +763,48 @@ msgid "Switch modules"
 msgstr "Modules de commutateur réseau"
 
 #: topologie/templates/topologie/index_module.html:35
-msgid " Add a module"
-msgstr " Ajouter un module"
+msgid "Add a module"
+msgstr "Ajouter un module"
 
 #: topologie/templates/topologie/index_p.html:33
 msgid "Switch:"
 msgstr "Commutateur réseau :"
 
+#: topologie/templates/topologie/index_p.html:51
+msgid "Add a port"
+msgstr "Ajouter un port"
+
+#: topologie/templates/topologie/index_p.html:52
+msgid "Add ports to the port list"
+msgstr "Ajouter des ports à la liste des ports"
+
 #: topologie/templates/topologie/index_physical_grouping.html:33
 msgid "Stacks"
 msgstr "Piles"
 
 #: topologie/templates/topologie/index_physical_grouping.html:36
-msgid " Add a stack"
-msgstr " Ajouter une pile"
+msgid "Add a stack"
+msgstr "Ajouter une pile"
 
 #: topologie/templates/topologie/index_physical_grouping.html:41
 msgid "Switch bays"
 msgstr "Baies de brassage"
 
 #: topologie/templates/topologie/index_physical_grouping.html:44
-msgid " Add a switch bay"
-msgstr " Ajouter une baie de brassage"
-
-#: topologie/templates/topologie/index_physical_grouping.html:50
-msgid "Buildings"
-msgstr "Bâtiments"
+msgid "Add a switch bay"
+msgstr "Ajouter une baie de brassage"
 
 #: topologie/templates/topologie/index_physical_grouping.html:53
-msgid " Add a building"
-msgstr " Ajouter un bâtiment"
+msgid "Add a building"
+msgstr "Ajouter un bâtiment"
 
 #: topologie/templates/topologie/index_physical_grouping.html:60
 msgid "Dormitories"
-msgstr ""
+msgstr "Résidences"
 
 #: topologie/templates/topologie/index_physical_grouping.html:63
-#, fuzzy
-#| msgid " Add a room"
-msgid " Add a dormitory"
-msgstr " Ajouter une chambre"
+msgid "Add a dormitory"
+msgstr "Ajouter une résidence"
 
 #: topologie/templates/topologie/index_portprofile.html:34
 #: topologie/templates/topologie/sidebar.html:43
@@ -773,8 +812,8 @@ msgid "Port profiles"
 msgstr "Profils de port"
 
 #: topologie/templates/topologie/index_portprofile.html:36
-msgid " Add a port profile"
-msgstr " Ajouter un profil de port"
+msgid "Add a port profile"
+msgstr "Ajouter un profil de port"
 
 #: topologie/templates/topologie/index_portprofile.html:42
 msgid "VLAN security"
@@ -785,8 +824,8 @@ msgid "Rooms"
 msgstr "Chambres"
 
 #: topologie/templates/topologie/index_room.html:35
-msgid " Add a room"
-msgstr " Ajouter une chambre"
+msgid "Add a room"
+msgstr "Ajouter une chambre"
 
 #: topologie/templates/topologie/sidebar.html:31
 msgid "Rooms and premises"
@@ -802,20 +841,13 @@ msgstr "Modèles et constructeurs de commutateur réseau"
 
 #: topologie/templates/topologie/switch.html:39
 #: topologie/templates/topologie/topo.html:36
-msgid " Go to the ports list"
-msgstr " Aller à la liste des ports"
+msgid "Go to the ports list"
+msgstr "Aller à la liste des ports"
 
 #: topologie/templates/topologie/switch.html:43
 msgid "Specific settings for the switch"
 msgstr "Réglages spécifiques pour le commutateur réseau"
 
-#: topologie/templates/topologie/switch.html:46 topologie/views.py:458
-#: topologie/views.py:762 topologie/views.py:817 topologie/views.py:876
-#: topologie/views.py:932 topologie/views.py:990 topologie/views.py:1047
-#: topologie/views.py:1105 topologie/views.py:1159
-msgid "Create"
-msgstr "Créer"
-
 #: topologie/templates/topologie/topo_more.html:48
 #, python-format
 msgid "Specific settings for the %(device)s object"
@@ -826,65 +858,68 @@ msgstr "Réglages spécifiques pour l'objet %(device)s"
 msgid "General settings for the machine linked to the %(device)s object"
 msgstr "Réglages généraux pour la machine liée à l'objet %(device)s"
 
-#: topologie/templates/topologie/topo_more.html:59
-msgid "Create or edit"
-msgstr "Créer ou modifier"
-
-#: topologie/views.py:364
+#: topologie/views.py:350
 msgid "The VLAN was edited."
 msgstr "Le VLAN a été modifié."
 
-#: topologie/views.py:367 topologie/views.py:420 topologie/views.py:474
-#: topologie/views.py:779 topologie/views.py:838 topologie/views.py:893
-#: topologie/views.py:950 topologie/views.py:1008 topologie/views.py:1068
-#: topologie/views.py:1123 topologie/views.py:1176 topologie/views.py:1230
+#: topologie/views.py:353 topologie/views.py:403 topologie/views.py:460
+#: topologie/views.py:748 topologie/views.py:805 topologie/views.py:865
+#: topologie/views.py:927 topologie/views.py:988 topologie/views.py:1052
+#: topologie/views.py:1112 topologie/views.py:1161 topologie/views.py:1217
 msgid "Edit"
 msgstr "Modifier"
 
-#: topologie/views.py:380 topologie/views.py:571
+#: topologie/views.py:364 topologie/views.py:556
 msgid "Nonexistent switch."
 msgstr "Commutateur réseau inexistant."
 
-#: topologie/views.py:388
+#: topologie/views.py:372
 msgid "The port was added."
 msgstr "Le port a été ajouté."
 
-#: topologie/views.py:390
+#: topologie/views.py:374
 msgid "The port already exists."
 msgstr "Le port existe déjà."
 
-#: topologie/views.py:396 topologie/views.py:1213
+#: topologie/views.py:377 topologie/views.py:445 topologie/views.py:733
+#: topologie/views.py:787 topologie/views.py:848 topologie/views.py:909
+#: topologie/views.py:970 topologie/views.py:1032 topologie/views.py:1095
+#: topologie/views.py:1146 topologie/views.py:1200
 msgid "Add"
 msgstr "Ajouter"
 
-#: topologie/views.py:411
+#: topologie/views.py:393
 msgid "The port was edited."
 msgstr "Le port a été modifié."
 
-#: topologie/views.py:434
+#: topologie/views.py:417
 msgid "The port was deleted."
 msgstr "Le port a été supprimé."
 
-#: topologie/views.py:438
+#: topologie/views.py:423
 #, python-format
 msgid "The port %s is used by another object, impossible to delete it."
 msgstr "Le port %s est utilisé par un autre objet, impossible de le supprimer."
 
-#: topologie/views.py:455
+#: topologie/views.py:442
 msgid "The stack was created."
 msgstr "La pile a été créée."
 
-#: topologie/views.py:487
+#: topologie/views.py:457
+msgid "The stack was edited."
+msgstr "La pile a été modifiée."
+
+#: topologie/views.py:471
 msgid "The stack was deleted."
 msgstr "La pile a été supprimée."
 
-#: topologie/views.py:491
+#: topologie/views.py:477
 #, python-format
 msgid "The stack %s is used by another object, impossible to deleted it."
 msgstr ""
 "La pile %s est utilisée par un autre objet, impossible de la supprimer."
 
-#: topologie/views.py:533 topologie/views.py:668 topologie/views.py:723
+#: topologie/views.py:516 topologie/views.py:638 topologie/views.py:692
 msgid ""
 "The organisation's user doesn't exist yet, please create or link it in the "
 "preferences."
@@ -892,137 +927,131 @@ msgstr ""
 "L'utilisateur de l'association n'existe pas encore, veuillez le créer ou le "
 "relier dans les préférences."
 
-#: topologie/views.py:548
+#: topologie/views.py:533
 msgid "The switch was created."
 msgstr "Le commutateur réseau a été créé."
 
-#: topologie/views.py:585
+#: topologie/views.py:569
 msgid "The ports were created."
 msgstr "Les ports ont été créés."
 
-#: topologie/views.py:629
+#: topologie/views.py:605
 msgid "The switch was edited."
 msgstr "Le commutateur réseau a été modifié."
 
-#: topologie/views.py:683
+#: topologie/views.py:655
 msgid "The access point was created."
 msgstr "Le point d'accès sans fil a été créé."
 
-#: topologie/views.py:736
+#: topologie/views.py:707
 msgid "The access point was edited."
 msgstr "Le point d'accès sans fil a été modifié."
 
-#: topologie/views.py:759
+#: topologie/views.py:730
 msgid "The room was created."
 msgstr "La chambre a été créée."
 
-#: topologie/views.py:776
+#: topologie/views.py:745
 msgid "The room was edited."
 msgstr "La chambre a été modifiée."
 
-#: topologie/views.py:792
+#: topologie/views.py:759
 msgid "The room was deleted."
 msgstr "La chambre a été supprimée."
 
-#: topologie/views.py:796
+#: topologie/views.py:765
 #, python-format
 msgid "The room %s is used by another object, impossible to deleted it."
 msgstr ""
 "La chambre %s est utilisée par un autre objet, impossible de la supprimer."
 
-#: topologie/views.py:814
+#: topologie/views.py:784
 msgid "The switch model was created."
 msgstr "Le modèle de commutateur réseau a été créé."
 
-#: topologie/views.py:835
+#: topologie/views.py:802
 msgid "The switch model was edited."
 msgstr "Le modèle de commutateur réseau a été modifié."
 
-#: topologie/views.py:851
+#: topologie/views.py:818
 msgid "The switch model was deleted."
 msgstr "Le modèle de commutateur réseau a été supprimé."
 
-#: topologie/views.py:855
+#: topologie/views.py:824
 #, python-format
 msgid "The switch model %s is used by another object, impossible to delete it."
 msgstr ""
 "Le modèle de commutateur réseau %s est utilisé par un autre objet, "
 "impossible de le supprimer."
 
-#: topologie/views.py:873
+#: topologie/views.py:845
 msgid "The switch bay was created."
 msgstr "La baie de brassage a été créée."
 
-#: topologie/views.py:890
+#: topologie/views.py:862
 msgid "The switch bay was edited."
 msgstr "La baie de brassage a été modifiée."
 
-#: topologie/views.py:906
+#: topologie/views.py:878
 msgid "The switch bay was deleted."
 msgstr "La baie de brassage a été supprimée."
 
-#: topologie/views.py:910
+#: topologie/views.py:884
 #, python-format
 msgid "The switch bay %s is used by another object, impossible to delete it."
 msgstr ""
 "La baie de brassage %s est utilisée par un autre objet, impossible de la "
 "supprimer."
 
-#: topologie/views.py:929
+#: topologie/views.py:906
 msgid "The building was created."
 msgstr "Le bâtiment a été créé."
 
-#: topologie/views.py:947
+#: topologie/views.py:924
 msgid "The building was edited."
 msgstr "Le bâtiment a été modifié."
 
-#: topologie/views.py:964
+#: topologie/views.py:939
 msgid "The building was deleted."
 msgstr "Le bâtiment a été supprimé."
 
-#: topologie/views.py:968
+#: topologie/views.py:945
 #, python-format
 msgid "The building %s is used by another object, impossible to delete it."
 msgstr ""
 "Le bâtiment %s est utilisé par un autre objet, impossible de le supprimer."
 
-#: topologie/views.py:987
-#, fuzzy
-#| msgid "The room was created."
+#: topologie/views.py:967
 msgid "The dormitory was created."
-msgstr "La chambre a été créée."
+msgstr "La résidence a été créée."
 
-#: topologie/views.py:1005
-#, fuzzy
-#| msgid "The port was edited."
+#: topologie/views.py:985
 msgid "The dormitory was edited."
-msgstr "Le port a été modifié."
+msgstr "La résidence a été modifiée."
 
-#: topologie/views.py:1022
-#, fuzzy
-#| msgid "The port was deleted."
+#: topologie/views.py:1002
 msgid "The dormitory was deleted."
-msgstr "Le port a été supprimé."
+msgstr "La résidence a été supprimée."
 
-#: topologie/views.py:1026
-#, fuzzy, python-format
-#| msgid "The port %s is used by another object, impossible to delete it."
+#: topologie/views.py:1008
+#, python-format
 msgid "The dormitory %s is used by another object, impossible to delete it."
-msgstr "Le port %s est utilisé par un autre objet, impossible de le supprimer."
+msgstr ""
+"La résidence %s est utilisée par un autre objet, impossible de la supprimer."
 
-#: topologie/views.py:1044
+#: topologie/views.py:1029
 msgid "The switch constructor was created."
 msgstr "Le constructeur de commutateur réseau a été créé."
 
-#: topologie/views.py:1065
+#: topologie/views.py:1049
 msgid "The switch constructor was edited."
 msgstr "Le constructeur de commutateur réseau a été modifié."
 
-#: topologie/views.py:1081
+#: topologie/views.py:1065
 msgid "The switch constructor was deleted."
 msgstr "Le constructeur de commutateur réseau a été supprimé."
 
-#: topologie/views.py:1085
+#: topologie/views.py:1071
 #, python-format
 msgid ""
 "The switch constructor %s is used by another object, impossible to delete it."
@@ -1030,49 +1059,49 @@ msgstr ""
 "Le constructeur de commutateur réseau %s est utilisé par un autre objet, "
 "impossible de le supprimer."
 
-#: topologie/views.py:1102
+#: topologie/views.py:1092
 msgid "The port profile was created."
 msgstr "Le profil de port a été créé."
 
-#: topologie/views.py:1120
+#: topologie/views.py:1109
 msgid "The port profile was edited."
 msgstr "Le profil de port a été modifié."
 
-#: topologie/views.py:1137
+#: topologie/views.py:1125
 msgid "The port profile was deleted."
 msgstr "Le profil de port a été supprimé."
 
-#: topologie/views.py:1140
+#: topologie/views.py:1127
 msgid "Impossible to delete the port profile."
 msgstr "Impossible de supprimer le profil de port."
 
-#: topologie/views.py:1156
+#: topologie/views.py:1143
 msgid "The module was created."
 msgstr "Le module a été créé."
 
-#: topologie/views.py:1173 topologie/views.py:1227
+#: topologie/views.py:1158 topologie/views.py:1214
 msgid "The module was edited."
 msgstr "Le module a été modifié."
 
-#: topologie/views.py:1189 topologie/views.py:1243
+#: topologie/views.py:1172 topologie/views.py:1228
 msgid "The module was deleted."
 msgstr "Le module a été supprimé."
 
-#: topologie/views.py:1193 topologie/views.py:1247
+#: topologie/views.py:1178 topologie/views.py:1234
 #, python-format
 msgid "The module %s is used by another object, impossible to deleted it."
 msgstr ""
 "Le module %s est utilisé par un autre objet, impossible de le supprimer."
 
-#: topologie/views.py:1198 topologie/views.py:1252
-msgid "Module"
-msgstr "Module"
+#: topologie/views.py:1186 topologie/views.py:1242
+msgid "module"
+msgstr "module"
 
-#: topologie/views.py:1210
+#: topologie/views.py:1197
 msgid "The module was added."
 msgstr "Le module a été ajouté."
 
-#: topologie/views.py:1398
+#: topologie/views.py:1408
 msgid ""
 "The default Django template isn't used. This can lead to rendering errors. "
 "Check the parameters."
diff --git a/topologie/migrations/0073_auto_20191120_0159.py b/topologie/migrations/0073_auto_20191120_0159.py
new file mode 100644
index 00000000..482c21c8
--- /dev/null
+++ b/topologie/migrations/0073_auto_20191120_0159.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-11-20 00:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0072_auto_20190720_2318'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='accesspoint',
+            name='location',
+            field=models.CharField(blank=True, help_text="Details about the AP's location.", max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='moduleonswitch',
+            name='slot',
+            field=models.CharField(help_text='Slot on switch.', max_length=15, verbose_name='slot'),
+        ),
+        migrations.AlterField(
+            model_name='moduleswitch',
+            name='comment',
+            field=models.CharField(blank=True, help_text='Comment.', max_length=255, null=True, verbose_name='comment'),
+        ),
+        migrations.AlterField(
+            model_name='moduleswitch',
+            name='reference',
+            field=models.CharField(help_text='Reference of a module.', max_length=255, verbose_name='module reference'),
+        ),
+        migrations.AlterField(
+            model_name='port',
+            name='state',
+            field=models.BooleanField(default=True, help_text='Port state Active.', verbose_name='port state Active'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='arp_protect',
+            field=models.BooleanField(default=False, help_text='Check if IP address is DHCP assigned.', verbose_name='ARP protection'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='dhcp_snooping',
+            field=models.BooleanField(default=False, help_text='Protect against rogue DHCP.', verbose_name='DHCP snooping'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='dhcpv6_snooping',
+            field=models.BooleanField(default=False, help_text='Protect against rogue DHCPv6.', verbose_name='DHCPv6 snooping'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='flow_control',
+            field=models.BooleanField(default=False, help_text='Flow control.'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='loop_protect',
+            field=models.BooleanField(default=False, help_text='Protect against loop.', verbose_name='loop protection'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='mac_limit',
+            field=models.IntegerField(blank=True, help_text='Limit of MAC-address on this port.', null=True, verbose_name='MAC limit'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='on_dormitory',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dormitory_ofprofil', to='topologie.Dormitory', verbose_name='profile on dormitory'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='profil_default',
+            field=models.CharField(blank=True, choices=[('room', 'Room'), ('access_point', 'Access point'), ('uplink', 'Uplink'), ('asso_machine', 'Organisation machine'), ('nothing', 'Nothing')], max_length=32, null=True, verbose_name='default profile'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='ra_guard',
+            field=models.BooleanField(default=False, help_text='Protect against rogue RA.', verbose_name='RA guard'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='radius_mode',
+            field=models.CharField(choices=[('STRICT', 'STRICT'), ('COMMON', 'COMMON')], default='COMMON', help_text='In case of MAC-authentication: mode COMMON or STRICT on this port.', max_length=32, verbose_name='RADIUS mode'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='radius_type',
+            field=models.CharField(choices=[('NO', 'NO'), ('802.1X', '802.1X'), ('MAC-radius', 'MAC-RADIUS')], help_text='Type of RADIUS authentication: inactive, MAC-address or 802.1X.', max_length=32, verbose_name='RADIUS type'),
+        ),
+        migrations.AlterField(
+            model_name='portprofile',
+            name='speed',
+            field=models.CharField(choices=[('10-half', '10-half'), ('100-half', '100-half'), ('10-full', '10-full'), ('100-full', '100-full'), ('1000-full', '1000-full'), ('auto', 'auto'), ('auto-10', 'auto-10'), ('auto-100', 'auto-100')], default='auto', help_text='Port speed limit.', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='switch',
+            name='automatic_provision',
+            field=models.BooleanField(default=False, help_text='Automatic provision for the switch.'),
+        ),
+        migrations.AlterField(
+            model_name='switch',
+            name='management_creds',
+            field=models.ForeignKey(blank=True, help_text='Management credentials for the switch.', null=True, on_delete=django.db.models.deletion.PROTECT, to='preferences.SwitchManagementCred'),
+        ),
+        migrations.AlterField(
+            model_name='switch',
+            name='model',
+            field=models.ForeignKey(blank=True, help_text='Switch model.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='topologie.ModelSwitch'),
+        ),
+        migrations.AlterField(
+            model_name='switch',
+            name='number',
+            field=models.PositiveIntegerField(help_text='Number of ports.'),
+        ),
+        migrations.AlterField(
+            model_name='switch',
+            name='radius_key',
+            field=models.ForeignKey(blank=True, help_text='RADIUS key of the switch.', null=True, on_delete=django.db.models.deletion.PROTECT, to='preferences.RadiusKey'),
+        ),
+    ]
diff --git a/topologie/models.py b/topologie/models.py
index 93e7968c..ab6a22dd 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -84,7 +84,7 @@ class Stack(AclMixin, RevMixin, models.Model):
         """ Verification que l'id_max < id_min"""
         if self.member_id_max < self.member_id_min:
             raise ValidationError(
-                {"member_id_max": _("The maximum ID is less than the" " minimum ID.")}
+                {"member_id_max": _("The maximum ID is less than the minimum ID.")}
             )
 
 
@@ -96,7 +96,7 @@ class AccessPoint(AclMixin, Machine):
 
     location = models.CharField(
         max_length=255,
-        help_text=_("Details about the AP's location"),
+        help_text=_("Details about the AP's location."),
         blank=True,
         null=True,
     )
@@ -187,7 +187,7 @@ class Switch(AclMixin, Machine):
     Validation au save que l'id du stack est bien dans le range id_min
     id_max de la stack parente"""
 
-    number = models.PositiveIntegerField(help_text=_("Number of ports"))
+    number = models.PositiveIntegerField(help_text=_("Number of ports."))
     stack = models.ForeignKey(
         "topologie.Stack", blank=True, null=True, on_delete=models.SET_NULL
     )
@@ -197,7 +197,7 @@ class Switch(AclMixin, Machine):
         blank=True,
         null=True,
         on_delete=models.SET_NULL,
-        help_text=_("Switch model"),
+        help_text=_("Switch model."),
     )
     switchbay = models.ForeignKey(
         "topologie.SwitchBay", blank=True, null=True, on_delete=models.SET_NULL
@@ -207,17 +207,17 @@ class Switch(AclMixin, Machine):
         blank=True,
         null=True,
         on_delete=models.PROTECT,
-        help_text=_("RADIUS key of the switch"),
+        help_text=_("RADIUS key of the switch."),
     )
     management_creds = models.ForeignKey(
         "preferences.SwitchManagementCred",
         blank=True,
         null=True,
         on_delete=models.PROTECT,
-        help_text=_("Management credentials for the switch"),
+        help_text=_("Management credentials for the switch."),
     )
     automatic_provision = models.BooleanField(
-        default=False, help_text=_("Automatic provision for the switch")
+        default=False, help_text=_("Automatic provision for the switch.")
     )
 
     class Meta:
@@ -245,14 +245,14 @@ class Switch(AclMixin, Machine):
                     )
             else:
                 raise ValidationError(
-                    {"stack_member_id": _("The stack member ID can't be" " void.")}
+                    {"stack_member_id": _("The stack member ID can't be void.")}
                 )
 
     def create_ports(self, begin, end):
         """ Crée les ports de begin à end si les valeurs données
         sont cohérentes. """
         if end < begin:
-            raise ValidationError(_("The end port is less than the start" " port."))
+            raise ValidationError(_("The end port is less than the start port."))
         ports_to_create = range(begin, end + 1)
         existing_ports = Port.objects.filter(switch=self.switch).values_list(
             "port", flat=True
@@ -262,7 +262,7 @@ class Switch(AclMixin, Machine):
         if len(non_existing_ports) + existing_ports.count() > self.number:
             raise ValidationError(_("This switch can't have that many ports."))
         with transaction.atomic(), reversion.create_revision():
-            reversion.set_comment(_("Creation"))
+            reversion.set_comment("Creation")
             Port.objects.bulk_create(
                 [
                     Port(switch=self.switch, port=port_id)
@@ -491,15 +491,15 @@ class ModuleSwitch(AclMixin, RevMixin, models.Model):
 
     reference = models.CharField(
         max_length=255,
-        help_text=_("Reference of a module"),
-        verbose_name=_("Module reference"),
+        help_text=_("Reference of a module."),
+        verbose_name=_("module reference"),
     )
     comment = models.CharField(
         max_length=255,
         null=True,
         blank=True,
-        help_text=_("Comment"),
-        verbose_name=_("Comment"),
+        help_text=_("Comment."),
+        verbose_name=_("comment"),
     )
 
     class Meta:
@@ -517,14 +517,14 @@ class ModuleOnSwitch(AclMixin, RevMixin, models.Model):
     module = models.ForeignKey("ModuleSwitch", on_delete=models.CASCADE)
     switch = models.ForeignKey("Switch", on_delete=models.CASCADE)
     slot = models.CharField(
-        max_length=15, help_text=_("Slot on switch"), verbose_name=_("Slot")
+        max_length=15, help_text=_("Slot on switch."), verbose_name=_("slot")
     )
 
     class Meta:
         permissions = (
             (
                 "view_moduleonswitch",
-                _("Can view a link between switch and" " module object"),
+                _("Can view a link between switch and module object"),
             ),
         )
         verbose_name = _("link between switch and module")
@@ -532,7 +532,7 @@ class ModuleOnSwitch(AclMixin, RevMixin, models.Model):
         unique_together = ["slot", "switch"]
 
     def __str__(self):
-        return _("On slot ") + str(self.slot) + _(" of ") + str(self.switch)
+        return _("On slot %(slot)s of %(switch)s").format(slot=str(self.slot), switch=str(self.switch))
 
 
 class ConstructorSwitch(AclMixin, RevMixin, models.Model):
@@ -542,10 +542,10 @@ class ConstructorSwitch(AclMixin, RevMixin, models.Model):
 
     class Meta:
         permissions = (
-            ("view_constructorswitch", _("Can view a switch constructor" " object")),
+            ("view_constructorswitch", _("Can view a switch constructor object")),
         )
         verbose_name = _("switch constructor")
-        verbose_name_plural = "switch constructors"
+        verbose_name_plural = _("switch constructors")
 
     def __str__(self):
         return self.name
@@ -655,8 +655,8 @@ class Port(AclMixin, RevMixin, models.Model):
     )
     state = models.BooleanField(
         default=True,
-        help_text=_("Port state Active"),
-        verbose_name=_("Port state Active"),
+        help_text=_("Port state Active."),
+        verbose_name=_("port state Active"),
     )
     details = models.CharField(max_length=255, blank=True)
 
@@ -809,13 +809,13 @@ class PortProfile(AclMixin, RevMixin, models.Model):
         ("asso_machine", _("Organisation machine")),
         ("nothing", _("Nothing")),
     )
-    name = models.CharField(max_length=255, verbose_name=_("Name"))
+    name = models.CharField(max_length=255, verbose_name=_("name"))
     profil_default = models.CharField(
         max_length=32,
         choices=PROFIL_DEFAULT,
         blank=True,
         null=True,
-        verbose_name=_("Default profile"),
+        verbose_name=_("default profile"),
     )
     on_dormitory = models.ForeignKey(
         "topologie.Dormitory",
@@ -823,7 +823,7 @@ class PortProfile(AclMixin, RevMixin, models.Model):
         on_delete=models.SET_NULL,
         blank=True,
         null=True,
-        verbose_name=_("Profil on dormitory"),
+        verbose_name=_("profile on dormitory"),
     )
     vlan_untagged = models.ForeignKey(
         "machines.Vlan",
@@ -843,7 +843,7 @@ class PortProfile(AclMixin, RevMixin, models.Model):
         max_length=32,
         choices=TYPES,
         help_text=_(
-            "Type of RADIUS authentication : inactive, MAC-address or" " 802.1X"
+            "Type of RADIUS authentication: inactive, MAC-address or 802.1X."
         ),
         verbose_name=_("RADIUS type"),
     )
@@ -852,44 +852,44 @@ class PortProfile(AclMixin, RevMixin, models.Model):
         choices=MODES,
         default="COMMON",
         help_text=_(
-            "In case of MAC-authentication : mode COMMON or STRICT on" " this port"
+            "In case of MAC-authentication: mode COMMON or STRICT on this port."
         ),
         verbose_name=_("RADIUS mode"),
     )
     speed = models.CharField(
-        max_length=32, choices=SPEED, default="auto", help_text=_("Port speed limit")
+        max_length=32, choices=SPEED, default="auto", help_text=_("Port speed limit.")
     )
     mac_limit = models.IntegerField(
         null=True,
         blank=True,
-        help_text=_("Limit of MAC-address on this port"),
+        help_text=_("Limit of MAC-address on this port."),
         verbose_name=_("MAC limit"),
     )
-    flow_control = models.BooleanField(default=False, help_text=_("Flow control"))
+    flow_control = models.BooleanField(default=False, help_text=_("Flow control."))
     dhcp_snooping = models.BooleanField(
         default=False,
-        help_text=_("Protect against rogue DHCP"),
+        help_text=_("Protect against rogue DHCP."),
         verbose_name=_("DHCP snooping"),
     )
     dhcpv6_snooping = models.BooleanField(
         default=False,
-        help_text=_("Protect against rogue DHCPv6"),
+        help_text=_("Protect against rogue DHCPv6."),
         verbose_name=_("DHCPv6 snooping"),
     )
     arp_protect = models.BooleanField(
         default=False,
-        help_text=_("Check if IP adress is DHCP assigned"),
+        help_text=_("Check if IP address is DHCP assigned."),
         verbose_name=_("ARP protection"),
     )
     ra_guard = models.BooleanField(
         default=False,
-        help_text=_("Protect against rogue RA"),
+        help_text=_("Protect against rogue RA."),
         verbose_name=_("RA guard"),
     )
     loop_protect = models.BooleanField(
         default=False,
-        help_text=_("Protect against loop"),
-        verbose_name=_("Loop protection"),
+        help_text=_("Protect against loop."),
+        verbose_name=_("loop protection"),
     )
 
     class Meta:
@@ -933,7 +933,7 @@ class PortProfile(AclMixin, RevMixin, models.Model):
             raise ValidationError(
                 {
                     "profil_default": _(
-                        "A default profile for all dormitory of that type already exists."
+                        "A default profile for all dormitories of that type already exists."
                     )
                 }
             )
diff --git a/topologie/templates/topologie/aff_dormitory.html b/topologie/templates/topologie/aff_dormitory.html
index cd5a0fbb..b4311b8a 100644
--- a/topologie/templates/topologie/aff_dormitory.html
+++ b/topologie/templates/topologie/aff_dormitory.html
@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             {% trans "Dormitory" as tr_dormitory %}
             <th>{% include 'buttons/sort.html' with prefix='dormitory' col='name' text=tr_dormitory %}</th>
-            <th>{% trans "Building" %}</th>
+            <th>{% trans "Buildings" %}</th>
             <th></th>
         </tr>
     </thead>
diff --git a/topologie/templates/topologie/aff_model_switch.html b/topologie/templates/topologie/aff_model_switch.html
index 24a759e1..51f98617 100644
--- a/topologie/templates/topologie/aff_model_switch.html
+++ b/topologie/templates/topologie/aff_model_switch.html
@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% trans "Reference" as tr_ref %}
             <th>{% include 'buttons/sort.html' with prefix='model-switch' col='reference' text=tr_ref %}</th>
             <th>{% trans "Commercial name" %}</th>
-            <th>Firmware</th>
+	    <th>{% trans "Firmware" %}</th>
             {% trans "Switch constructor" as tr_constructor %}
             <th>{% include 'buttons/sort.html' with prefix='model-switch' col='constructor' text=tr_constructor %}</th>
 	    <th>{% trans "Switches" %}
diff --git a/topologie/templates/topologie/aff_port_profile.html b/topologie/templates/topologie/aff_port_profile.html
index 4ed8a7b4..009c0b0f 100644
--- a/topologie/templates/topologie/aff_port_profile.html
+++ b/topologie/templates/topologie/aff_port_profile.html
@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <thead>
             <tr>
                 <th>{% trans "Name" %}</th>
-                <th>{% trans "Default for and place" %}</th>
+                <th>{% trans "Default for" %}</th>
                 <th>{% trans "VLANs" %}</th>
                 <th>{% trans "RADIUS settings" %}</th>
                 <th>{% trans "Speed limit" %}</th>
@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% for port_profile in port_profile_list %}
         <tr>
             <td>{{ port_profile.name }}</td>
-	    <td>{{ port_profile.profil_default }} {% if port_profile.profil_default%}<b> - {% if port_profile.on_dormitory %} on {{ port_profile.on_dormitory }} {% else %} Everywhere {% endif %}</b>{% endif %}</td>
+	    <td>{{ port_profile.profil_default }} {% if port_profile.profil_default%}<b> - {% if port_profile.on_dormitory %}{% blocktrans with dorm=port_profile.on_dormitory %} on {{ dorm }}{% endblocktrans %}{% else %}{% trans "Everywhere" %}{% endif %}</b>{% endif %}</td>
             <td>
                 {% if port_profile.vlan_untagged %}
                 <b>{% trans "Untagged: " %}</b>{{ port_profile.vlan_untagged }}
diff --git a/topologie/templates/topologie/aff_switch.html b/topologie/templates/topologie/aff_switch.html
index 58871d19..e2866aba 100644
--- a/topologie/templates/topologie/aff_switch.html
+++ b/topologie/templates/topologie/aff_switch.html
@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <th>{% include 'buttons/sort.html' with prefix='switch' col='ports' text=tr_ports %}</th>
                 {% trans "Stack" as tr_stack %}
                 <th>{% include 'buttons/sort.html' with prefix='switch' col='stack' text=tr_stack %}</th>
-                <th>{% trans "Stack ID" %}</th>
+                <th>{% trans "Stack member ID" %}</th>
                 <th>{% trans "Switch model" %}</th>
                 <th>{% trans "Details" %}</th>
                 <th></th>
diff --git a/topologie/templates/topologie/index.html b/topologie/templates/topologie/index.html
index 1d0c8722..4d021779 100644
--- a/topologie/templates/topologie/index.html
+++ b/topologie/templates/topologie/index.html
@@ -65,7 +65,7 @@ function toggle_graph() {
 
 <h2>{% trans "Switches" %}</h2>
 {% can_create Switch %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-switch' %}"><i class="fa fa-plus"></i>{% trans " Add a switch" %}</a>
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-switch' %}"><i class="fa fa-plus"></i> {% trans "Add a switch" %}</a>
 <hr>
 {% acl_end %}
     {% include 'topologie/aff_switch.html' with switch_list=switch_list %}
diff --git a/topologie/templates/topologie/index_ap.html b/topologie/templates/topologie/index_ap.html
index 570d22ab..b1521937 100644
--- a/topologie/templates/topologie/index_ap.html
+++ b/topologie/templates/topologie/index_ap.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
 <h2>{% trans "Access points" %}</h2>
 {% can_create AccessPoint %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-ap' %}"><i class="fa fa-plus"></i>{% trans " Add an access point" %}</a>
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-ap' %}"><i class="fa fa-plus"></i> {% trans "Add an access point" %}</a>
 <hr>
 {% acl_end %}
     {% include 'topologie/aff_ap.html' with ap_list=ap_list %}
diff --git a/topologie/templates/topologie/index_model_switch.html b/topologie/templates/topologie/index_model_switch.html
index 2612c29c..da82adb7 100644
--- a/topologie/templates/topologie/index_model_switch.html
+++ b/topologie/templates/topologie/index_model_switch.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "Switch models" %}</h2>
     {% can_create ModelSwitch %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-model-switch' %}">
-	<i class="fa fa-plus"></i>{% trans " Add a switch model" %}
+	<i class="fa fa-plus"></i> {% trans "Add a switch model" %}
     </a>
     <hr>
     {% acl_end %}
@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "Switch constructors" %}</h2>
     {% can_create ConstructorSwitch %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-constructor-switch' %}">
-	<i class="fa fa-plus"></i>{% trans " Add a switch constructor" %}
+	<i class="fa fa-plus"></i> {% trans "Add a switch constructor" %}
     </a>
     <hr>
     {% acl_end %}
diff --git a/topologie/templates/topologie/index_module.html b/topologie/templates/topologie/index_module.html
index f7432bf1..fae9b282 100644
--- a/topologie/templates/topologie/index_module.html
+++ b/topologie/templates/topologie/index_module.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
 <h2>{% trans "Switch modules" %}</h2>
 {% can_create ModuleSwitch %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:add-module' %}"><i class="fa fa-plus"></i>{% trans " Add a module" %}</a>
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:add-module' %}"><i class="fa fa-plus"></i> {% trans "Add a module" %}</a>
 <hr>
 {% acl_end %}
     {% include 'topologie/aff_modules.html' with module_list=module_list modular_switchs=modular_switchs %}
diff --git a/topologie/templates/topologie/index_p.html b/topologie/templates/topologie/index_p.html
index 8d215ebd..462bd146 100644
--- a/topologie/templates/topologie/index_p.html
+++ b/topologie/templates/topologie/index_p.html
@@ -48,8 +48,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <hr>
 {% include 'buttons/edit.html' with href='topologie:edit-switch' id=id_switch %}
 {% can_create Port %}
-{% include 'buttons/add.html' with href='topologie:new-port' id=id_switch %}
-{% include 'buttons/add.html' with href='topologie:create-ports' id=id_switch %}
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-port' id_switch %}"><i class="fa fa-plus"></i> {% trans "Add a port" %}</a>
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:create-ports' id_switch %}"><i class="fa fa-plus"></i> {% trans "Add ports to the port list" %}</a>
 {% acl_end %}
 <hr>
 {% include 'topologie/aff_repr_switch.html' with port_list=port_list %}
diff --git a/topologie/templates/topologie/index_physical_grouping.html b/topologie/templates/topologie/index_physical_grouping.html
index 9e4c32a8..cea4fb75 100644
--- a/topologie/templates/topologie/index_physical_grouping.html
+++ b/topologie/templates/topologie/index_physical_grouping.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "Stacks" %}</h2>
     {% can_create Stack %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-stack' %}">
-	<i class="fa fa-plus"></i>{% trans " Add a stack" %}
+	<i class="fa fa-plus"></i> {% trans "Add a stack" %}
     </a>
     {% acl_end %}
     {% include 'topologie/aff_stacks.html' with stack_list=stack_list %}
@@ -41,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "Switch bays" %}</h2>
     {% can_create SwitchBay %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-switch-bay' %}">
-	<i class="fa fa-plus"></i>{% trans " Add a switch bay" %}
+	<i class="fa fa-plus"></i> {% trans "Add a switch bay" %}
     </a>
     <hr>
     {% acl_end %}
@@ -50,7 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "Buildings" %}</h2>
     {% can_create Building %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-building' %}">
-	<i class="fa fa-plus"></i>{% trans " Add a building" %}
+	<i class="fa fa-plus"></i> {% trans "Add a building" %}
     </a>
     <hr>
     {% acl_end %}
@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h2>{% trans "Dormitories" %}</h2>
     {% can_create Dormitory %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-dormitory' %}">
-	<i class="fa fa-plus"></i>{% trans " Add a dormitory" %}
+	<i class="fa fa-plus"></i> {% trans "Add a dormitory" %}
     </a>
     <hr>
     {% acl_end %}
diff --git a/topologie/templates/topologie/index_portprofile.html b/topologie/templates/topologie/index_portprofile.html
index a528b992..dd04687d 100644
--- a/topologie/templates/topologie/index_portprofile.html
+++ b/topologie/templates/topologie/index_portprofile.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <h2>{% trans "Port profiles" %}</h2>
 {% can_create PortProfile %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-port-profile' %}"><i class="fa fa-plus"></i>{% trans " Add a port profile" %}</a>
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-port-profile' %}"><i class="fa fa-plus"></i> {% trans "Add a port profile" %}</a>
 <hr>
 {% acl_end %}
 {% include 'topologie/aff_port_profile.html' with port_profile_list=port_profile_list %}
diff --git a/topologie/templates/topologie/index_room.html b/topologie/templates/topologie/index_room.html
index c383a226..17658e0c 100644
--- a/topologie/templates/topologie/index_room.html
+++ b/topologie/templates/topologie/index_room.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
 <h2>{% trans "Rooms" %}</h2>
 {% can_create Room %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-room' %}"><i class="fa fa-plus"></i>{% trans " Add a room" %}</a>
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-room' %}"><i class="fa fa-plus"></i> {% trans "Add a room" %}</a>
 <hr>
 {% acl_end %}
     {% include 'topologie/aff_chambres.html' with room_list=room_list %}
diff --git a/topologie/templates/topologie/switch.html b/topologie/templates/topologie/switch.html
index 5c39e322..bdc0dae0 100644
--- a/topologie/templates/topologie/switch.html
+++ b/topologie/templates/topologie/switch.html
@@ -36,15 +36,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 
-<a class="btn btn-primary" href="{% url 'topologie:index-port' id_switch %}" role="button">{% bootstrap_icon "list" %}{% trans " Go to the ports list" %}</a>
+<a class="btn btn-primary" href="{% url 'topologie:index-port' id_switch %}" role="button">{% bootstrap_icon "list" %} {% trans "Go to the ports list" %}</a>
 <form class="form" method="post">
     {% csrf_token %}
     {% if topoform %}
     <h3>{% trans "Specific settings for the switch" %}</h3>
     {% massive_bootstrap_form topoform 'switch_interface' %}
     {% endif %}
-    {% trans "Create" as tr_create %}
-    {% bootstrap_button tr_create button_type="submit" icon='ok' button_class='btn-success' %}
+    {% trans "Confirm" as tr_confirm %}
+    {% bootstrap_button tr_confirm button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />
diff --git a/topologie/templates/topologie/topo.html b/topologie/templates/topologie/topo.html
index 7dad1138..409b65ec 100644
--- a/topologie/templates/topologie/topo.html
+++ b/topologie/templates/topologie/topo.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% bootstrap_form_errors topoform %}
 
 {% if id_switch %}
-<a class="btn btn-primary" href="{% url 'topologie:index-port' id_switch %}" role="button">{% bootstrap_icon "list" %}{% trans " Go to the ports list" %}</a>
+<a class="btn btn-primary" href="{% url 'topologie:index-port' id_switch %}" role="button">{% bootstrap_icon "list" %} {% trans "Go to the ports list" %}</a>
 {% endif %}
 <form class="form" method="post">
     {% csrf_token %}
diff --git a/topologie/templates/topologie/topo_more.html b/topologie/templates/topologie/topo_more.html
index 1c9e26a1..617870d7 100644
--- a/topologie/templates/topologie/topo_more.html
+++ b/topologie/templates/topologie/topo_more.html
@@ -56,8 +56,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h3>{% trans "DNS name" %}</h3>
     {% bootstrap_form domainform %}
     {% endif %}
-    {% trans "Create or edit" as tr_create_or_edit %}
-    {% bootstrap_button tr_create_or_edit button_type="submit" icon='ok' button_class='btn-success' %}
+    {% trans "Confirm" as tr_confirm %}
+    {% bootstrap_button tr_confirm button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />
diff --git a/topologie/views.py b/topologie/views.py
index 84b0345a..3d3f742a 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -442,7 +442,7 @@ def new_stack(request):
         messages.success(request, _("The stack was created."))
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"topoform": stack, "action_name": _("Create")}, "topologie/topo.html", request
+        {"topoform": stack, "action_name": _("Add")}, "topologie/topo.html", request
     )
 
 
@@ -454,6 +454,7 @@ def edit_stack(request, stack, **_kwargs):
     if stack.is_valid():
         if stack.changed_data:
             stack.save()
+            messages.success(request, _("The stack was edited."))
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
         {"topoform": stack, "action_name": _("Edit")}, "topologie/topo.html", request
@@ -538,7 +539,7 @@ def new_switch(request):
             "machineform": switch,
             "domainform": domain,
             "i_mbf_param": i_mbf_param,
-            "device": "switch",
+            "device": _("switch"),
         },
         "topologie/topo_more.html",
         request,
@@ -611,7 +612,7 @@ def edit_switch(request, switch, switchid):
             "machineform": switch_form,
             "domainform": domain_form,
             "i_mbf_param": i_mbf_param,
-            "device": "switch",
+            "device": _("switch"),
         },
         "topologie/topo_more.html",
         request,
@@ -660,7 +661,7 @@ def new_ap(request):
             "machineform": ap,
             "domainform": domain,
             "i_mbf_param": i_mbf_param,
-            "device": "wifi ap",
+            "device": _("access point"),
         },
         "topologie/topo_more.html",
         request,
@@ -712,7 +713,7 @@ def edit_ap(request, ap, **_kwargs):
             "machineform": ap_form,
             "domainform": domain_form,
             "i_mbf_param": i_mbf_param,
-            "device": "wifi ap",
+            "device": _("access point"),
         },
         "topologie/topo_more.html",
         request,
@@ -729,7 +730,7 @@ def new_room(request):
         messages.success(request, _("The room was created."))
         return redirect(reverse("topologie:index-room"))
     return form(
-        {"topoform": room, "action_name": _("Create")}, "topologie/topo.html", request
+        {"topoform": room, "action_name": _("Add")}, "topologie/topo.html", request
     )
 
 
@@ -769,7 +770,7 @@ def del_room(request, room, **_kwargs):
             )
         return redirect(reverse("topologie:index-room"))
     return form(
-        {"objet": room, "objet_name": _("Room")}, "topologie/delete.html", request
+        {"objet": room, "objet_name": _("room")}, "topologie/delete.html", request
     )
 
 
@@ -783,7 +784,7 @@ def new_model_switch(request):
         messages.success(request, _("The switch model was created."))
         return redirect(reverse("topologie:index-model-switch"))
     return form(
-        {"topoform": model_switch, "action_name": _("Create")},
+        {"topoform": model_switch, "action_name": _("Add")},
         "topologie/topo.html",
         request,
     )
@@ -828,7 +829,7 @@ def del_model_switch(request, model_switch, **_kwargs):
             )
         return redirect(reverse("topologie:index-model-switch"))
     return form(
-        {"objet": model_switch, "objet_name": _("Switch model")},
+        {"objet": model_switch, "objet_name": _("switch model")},
         "topologie/delete.html",
         request,
     )
@@ -844,7 +845,7 @@ def new_switch_bay(request):
         messages.success(request, _("The switch bay was created."))
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"topoform": switch_bay, "action_name": _("Create")},
+        {"topoform": switch_bay, "action_name": _("Add")},
         "topologie/topo.html",
         request,
     )
@@ -888,7 +889,7 @@ def del_switch_bay(request, switch_bay, **_kwargs):
             )
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"objet": switch_bay, "objet_name": _("Switch bay")},
+        {"objet": switch_bay, "objet_name": _("switch bay")},
         "topologie/delete.html",
         request,
     )
@@ -905,7 +906,7 @@ def new_building(request):
         messages.success(request, _("The building was created."))
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"topoform": building, "action_name": _("Create")},
+        {"topoform": building, "action_name": _("Add")},
         "topologie/topo.html",
         request,
     )
@@ -949,7 +950,7 @@ def del_building(request, building, **_kwargs):
             )
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"objet": building, "objet_name": _("Building")},
+        {"objet": building, "objet_name": _("building")},
         "topologie/delete.html",
         request,
     )
@@ -966,7 +967,7 @@ def new_dormitory(request):
         messages.success(request, _("The dormitory was created."))
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"topoform": dormitory, "action_name": _("Create")},
+        {"topoform": dormitory, "action_name": _("Add")},
         "topologie/topo.html",
         request,
     )
@@ -1012,7 +1013,7 @@ def del_dormitory(request, dormitory, **_kwargs):
             )
         return redirect(reverse("topologie:index-physical-grouping"))
     return form(
-        {"objet": dormitory, "objet_name": _("Dormitory")},
+        {"objet": dormitory, "objet_name": _("dormitory")},
         "topologie/delete.html",
         request,
     )
@@ -1028,7 +1029,7 @@ def new_constructor_switch(request):
         messages.success(request, _("The switch constructor was created."))
         return redirect(reverse("topologie:index-model-switch"))
     return form(
-        {"topoform": constructor_switch, "action_name": _("Create")},
+        {"topoform": constructor_switch, "action_name": _("Add")},
         "topologie/topo.html",
         request,
     )
@@ -1075,7 +1076,7 @@ def del_constructor_switch(request, constructor_switch, **_kwargs):
             )
         return redirect(reverse("topologie:index-model-switch"))
     return form(
-        {"objet": constructor_switch, "objet_name": _("Switch constructor")},
+        {"objet": constructor_switch, "objet_name": _("switch constructor")},
         "topologie/delete.html",
         request,
     )
@@ -1091,7 +1092,7 @@ def new_port_profile(request):
         messages.success(request, _("The port profile was created."))
         return redirect(reverse("topologie:index-port-profile"))
     return form(
-        {"topoform": port_profile, "action_name": _("Create")},
+        {"topoform": port_profile, "action_name": _("Add")},
         "topologie/topo.html",
         request,
     )
@@ -1126,7 +1127,7 @@ def del_port_profile(request, port_profile, **_kwargs):
             messages.success(request, _("Impossible to delete the port profile."))
         return redirect(reverse("topologie:index-port-profile"))
     return form(
-        {"objet": port_profile, "objet_name": _("Port profile")},
+        {"objet": port_profile, "objet_name": _("port profile")},
         "topologie/delete.html",
         request,
     )
@@ -1142,7 +1143,7 @@ def add_module(request):
         messages.success(request, _("The module was created."))
         return redirect(reverse("topologie:index-module"))
     return form(
-        {"topoform": module, "action_name": _("Create")}, "topologie/topo.html", request
+        {"topoform": module, "action_name": _("Add")}, "topologie/topo.html", request
     )
 
 
@@ -1182,7 +1183,7 @@ def del_module(request, module, **_kwargs):
             )
         return redirect(reverse("topologie:index-module"))
     return form(
-        {"objet": module, "objet_name": _("Module")}, "topologie/delete.html", request
+        {"objet": module, "objet_name": _("module")}, "topologie/delete.html", request
     )
 
 
@@ -1238,7 +1239,7 @@ def del_module_on(request, module, **_kwargs):
             )
         return redirect(reverse("topologie:index-module"))
     return form(
-        {"objet": module, "objet_name": _("Module")}, "topologie/delete.html", request
+        {"objet": module, "objet_name": _("module")}, "topologie/delete.html", request
     )
 
 
diff --git a/users/acl.py b/users/acl.py
index 993870a7..d66b3d2c 100644
--- a/users/acl.py
+++ b/users/acl.py
@@ -41,6 +41,6 @@ def can_view(user):
     can = user.has_module_perms("users")
     return (
         can,
-        None if can else _("You don't have the right to view this" " application."),
+        None if can else _("You don't have the right to view this application."),
         ("users",),
     )
diff --git a/users/forms.py b/users/forms.py
index 782e5aa1..cef1e43a 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -150,7 +150,7 @@ class UserCreationForm(FormRevMixin, forms.ModelForm):
             return self.cleaned_data.get("email").lower()
         else:
             raise forms.ValidationError(
-                _("You can't use an internal address" " as your external address.")
+                _("You can't use an internal address as your external address.")
             )
 
     class Meta:
@@ -293,7 +293,7 @@ class MassArchiveForm(forms.Form):
     date = forms.DateTimeField(help_text="%d/%m/%y")
     full_archive = forms.BooleanField(
         label=_(
-            "Make a full archive operation ? (WARNING : CRITICAL OPERATION IF TRUE)"
+            "Fully archive users? WARNING: CRITICAL OPERATION IF TRUE"
         ),
         initial=False,
         required=False,
@@ -384,15 +384,14 @@ class AdherentCreationForm(AdherentForm):
 
     # Champ permettant d'éviter au maxium les doublons d'utilisateurs
     former_user_check_info = _(
-        "If you already have an account, please use it. "
-        + "If your lost access to it, please consider "
-        + "using the forgotten password button on the "
-        + "login page or contacting support."
+        "If you already have an account, please use it. If your lost access to"
+        " it, please consider using the forgotten password button on the"
+        " login page or contacting support."
     )
     former_user_check = forms.BooleanField(
         required=True, help_text=former_user_check_info
     )
-    former_user_check.label = _("I certify that I have not had an account before")
+    former_user_check.label = _("I certify that I have not had an account before.")
 
     # Checkbox for GTU
     gtu_check = forms.BooleanField(required=True)
@@ -657,7 +656,7 @@ class NewListRightForm(ListRightForm):
     def __init__(self, *args, **kwargs):
         super(NewListRightForm, self).__init__(*args, **kwargs)
         self.fields["gid"].label = _(
-            "GID. Warning: this field must not be" " edited after creation."
+            "GID. Warning: this field must not be edited after creation."
         )
 
 
@@ -734,7 +733,7 @@ class EMailAddressForm(FormRevMixin, ModelForm):
         prefix = kwargs.pop("prefix", self.Meta.model.__name__)
         super(EMailAddressForm, self).__init__(*args, prefix=prefix, **kwargs)
         self.fields["local_part"].label = _("Local part of the email address")
-        self.fields["local_part"].help_text = _("Can't contain @")
+        self.fields["local_part"].help_text = _("Can't contain @.")
 
     def clean_local_part(self):
         return self.cleaned_data.get("local_part").lower()
diff --git a/users/locale/fr/LC_MESSAGES/django.po b/users/locale/fr/LC_MESSAGES/django.po
index 023857d0..55780636 100644
--- a/users/locale/fr/LC_MESSAGES/django.po
+++ b/users/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 19:48+0200\n"
+"POT-Creation-Date: 2019-11-19 23:43+0100\n"
 "PO-Revision-Date: 2018-06-27 23:35+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -31,132 +31,133 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: users/acl.py:41
+#: users/acl.py:44
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: users/forms.py:80
+#: users/forms.py:78
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: users/forms.py:85 users/forms.py:521 users/forms.py:548
+#: users/forms.py:81 users/forms.py:528 users/forms.py:556
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: users/forms.py:91
+#: users/forms.py:87
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: users/forms.py:108
+#: users/forms.py:103
 msgid "The new passwords don't match."
 msgstr "Les nouveaux mots de passe ne correspondent pas."
 
-#: users/forms.py:117
+#: users/forms.py:109
 msgid "The current password is incorrect."
 msgstr "Le mot de passe actuel est incorrect."
 
-#: users/forms.py:136 users/forms.py:189 users/models.py:1667
+#: users/forms.py:129 users/forms.py:186 users/models.py:1760
 msgid "Password"
 msgstr "Mot de passe"
 
-#: users/forms.py:142 users/forms.py:195
+#: users/forms.py:135 users/forms.py:189
 msgid "Password confirmation"
 msgstr "Confirmation du mot de passe"
 
-#: users/forms.py:147 users/forms.py:238
+#: users/forms.py:140 users/forms.py:229
 msgid "Is admin"
 msgstr "Est admin"
 
-#: users/forms.py:157
+#: users/forms.py:153
 msgid "You can't use an internal address as your external address."
 msgstr ""
 "Vous ne pouvez pas utiliser une adresse interne pour votre adresse externe."
 
-#: users/forms.py:170 users/forms.py:219
+#: users/forms.py:166 users/forms.py:209
 msgid "The passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
-#: users/forms.py:247
+#: users/forms.py:238
 #, python-format
 msgid "User is admin: %s"
 msgstr "L'utilisateur est admin : %s"
 
-#: users/forms.py:295 users/templates/users/aff_clubs.html:38
+#: users/forms.py:284 users/templates/users/aff_clubs.html:38
 #: users/templates/users/aff_listright.html:63
 #: users/templates/users/aff_listright.html:168
 #: users/templates/users/aff_users.html:39
-#: users/templates/users/profil.html:178 users/templates/users/profil.html:335
-#: users/templates/users/profil.html:354
+#: users/templates/users/profil.html:178 users/templates/users/profil.html:342
+#: users/templates/users/profil.html:361
 msgid "Username"
 msgstr "Pseudo"
 
-#: users/forms.py:305
-msgid "Make a full archive operation ? (WARNING : CRITICAL OPERATION IF TRUE)"
+#: users/forms.py:296
+msgid "Fully archive users? WARNING: CRITICAL OPERATION IF TRUE"
 msgstr ""
+"Complètement archiver les utilisateurs ? ATTENTION: OPÉRATION CRITIQUE SI OUI"
 
-#: users/forms.py:315
+#: users/forms.py:309
 msgid "Impossible to archive users whose end access date is in the future."
 msgstr ""
 "Impossible d'archiver des utilisateurs dont la date de fin de connexion est "
 "dans le futur."
 
-#: users/forms.py:327 users/templates/users/profil.html:167
-#: users/templates/users/profil.html:334 users/templates/users/profil.html:353
+#: users/forms.py:324 users/templates/users/profil.html:167
+#: users/templates/users/profil.html:341 users/templates/users/profil.html:360
 msgid "First name"
 msgstr "Prénom"
 
-#: users/forms.py:328 users/templates/users/aff_users.html:37
-#: users/templates/users/profil.html:173 users/templates/users/profil.html:333
-#: users/templates/users/profil.html:352
+#: users/forms.py:325 users/templates/users/aff_users.html:37
+#: users/templates/users/profil.html:173 users/templates/users/profil.html:340
+#: users/templates/users/profil.html:359
 msgid "Surname"
 msgstr "Nom"
 
-#: users/forms.py:329 users/forms.py:456 users/models.py:1668
+#: users/forms.py:326 users/forms.py:466 users/models.py:1760
 #: users/templates/users/aff_emailaddress.html:36
 #: users/templates/users/profil.html:183
 msgid "Email address"
 msgstr "Adresse mail"
 
-#: users/forms.py:330 users/forms.py:454 users/forms.py:604
+#: users/forms.py:327 users/forms.py:464 users/forms.py:614
 #: users/templates/users/aff_schools.html:37
-#: users/templates/users/profil.html:201
+#: users/templates/users/profil.html:204
 msgid "School"
 msgstr "Établissement"
 
-#: users/forms.py:331 users/forms.py:455 users/models.py:1321
+#: users/forms.py:328 users/forms.py:465
 #: users/templates/users/aff_serviceusers.html:34
-#: users/templates/users/profil.html:206
+#: users/templates/users/profil.html:209
 msgid "Comment"
 msgstr "Commentaire"
 
-#: users/forms.py:333 users/forms.py:458
+#: users/forms.py:330 users/forms.py:468
 #: users/templates/users/aff_clubs.html:40
 #: users/templates/users/aff_users.html:41
 #: users/templates/users/profil.html:188
 msgid "Room"
 msgstr "Chambre"
 
-#: users/forms.py:334 users/forms.py:459
+#: users/forms.py:331 users/forms.py:469
 msgid "No room"
 msgstr "Pas de chambre"
 
-#: users/forms.py:335 users/forms.py:460
+#: users/forms.py:332 users/forms.py:470
 msgid "Select a school"
 msgstr "Sélectionnez un établissement"
 
-#: users/forms.py:351
+#: users/forms.py:348
 msgid "Force the move?"
 msgstr "Forcer le déménagement ?"
 
-#: users/forms.py:361 users/forms.py:744
+#: users/forms.py:358 users/forms.py:765
 msgid "You can't use a {} address."
 msgstr "Vous ne pouvez pas utiliser une adresse {}."
 
-#: users/forms.py:370 users/forms.py:484
+#: users/forms.py:368 users/forms.py:493
 msgid "A valid telephone number is required."
 msgstr "Un numéro de téléphone valide est requis."
 
-#: users/forms.py:388
+#: users/forms.py:387
 msgid ""
 "If you already have an account, please use it. If your lost access to it, "
 "please consider using the forgotten password button on the login page or "
@@ -167,290 +168,293 @@ msgstr ""
 "passe oublié est à votre disposition. Si vous avez oublié votre login, "
 "contactez le support."
 
-#: users/forms.py:393
-msgid "I certify that I have not had an account before"
-msgstr "Je certifie sur l'honneur ne pas déjà avoir de compte"
+#: users/forms.py:394
+msgid "I certify that I have not had an account before."
+msgstr "Je certifie sur l'honneur ne pas déjà avoir de compte."
 
-#: users/forms.py:397
+#: users/forms.py:419
 msgid "I commit to accept the"
 msgstr "J'accepte les"
 
-#: users/forms.py:427
+#: users/forms.py:421
+msgid "General Terms of Use"
+msgstr "Conditions Générales d'Utilisation"
+
+#: users/forms.py:433
 msgid "Leave empty if you don't have any GPG key."
 msgstr "Laissez vide si vous n'avez pas de clé GPG."
 
-#: users/forms.py:429
+#: users/forms.py:436
 msgid "Default shell"
 msgstr "Interface en ligne de commande par défaut"
 
-#: users/forms.py:453 users/templates/users/aff_clubs.html:36
+#: users/forms.py:463 users/templates/users/aff_clubs.html:36
 #: users/templates/users/aff_serviceusers.html:32
 msgid "Name"
 msgstr "Nom"
 
-#: users/forms.py:461
+#: users/forms.py:471
 msgid "Use a mailing list"
 msgstr "Utiliser une liste de diffusion"
 
-#: users/forms.py:592 users/templates/users/aff_listright.html:38
+#: users/forms.py:601 users/templates/users/aff_listright.html:38
 msgid "Superuser"
 msgstr "Superutilisateur"
 
-#: users/forms.py:616
+#: users/forms.py:627
 msgid "Shell name"
 msgstr "Nom de l'interface en ligne de commande"
 
-#: users/forms.py:635
+#: users/forms.py:647
 msgid "Name of the group of rights"
 msgstr "Nom du groupe de droits"
 
-#: users/forms.py:646
+#: users/forms.py:659
 msgid "GID. Warning: this field must not be edited after creation."
 msgstr "GID. Attention : ce champ ne doit pas être modifié après création."
 
-#: users/forms.py:654
+#: users/forms.py:668
 msgid "Current groups of rights"
 msgstr "Groupes de droits actuels"
 
-#: users/forms.py:671
+#: users/forms.py:686
 msgid "Current schools"
 msgstr "Établissements actuels"
 
-#: users/forms.py:689 users/forms.py:703 users/templates/users/aff_bans.html:41
+#: users/forms.py:705 users/forms.py:720 users/templates/users/aff_bans.html:41
 #: users/templates/users/aff_whitelists.html:41
 msgid "End date"
 msgstr "Date de fin"
 
-#: users/forms.py:717 users/models.py:1865
+#: users/forms.py:735
 msgid "Local part of the email address"
 msgstr "Partie locale de l'adresse mail"
 
-#: users/forms.py:718
-msgid "Can't contain @"
-msgstr "Ne peut pas contenir @"
+#: users/forms.py:736
+msgid "Can't contain @."
+msgstr "Ne peut pas contenir @."
 
-#: users/forms.py:733
+#: users/forms.py:752
 msgid "Main email address"
 msgstr "Adresse mail principale"
 
-#: users/forms.py:735
+#: users/forms.py:754
 msgid "Redirect local emails"
 msgstr "Rediriger les mails locaux"
 
-#: users/forms.py:737
+#: users/forms.py:756
 msgid "Use local emails"
 msgstr "Utiliser les mails locaux"
 
-#: users/forms.py:777
+#: users/forms.py:808
 msgid "This room is my room"
 msgstr "Il s'agit bien de ma chambre"
 
-#: users/forms.py:781
+#: users/forms.py:813
 msgid "This new connected device is mine"
 msgstr "Ce nouvel appareil connecté m'appartient"
 
 #: users/models.py:105
 #, python-format
-msgid "The username '%(label)s' contains forbidden characters."
-msgstr "Le pseudo '%(label)s' contient des caractères interdits."
+msgid "The username \"%(label)s\" contains forbidden characters."
+msgstr "Le pseudo « %(label)s » contient des caractères interdits."
 
-#: users/models.py:147
+#: users/models.py:134
 msgid "Users must have an username."
 msgstr "Les utilisateurs doivent avoir un pseudo."
 
-#: users/models.py:150
+#: users/models.py:137
 msgid "Username should only contain [a-z0-9-]."
 msgstr "Le pseudo devrait seulement contenir [a-z0-9-]"
 
-#: users/models.py:192 users/templates/users/aff_clubs.html:55
+#: users/models.py:180 users/templates/users/aff_clubs.html:55
 #: users/templates/users/aff_users.html:57
-#: users/templates/users/profil.html:250
+#: users/templates/users/profil.html:253
 msgid "Active"
 msgstr "Actif"
 
-#: users/models.py:193 users/templates/users/aff_clubs.html:57
+#: users/models.py:181 users/templates/users/aff_clubs.html:57
 #: users/templates/users/aff_users.html:59
-#: users/templates/users/profil.html:252 users/templates/users/profil.html:268
+#: users/templates/users/profil.html:255 users/templates/users/profil.html:271
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: users/models.py:194 users/templates/users/profil.html:254
+#: users/models.py:182 users/templates/users/profil.html:257
 msgid "Archived"
 msgstr "Archivé"
 
-#: users/models.py:195
+#: users/models.py:183 users/templates/users/profil.html:259
 msgid "Not yet active"
 msgstr "Pas encore adhéré"
 
-#: users/models.py:196 users/templates/users/profil.html:258
-#, fuzzy
-#| msgid "Archived"
-msgid "Full Archived"
-msgstr "Archivé"
+#: users/models.py:184 users/templates/users/profil.html:261
+msgid "Fully archived"
+msgstr "Complètement archivé"
 
-#: users/models.py:203 users/models.py:1312
+#: users/models.py:191 users/models.py:1416
 msgid "Must only contain letters, numerals or dashes."
 msgstr "Doit seulement contenir des lettres, chiffres ou tirets."
 
-#: users/models.py:209
+#: users/models.py:197
 msgid "External email address allowing us to contact you."
 msgstr "Adresse mail externe nous permettant de vous contacter."
 
-#: users/models.py:213
+#: users/models.py:202
 msgid ""
 "Enable redirection of the local email messages to the main email address."
 msgstr ""
 "Activer la redirection des mails locaux vers l'adresse mail principale."
 
-#: users/models.py:218
+#: users/models.py:207
 msgid "Enable the local email account."
 msgstr "Activer le compte mail local"
 
-#: users/models.py:233
-msgid "Comment, school year"
-msgstr "Commentaire, promotion"
+#: users/models.py:216
+msgid "Comment, school year."
+msgstr "Commentaire, promotion."
 
-#: users/models.py:259
+#: users/models.py:225
+msgid "enable shortcuts on Re2o website"
+msgstr "activer les raccourcis sur le site de Re2o"
+
+#: users/models.py:235
 msgid "Can change the password of a user"
 msgstr "Peut changer le mot de passe d'un utilisateur"
 
-#: users/models.py:260
+#: users/models.py:236
 msgid "Can edit the state of a user"
 msgstr "Peut changer l'état d'un utilisateur"
 
-#: users/models.py:261
+#: users/models.py:237
 msgid "Can force the move"
 msgstr "Peut forcer le déménagement"
 
-#: users/models.py:262
+#: users/models.py:238
 msgid "Can edit the shell of a user"
 msgstr "Peut modifier l'interface en ligne de commande d'un utilisateur"
 
-#: users/models.py:264
+#: users/models.py:241
 msgid "Can edit the groups of rights of a user (critical permission)"
 msgstr ""
 "Peut modifier les groupes de droits d'un utilisateur (permission critique)"
 
-#: users/models.py:267
-msgid "Can edit all users, including those with rights."
+#: users/models.py:243
+msgid "Can edit all users, including those with rights"
 msgstr ""
-"Peut modifier tous les utilisateurs, y compris ceux possédant des droits."
+"Peut modifier tous les utilisateurs, y compris ceux possédant des droits"
 
-#: users/models.py:269
+#: users/models.py:244
 msgid "Can view a user object"
 msgstr "Peut voir un objet utilisateur"
 
-#: users/models.py:271
+#: users/models.py:246
 msgid "user (member or club)"
 msgstr "utilisateur (adhérent ou club)"
 
-#: users/models.py:272
+#: users/models.py:247
 msgid "users (members or clubs)"
 msgstr "utilisateurs (adhérents ou clubs)"
 
-#: users/models.py:290 users/models.py:314
+#: users/models.py:265 users/models.py:293
 msgid "Unknown type."
 msgstr "Type inconnu."
 
-#: users/models.py:310 users/templates/users/aff_listright.html:75
+#: users/models.py:289 users/templates/users/aff_listright.html:75
 #: users/templates/users/aff_listright.html:180
 msgid "Member"
 msgstr "Adhérent"
 
-#: users/models.py:312
+#: users/models.py:291
 msgid "Club"
 msgstr "Club"
 
-#: users/models.py:554 users/models.py:568
-msgid "IPv4 assigning"
-msgstr "Attribution de l'IPv4"
-
-#: users/models.py:561
-msgid "IPv4 unassigning"
-msgstr "Désattribution de l'IPv4"
-
-#: users/models.py:770
+#: users/models.py:781
 msgid "Maximum number of registered machines reached."
 msgstr "Nombre maximum de machines enregistrées atteint."
 
-#: users/models.py:772
+#: users/models.py:783
 msgid "Re2o doesn't know wich machine type to assign."
 msgstr "Re2o ne sait pas quel type de machine attribuer."
 
-#: users/models.py:795 users/templates/users/user_autocapture.html:64
+#: users/models.py:806 users/templates/users/user_autocapture.html:64
 msgid "OK"
 msgstr "OK"
 
-#: users/models.py:869 users/models.py:906
+#: users/models.py:878
+msgid "This user is archived."
+msgstr "Cet utilisateur est archivé."
+
+#: users/models.py:892 users/models.py:946
 msgid "You don't have the right to edit this club."
 msgstr "Vous n'avez pas le droit de modifier ce club."
 
-#: users/models.py:877
+#: users/models.py:904
 msgid "User with critical rights, can't be edited."
 msgstr "Utilisateur avec des droits critiques, ne peut être modifié."
 
-#: users/models.py:880
+#: users/models.py:911
 msgid ""
-"Impossible to edit the organisation's user without the 'change_all_users' "
+"Impossible to edit the organisation's user without the \"change_all_users\" "
 "right."
 msgstr ""
-"Impossible de modifier l'utilisateur de l'association sans le droit "
-"'change_all_users'."
+"Impossible de modifier l'utilisateur de l'association sans le droit « "
+"change_all_users »."
 
-#: users/models.py:888 users/models.py:917
+#: users/models.py:923 users/models.py:961
 msgid "You don't have the right to edit another user."
 msgstr "Vous n'avez pas le droit de modifier un autre utilisateur."
 
-#: users/models.py:935
-msgid "Permission required to change the room."
-msgstr "Permission requise pour changer la chambre."
+#: users/models.py:987
+msgid "You don't have the right to change the room."
+msgstr "Vous n'avez pas le droit de changer la chambre."
 
-#: users/models.py:949
-msgid "Permission required to change the state."
-msgstr "Permission requise pour changer l'état."
+#: users/models.py:1004
+msgid "You don't have the right to change the state."
+msgstr "Vous n'avez pas le droit de changer l'état."
 
-#: users/models.py:961
-msgid "Permission required to change the shell."
-msgstr "Permission requise pour changer l'interface en ligne de commande."
+#: users/models.py:1024
+msgid "You don't have the right to change the shell."
+msgstr "Vous n'avez pas le droit de changer l'interface en ligne de commande."
 
-#: users/models.py:975 users/models.py:988
+#: users/models.py:1041 users/models.py:1056
 msgid "Local email accounts must be enabled."
 msgstr "Les comptes mail locaux doivent être activés."
 
-#: users/models.py:1001
-msgid "Permission required to force the move."
-msgstr "Permission requise pour forcer le déménagement."
+#: users/models.py:1071
+msgid "You don't have the right to force the move."
+msgstr "Vous n'avez pas le droit de forcer le déménagement."
 
-#: users/models.py:1014
-msgid "Permission required to edit the user's groups of rights."
+#: users/models.py:1086
+msgid "You don't have the right to edit the user's groups of rights."
 msgstr ""
-"Permission requise pour modifier les groupes de droits de l'utilisateur."
+"Vous n'avez pas le droit de modifier les groupes de droits d'un autre "
+"utilisateur."
 
-#: users/models.py:1026
-msgid "'superuser' right required to edit the superuser flag."
-msgstr "Droit 'superuser' requis pour modifier le signalement superuser."
+#: users/models.py:1102
+msgid "\"superuser\" right required to edit the superuser flag."
+msgstr "Droit « superuser » requis pour modifier le signalement superuser."
 
-#: users/models.py:1044
+#: users/models.py:1127
 msgid "You don't have the right to view this club."
 msgstr "Vous n'avez pas le droit de voir ce club."
 
-#: users/models.py:1050
+#: users/models.py:1136
 msgid "You don't have the right to view another user."
 msgstr "Vous n'avez pas le droit de voir un autre utilisateur."
 
-#: users/models.py:1063 users/models.py:1244
+#: users/models.py:1151 users/models.py:1354
 msgid "You don't have the right to view the list of users."
 msgstr "Vous n'avez pas le droit de voir la liste des utilisateurs."
 
-#: users/models.py:1076
+#: users/models.py:1168
 msgid "You don't have the right to delete this user."
 msgstr "Vous n'avez pas le droit de supprimer cet utilisateur."
 
-#: users/models.py:1097
+#: users/models.py:1190
 msgid "This username is already used."
 msgstr "Ce pseudo est déjà utilisé."
 
-#: users/models.py:1099
+#: users/models.py:1198
 msgid ""
 "There is neither a local email address nor an external email address for "
 "this user."
@@ -458,7 +462,7 @@ msgstr ""
 "Il n'y a pas d'adresse mail locale ni d'adresse mail externe pour cet "
 "utilisateur."
 
-#: users/models.py:1103
+#: users/models.py:1205
 msgid ""
 "You can't redirect your local emails if no external email address has been "
 "set."
@@ -466,179 +470,195 @@ msgstr ""
 "Vous ne pouvez pas rediriger vos mails locaux si aucune adresse mail externe "
 "n'a été définie."
 
-#: users/models.py:1129
+#: users/models.py:1225
 msgid "member"
 msgstr "adhérent"
 
-#: users/models.py:1130
+#: users/models.py:1226
 msgid "members"
 msgstr "adhérents"
 
-#: users/models.py:1141
-msgid "A GPG fingerprint must contain 40 hexadecimal characters"
-msgstr "Une empreinte GPG doit contenir 40 caractères hexadécimaux"
+#: users/models.py:1243
+msgid "A GPG fingerprint must contain 40 hexadecimal characters."
+msgstr "Une empreinte GPG doit contenir 40 caractères hexadécimaux."
 
-#: users/models.py:1171
+#: users/models.py:1267
+msgid "Self registration is disabled."
+msgstr "L'auto inscription est désactivée."
+
+#: users/models.py:1277
 msgid "You don't have the right to create a user."
 msgstr "Vous n'avez pas le droit de créer un utilisateur."
 
-#: users/models.py:1207
+#: users/models.py:1307
 msgid "club"
 msgstr "club"
 
-#: users/models.py:1208
+#: users/models.py:1308
 msgid "clubs"
 msgstr "clubs"
 
-#: users/models.py:1226
+#: users/models.py:1319
+msgid "You must be authenticated."
+msgstr "Vous devez être authentifié."
+
+#: users/models.py:1327
 msgid "You don't have the right to create a club."
 msgstr "Vous n'avez pas le droit de créer un club."
 
-#: users/models.py:1331
+#: users/models.py:1420
+msgid "Comment."
+msgstr "Commentaire."
+
+#: users/models.py:1426
 msgid "Can view a service user object"
 msgstr "Peut voir un objet utilisateur service"
 
-#: users/models.py:1333
+#: users/models.py:1427 users/views.py:332
 msgid "service user"
 msgstr "utilisateur service"
 
-#: users/models.py:1334
+#: users/models.py:1428
 msgid "service users"
 msgstr "utilisateurs service"
 
-#: users/models.py:1338
+#: users/models.py:1432
 #, python-brace-format
 msgid "Service user <{name}>"
 msgstr "Utilisateur service <{name}>"
 
-#: users/models.py:1400
+#: users/models.py:1499
 msgid "Can view a school object"
 msgstr "Peut voir un objet établissement"
 
-#: users/models.py:1402
+#: users/models.py:1500
 msgid "school"
 msgstr "établissement"
 
-#: users/models.py:1403
+#: users/models.py:1501
 msgid "schools"
 msgstr "établissements"
 
-#: users/models.py:1421
-msgid "UNIX groups can only contain lower case letters."
-msgstr "Les groupes UNIX peuvent seulement contenir des lettres minuscules."
+#: users/models.py:1520
+msgid "UNIX group names can only contain lower case letters."
+msgstr ""
+"Les noms de groupe UNIX peuvent seulement contenir des lettres minuscules."
 
-#: users/models.py:1427
-msgid "Description"
-msgstr "Description"
+#: users/models.py:1526
+msgid "Description."
+msgstr "Description."
 
-#: users/models.py:1434
+#: users/models.py:1529
 msgid "Can view a group of rights object"
 msgstr "Peut voir un objet groupe de droits"
 
-#: users/models.py:1436
+#: users/models.py:1530
 msgid "group of rights"
 msgstr "groupe de droits"
 
-#: users/models.py:1437
+#: users/models.py:1531
 msgid "groups of rights"
 msgstr "groupes de droits"
 
-#: users/models.py:1484
+#: users/models.py:1576
 msgid "Can view a shell object"
 msgstr "Peut voir un objet interface en ligne de commande"
 
-#: users/models.py:1486
+#: users/models.py:1577 users/views.py:643
 msgid "shell"
 msgstr "interface en ligne de commande"
 
-#: users/models.py:1487
+#: users/models.py:1578
 msgid "shells"
 msgstr "interfaces en ligne de commande"
 
-#: users/models.py:1506
+#: users/models.py:1596
 msgid "HARD (no access)"
 msgstr "HARD (pas d'accès)"
 
-#: users/models.py:1507
+#: users/models.py:1597
 msgid "SOFT (local access only)"
 msgstr "SOFT (accès local uniquement)"
 
-#: users/models.py:1508
+#: users/models.py:1598
 msgid "RESTRICTED (speed limitation)"
 msgstr "RESTRICTED (limitation de vitesse)"
 
-#: users/models.py:1519
+#: users/models.py:1608
 msgid "Can view a ban object"
 msgstr "Peut voir un objet bannissement"
 
-#: users/models.py:1521
+#: users/models.py:1609 users/views.py:383
 msgid "ban"
 msgstr "bannissement"
 
-#: users/models.py:1522
+#: users/models.py:1610
 msgid "bans"
 msgstr "bannissements"
 
-#: users/models.py:1556
-msgid "You don't have the right to view bans other than yours."
+#: users/models.py:1645
+msgid "You don't have the right to view other bans than yours."
 msgstr ""
-"Vous n'avez pas le droit de voir des bannissements autres que les vôtres."
+"Vous n'avez pas le droit de voir d'autres bannissements que les vôtres."
 
-#: users/models.py:1604
+#: users/models.py:1693
 msgid "Can view a whitelist object"
 msgstr "Peut voir un objet accès gracieux"
 
-#: users/models.py:1606
+#: users/models.py:1694
 msgid "whitelist (free of charge access)"
 msgstr "Accès gracieux"
 
-#: users/models.py:1607
+#: users/models.py:1695
 msgid "whitelists (free of charge access)"
 msgstr "Accès gracieux"
 
-#: users/models.py:1623
-msgid "You don't have the right to view whitelists other than yours."
+#: users/models.py:1715
+msgid "You don't have the right to view other whitelists than yours."
 msgstr ""
-"Vous n'avez pas le droit de voir des accès gracieux autres que les vôtres."
+"Vous n'avez pas le droit de voir d'autres accès gracieux que les vôtres."
 
-#: users/models.py:1860
-msgid "User of the local email account"
-msgstr "Utilisateur du compte mail local"
+#: users/models.py:1912
+msgid "User of the local email account."
+msgstr "Utilisateur du compte mail local."
 
-#: users/models.py:1870
+#: users/models.py:1915
+msgid "Local part of the email address."
+msgstr "Partie locale de l'adresse mail."
+
+#: users/models.py:1920
 msgid "Can view a local email account object"
 msgstr "Peut voir un objet compte mail local"
 
-#: users/models.py:1872
+#: users/models.py:1922
 msgid "local email account"
 msgstr "compte mail local"
 
-#: users/models.py:1873
+#: users/models.py:1923
 msgid "local email accounts"
 msgstr "comptes mail locaux"
 
-#: users/models.py:1897 users/models.py:1920 users/models.py:1942
-#: users/models.py:1964
+#: users/models.py:1951 users/models.py:1986 users/models.py:2020
+#: users/models.py:2054
 msgid "The local email accounts are not enabled."
 msgstr "Les comptes mail locaux ne sont pas activés."
 
-#: users/models.py:1899
+#: users/models.py:1956
 msgid "You don't have the right to add a local email account to another user."
 msgstr ""
 "Vous n'avez pas le droit d'ajouter un compte mail local à un autre "
 "utilisateur."
 
-#: users/models.py:1902
+#: users/models.py:1966
 msgid "You reached the limit of {} local email accounts."
 msgstr "Vous avez atteint la limite de {} comptes mail locaux."
 
-#: users/models.py:1923 users/models.py:1967
-msgid "You don't have the right to edit another user's local email account."
+#: users/models.py:1992
+msgid "You don't have the right to view another user's local email account."
 msgstr ""
-"Vous n'avez pas le droit de modifier le compte mail local d'un autre "
-"utilisateur."
+"Vous n'avez pas le droit de voir le compte mail local d'un autre utilisateur."
 
-#: users/models.py:1937
+#: users/models.py:2012
 msgid ""
 "You can't delete a local email account whose local part is the same as the "
 "username."
@@ -646,13 +666,13 @@ msgstr ""
 "Vous ne pouvez pas supprimer un compte mail local dont la partie locale est "
 "la même que le pseudo."
 
-#: users/models.py:1945
-msgid "You don't have the right to delete another user's local email account"
+#: users/models.py:2026
+msgid "You don't have the right to delete another user's local email account."
 msgstr ""
 "Vous n'avez pas le droit de supprimer le compte mail local d'un autre "
 "utilisateur."
 
-#: users/models.py:1959
+#: users/models.py:2046
 msgid ""
 "You can't edit a local email account whose local part is the same as the "
 "username."
@@ -660,7 +680,13 @@ msgstr ""
 "Vous ne pouvez pas modifier un compte mail local dont la partie locale est "
 "la même que le pseudo."
 
-#: users/models.py:1973
+#: users/models.py:2060
+msgid "You don't have the right to edit another user's local email account."
+msgstr ""
+"Vous n'avez pas le droit de modifier le compte mail local d'un autre "
+"utilisateur."
+
+#: users/models.py:2069
 msgid "The local part must not contain @ or +."
 msgstr "La partie locale ne doit pas contenir @ ou +."
 
@@ -686,7 +712,7 @@ msgstr "Fin de cotisation le"
 
 #: users/templates/users/aff_clubs.html:43
 #: users/templates/users/aff_users.html:44
-#: users/templates/users/profil.html:263
+#: users/templates/users/profil.html:266
 msgid "Internet access"
 msgstr "Accès Internet"
 
@@ -697,12 +723,12 @@ msgstr "Profil"
 
 #: users/templates/users/aff_clubs.html:53
 #: users/templates/users/aff_users.html:54
-#: users/templates/users/profil.html:225
+#: users/templates/users/profil.html:228
 msgid "Not a member"
 msgstr "Non adhérent"
 
 #: users/templates/users/aff_listright.html:40
-msgid "Django's specific pre-defined right that supersed any other rights."
+msgid "Django's specific pre-defined right that supersedes any other rights."
 msgstr ""
 "Droit prédéfini spécifique à Django qui outrepasse tous les autres droits."
 
@@ -716,7 +742,7 @@ msgid "Users in Superuser"
 msgstr "Utilisateurs dans Superuser"
 
 #: users/templates/users/aff_listright.html:53
-#: users/templates/users/aff_listright.html:154 users/widgets.py:35
+#: users/templates/users/aff_listright.html:154 users/widgets.py:38
 msgid "Close"
 msgstr "Fermer"
 
@@ -791,11 +817,11 @@ msgid "Users in %(right_name)s"
 msgstr "Utilisateurs dans %(right_name)s"
 
 #: users/templates/users/aff_serviceusers.html:33
-msgid "Role"
-msgstr "Rôle"
+msgid "Access group"
+msgstr "Group d'accès"
 
 #: users/templates/users/aff_shell.html:32
-#: users/templates/users/profil.html:304
+#: users/templates/users/profil.html:307
 msgid "Shell"
 msgstr "Interface en ligne de commande"
 
@@ -817,12 +843,13 @@ msgstr ""
 "( %(objet)s ) ?"
 
 #: users/templates/users/delete.html:36
-#: users/templates/users/mass_archive.html:36
+#: users/templates/users/mass_archive.html:36 users/views.py:600
+#: users/views.py:704
 msgid "Confirm"
 msgstr "Confirmer"
 
 #: users/templates/users/index_ban.html:32
-#: users/templates/users/profil.html:431 users/templates/users/sidebar.html:58
+#: users/templates/users/profil.html:438 users/templates/users/sidebar.html:58
 msgid "Bans"
 msgstr "Bannissements"
 
@@ -839,12 +866,12 @@ msgid "List of groups of rights"
 msgstr "Liste des groupes de droits"
 
 #: users/templates/users/index_listright.html:35
-msgid " Add a group of rights"
-msgstr " Ajouter un groupe de droits"
+msgid "Add a group of rights"
+msgstr "Ajouter un groupe de droits"
 
 #: users/templates/users/index_listright.html:37
-msgid " Delete one or several groups of rights"
-msgstr " Supprimer un ou plusieurs groupes de droits"
+msgid "Delete one or several groups of rights"
+msgstr "Supprimer un ou plusieurs groupes de droits"
 
 #: users/templates/users/index_rights.html:32
 msgid "Rights"
@@ -855,16 +882,16 @@ msgid "List of schools"
 msgstr "Liste des établissements"
 
 #: users/templates/users/index_schools.html:34
-msgid "List of schools for created users"
-msgstr "Liste des établissements pour les utilisateurs créés"
+msgid "List of schools for registered users"
+msgstr "Liste des établissements pour les utilisateurs enregistrés"
 
 #: users/templates/users/index_schools.html:36
-msgid " Add a school"
-msgstr " Ajouter un établissement"
+msgid "Add a school"
+msgstr "Ajouter un établissement"
 
 #: users/templates/users/index_schools.html:38
-msgid " Delete one or several schools"
-msgstr " Supprimer un ou plusieurs établissements"
+msgid "Delete one or several schools"
+msgstr "Supprimer un ou plusieurs établissements"
 
 #: users/templates/users/index_serviceusers.html:33
 msgid "List of LDAP service users"
@@ -881,19 +908,19 @@ msgstr ""
 "de créer un service utilisateur avec un indentifiant et un mot de passe."
 
 #: users/templates/users/index_serviceusers.html:36
-msgid " Add a service user"
-msgstr " Ajouter un utilisateur"
+msgid "Add a service user"
+msgstr "Ajouter un utilisateur"
 
 #: users/templates/users/index_shell.html:33
 msgid "List of shells"
 msgstr "Liste des interfaces en ligne de commande"
 
 #: users/templates/users/index_shell.html:35
-msgid " Add a shell"
-msgstr " Ajouter une interface en ligne de commande"
+msgid "Add a shell"
+msgstr "Ajouter une interface en ligne de commande"
 
 #: users/templates/users/index_whitelist.html:32
-#: users/templates/users/profil.html:456 users/templates/users/sidebar.html:64
+#: users/templates/users/profil.html:463 users/templates/users/sidebar.html:64
 msgid "Whitelists"
 msgstr "Accès gracieux"
 
@@ -906,10 +933,8 @@ msgid "Search"
 msgstr "Rechercher"
 
 #: users/templates/users/mass_archive.html:39
-#, python-format
-msgid "The following users will be archived (%(to_archive_list|length)s):"
-msgstr ""
-"Les utilisateus suivants vont être archivés (%(to_archive_list|length)s) :"
+msgid "The following users will be archived:"
+msgstr "Les utilisateus suivants vont être archivés :"
 
 #: users/templates/users/plugin_out.html:35
 msgid ""
@@ -931,8 +956,8 @@ msgid "Profile of %(name)s %(surname)s"
 msgstr "Profil de %(name)s %(surname)s"
 
 #: users/templates/users/profil.html:46
-msgid "Your account has been banned"
-msgstr "Votre compte a été banni"
+msgid "Your account has been banned."
+msgstr "Votre compte a été banni."
 
 #: users/templates/users/profil.html:48
 #, python-format
@@ -948,7 +973,7 @@ msgid "Pay for a connection"
 msgstr "Payer une connexion"
 
 #: users/templates/users/profil.html:60
-msgid "Ask for someone with the appropriate rights to pay for a connection."
+msgid "Ask someone with the appropriate rights to pay for a connection."
 msgstr ""
 "Demandez à quelqu'un ayant les droits appropriés de payer une connexion."
 
@@ -965,27 +990,31 @@ msgstr "Étendre la durée de connexion"
 msgid "Refill the balance"
 msgstr "Recharger le solde"
 
-#: users/templates/users/profil.html:97
-msgid " Machines"
-msgstr " Machines"
+#: users/templates/users/profil.html:97 users/templates/users/profil.html:382
+msgid "Machines"
+msgstr "Machines"
 
 #: users/templates/users/profil.html:101 users/templates/users/profil.html:113
-msgid " Add a machine"
-msgstr " Ajouter une machine"
+#: users/templates/users/profil.html:390
+msgid "Add a machine"
+msgstr "Ajouter une machine"
 
-#: users/templates/users/profil.html:109 users/templates/users/profil.html:390
+#: users/templates/users/profil.html:109 users/templates/users/profil.html:397
 msgid "No machine"
 msgstr "Pas de machine"
 
 #: users/templates/users/profil.html:128
-msgid " Detailed information"
-msgstr " Informations détaillées"
+msgid "Detailed information"
+msgstr "Informations détaillées"
 
-#: users/templates/users/profil.html:135
+#: users/templates/users/profil.html:135 users/views.py:184 users/views.py:211
+#: users/views.py:228 users/views.py:245 users/views.py:317 users/views.py:371
+#: users/views.py:425 users/views.py:490 users/views.py:533 users/views.py:569
+#: users/views.py:629 users/views.py:675
 msgid "Edit"
 msgstr "Modifier"
 
-#: users/templates/users/profil.html:139 users/views.py:290 users/views.py:1094
+#: users/templates/users/profil.html:139 users/views.py:264 users/views.py:1001
 msgid "Change the password"
 msgstr "Changer le mot de passe"
 
@@ -993,7 +1022,7 @@ msgstr "Changer le mot de passe"
 msgid "Change the state"
 msgstr "Changer l'état"
 
-#: users/templates/users/profil.html:150 users/views.py:268
+#: users/templates/users/profil.html:150
 msgid "Edit the groups"
 msgstr "Modifier les groupes"
 
@@ -1005,158 +1034,158 @@ msgstr "Envoi de mails"
 msgid "Mailing disabled"
 msgstr "Envoi de mails désactivé"
 
-#: users/templates/users/profil.html:196
+#: users/templates/users/profil.html:192
+msgid "Connected"
+msgstr "Connecté"
+
+#: users/templates/users/profil.html:193
+msgid "Pending connection..."
+msgstr "Connexion en attente..."
+
+#: users/templates/users/profil.html:199
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: users/templates/users/profil.html:211
+#: users/templates/users/profil.html:214
 msgid "Registration date"
 msgstr "Date d'inscription"
 
-#: users/templates/users/profil.html:216
+#: users/templates/users/profil.html:219
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: users/templates/users/profil.html:221
+#: users/templates/users/profil.html:224
 msgid "End of membership"
 msgstr "Fin d'adhésion"
 
-#: users/templates/users/profil.html:230
+#: users/templates/users/profil.html:233
 msgid "Whitelist"
 msgstr "Accès gracieux"
 
-#: users/templates/users/profil.html:234 users/templates/users/profil.html:277
+#: users/templates/users/profil.html:237 users/templates/users/profil.html:280
 msgid "None"
 msgstr "Aucun"
 
-#: users/templates/users/profil.html:239
+#: users/templates/users/profil.html:242
 msgid "Ban"
 msgstr "Bannissement"
 
-#: users/templates/users/profil.html:243
+#: users/templates/users/profil.html:246
 msgid "Not banned"
 msgstr "Non banni"
 
-#: users/templates/users/profil.html:248
+#: users/templates/users/profil.html:251
 msgid "State"
 msgstr "État"
 
-#: users/templates/users/profil.html:256
-msgid "Not yet member"
-msgstr "Pas encore adhérent"
-
-#: users/templates/users/profil.html:266
+#: users/templates/users/profil.html:269
 #, python-format
 msgid "Active (until %(end_access)s)"
 msgstr "Actif (jusqu'au %(end_access)s)"
 
-#: users/templates/users/profil.html:273 users/templates/users/sidebar.html:82
+#: users/templates/users/profil.html:276 users/templates/users/sidebar.html:82
 msgid "Groups of rights"
 msgstr "Groupes de droits"
 
-#: users/templates/users/profil.html:282
+#: users/templates/users/profil.html:285
 msgid "Balance"
 msgstr "Solde"
 
-#: users/templates/users/profil.html:289
+#: users/templates/users/profil.html:292
 msgid "Refill"
 msgstr "Recharger"
 
-#: users/templates/users/profil.html:297
+#: users/templates/users/profil.html:300
 msgid "GPG fingerprint"
 msgstr "Empreinte GPG"
 
-#: users/templates/users/profil.html:316
-msgid " Manage the club"
-msgstr " Gérer le club"
+#: users/templates/users/profil.html:312
+msgid "Shortcuts enabled"
+msgstr "Raccourcis activés"
 
-#: users/templates/users/profil.html:324
+#: users/templates/users/profil.html:323
+msgid "Manage the club"
+msgstr "Gérer le club"
+
+#: users/templates/users/profil.html:331
 msgid "Manage the admins and members"
 msgstr "Gérer les admins et les membres"
 
-#: users/templates/users/profil.html:328
+#: users/templates/users/profil.html:335
 msgid "Club admins"
 msgstr "Admins du clubs"
 
-#: users/templates/users/profil.html:347
+#: users/templates/users/profil.html:354
 msgid "Members"
 msgstr "Adhérents"
 
-#: users/templates/users/profil.html:375
-msgid "Machines"
-msgstr "Machines"
-
-#: users/templates/users/profil.html:383
-msgid "Add a machine"
-msgstr "Ajouter une machine"
-
-#: users/templates/users/profil.html:400
+#: users/templates/users/profil.html:407
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: users/templates/users/profil.html:408
+#: users/templates/users/profil.html:415
 msgid "Add a subscription"
 msgstr "Ajouter une cotisation"
 
-#: users/templates/users/profil.html:413
+#: users/templates/users/profil.html:420
 msgid "Edit the balance"
 msgstr "Modifier le solde"
 
-#: users/templates/users/profil.html:422
+#: users/templates/users/profil.html:429
 msgid "No invoice"
 msgstr "Pas de facture"
 
-#: users/templates/users/profil.html:439 users/views.py:392
+#: users/templates/users/profil.html:446
 msgid "Add a ban"
 msgstr "Ajouter un bannissement"
 
-#: users/templates/users/profil.html:447
+#: users/templates/users/profil.html:454
 msgid "No ban"
 msgstr "Pas de bannissement"
 
-#: users/templates/users/profil.html:464
+#: users/templates/users/profil.html:471
 msgid "Grant a whitelist"
 msgstr "Donner un accès gracieux"
 
-#: users/templates/users/profil.html:472
+#: users/templates/users/profil.html:479
 msgid "No whitelist"
 msgstr "Pas d'accès gracieux"
 
-#: users/templates/users/profil.html:480
-msgid " Email settings"
-msgstr " Paramètres mail"
-
 #: users/templates/users/profil.html:487
-msgid " Edit email settings"
-msgstr " Modifier les paramètres mail"
+msgid "Email settings"
+msgstr "Paramètres mail"
 
-#: users/templates/users/profil.html:496 users/templates/users/profil.html:522
+#: users/templates/users/profil.html:494
+msgid "Edit email settings"
+msgstr "Modifier les paramètres mail"
+
+#: users/templates/users/profil.html:503 users/templates/users/profil.html:529
 msgid "Contact email address"
 msgstr "Adresse mail de contact"
 
-#: users/templates/users/profil.html:500
+#: users/templates/users/profil.html:507
 msgid "Enable the local email account"
 msgstr "Activer le compte mail local"
 
-#: users/templates/users/profil.html:502
+#: users/templates/users/profil.html:509
 msgid "Enable the local email redirection"
 msgstr "Activer la redirection mail locale"
 
-#: users/templates/users/profil.html:506
+#: users/templates/users/profil.html:513
 msgid ""
-"The contact email address is the email address where we send emails to "
+"The contact email address is the email address to which we send emails to "
 "contact you. If you would like to use your external email address for that, "
 "you can either disable your local email address or enable the local email "
 "redirection."
 msgstr ""
-"L'adresse mail de contact est l'adresse mail où nous envoyons des mails pour "
-"vous contacter. Si vous voulez utiliser votre adresse mail externe pour "
-"cela, vous pouvez soit désactiver votre adresse mail locale soit activer la "
-"redirection des mails locaux."
+"L'adresse mail de contact est l'adresse mail à laquelle nous envoyons des "
+"mails pour vous contacter. Si vous voulez utiliser votre adresse mail "
+"externe pour cela, vous pouvez soit désactiver votre adresse mail locale "
+"soit activer la redirection des mails locaux."
 
-#: users/templates/users/profil.html:511
-msgid " Add an email address"
-msgstr " Ajouter une adresse mail"
+#: users/templates/users/profil.html:518
+msgid "Add an email address"
+msgstr "Ajouter une adresse mail"
 
 #: users/templates/users/sidebar.html:33
 msgid "Create a club or organisation"
@@ -1217,182 +1246,143 @@ msgstr "Connecté avec l'appareil :"
 msgid "MAC address %(mac)s"
 msgstr "Adresse MAC %(mac)s"
 
-#: users/views.py:130
+#: users/views.py:127
 #, python-format
 msgid "The user %s was created, an email to set the password was sent."
 msgstr ""
 "L'utilisateur %s a été créé, un mail pour initialiser le mot de passe a été "
 "envoyé."
 
-#: users/views.py:142
+#: users/views.py:137
 msgid "Commit"
 msgstr "Valider"
 
-#: users/views.py:159
+#: users/views.py:156
 #, python-format
 msgid "The club %s was created, an email to set the password was sent."
 msgstr ""
 "Le club %s a été créé, un mail pour initialiser le mot de passe a été envoyé."
 
-#: users/views.py:166
+#: users/views.py:161
 msgid "Create a club"
 msgstr "Créer un club"
 
-#: users/views.py:184
+#: users/views.py:176
 msgid "The club was edited."
 msgstr "Le club a été modifié."
 
-#: users/views.py:193
-msgid "Edit the admins and members"
-msgstr "Modifier les admins et les membres"
-
-#: users/views.py:221
+#: users/views.py:208
 msgid "The user was edited."
 msgstr "L'utilisateur a été modifié."
 
-#: users/views.py:227
-msgid "Edit the user"
-msgstr "Modifier l'utilisateur"
-
-#: users/views.py:241
+#: users/views.py:225
 msgid "The state was edited."
 msgstr "L'état a été modifié."
 
-#: users/views.py:247
-msgid "Edit the state"
-msgstr "Modifier l'état"
-
-#: users/views.py:262
+#: users/views.py:242
 msgid "The groups were edited."
 msgstr "Les groupes ont été modifiés."
 
-#: users/views.py:284 users/views.py:1091
+#: users/views.py:261 users/views.py:998
 msgid "The password was changed."
 msgstr "Le mot de passe a été changé."
 
-#: users/views.py:302
+#: users/views.py:276
 #, python-format
 msgid "%s was removed from the group."
 msgstr "%s a été retiré du groupe."
 
-#: users/views.py:312
+#: users/views.py:286
 #, python-format
 msgid "%s is no longer superuser."
 msgstr "%s n'est plus superutilisateur."
 
-#: users/views.py:325
+#: users/views.py:297
 msgid "The service user was created."
 msgstr "L'utilisateur service a été créé."
 
-#: users/views.py:329
-msgid "Create a service user"
-msgstr "Créer un utilisateur service"
+#: users/views.py:300 users/views.py:354 users/views.py:405 users/views.py:463
+#: users/views.py:551 users/views.py:614 users/views.py:657
+msgid "Add"
+msgstr "Ajouter"
 
-#: users/views.py:346
+#: users/views.py:314
 msgid "The service user was edited."
 msgstr "L'utilisateur service a été modifié."
 
-#: users/views.py:349
-msgid "Edit a service user"
-msgstr "Modifier un utilisateur service"
-
-#: users/views.py:361
+#: users/views.py:329
 msgid "The service user was deleted."
 msgstr "L'utilisateur service a été supprimé."
 
-#: users/views.py:381
+#: users/views.py:349
 msgid "The ban was added."
 msgstr "Le bannissement a été ajouté."
 
-#: users/views.py:389
+#: users/views.py:352
 msgid "Warning: this user already has an active ban."
 msgstr "Attention : cet utilisateur a déjà un bannissement actif."
 
-#: users/views.py:408
+#: users/views.py:368
 msgid "The ban was edited."
 msgstr "Le bannissement a été modifié."
 
-#: users/views.py:411
-msgid "Edit a ban"
-msgstr "Modifier un bannissement"
-
-#: users/views.py:423
+#: users/views.py:381
 msgid "The ban was deleted."
 msgstr "Le bannissement a été supprimé."
 
-#: users/views.py:450
+#: users/views.py:398
 msgid "The whitelist was added."
 msgstr "L'accès gracieux a été ajouté."
 
-#: users/views.py:458
+#: users/views.py:402
 msgid "Warning: this user already has an active whitelist."
 msgstr "Attention : cet utilisateur a déjà un accès gracieux actif."
 
-#: users/views.py:461
-msgid "Add a whitelist"
-msgstr "Ajouter un accès gracieux"
-
-#: users/views.py:481
+#: users/views.py:422
 msgid "The whitelist was edited."
 msgstr "L'accès gracieux a été ajouté."
 
-#: users/views.py:484
-msgid "Edit a whitelist"
-msgstr "Modifier un accès gracieux"
-
-#: users/views.py:496
+#: users/views.py:437
 msgid "The whitelist was deleted."
 msgstr "L'accès gracieux a été supprimé."
 
-#: users/views.py:520
+#: users/views.py:442
+msgid "whitelist"
+msgstr "accès gracieux"
+
+#: users/views.py:457
 msgid "The local email account was created."
 msgstr "Le compte mail local a été créé."
 
-#: users/views.py:528
-msgid "Add a local email account"
-msgstr "Ajouter un compte mail local"
-
-#: users/views.py:545
+#: users/views.py:480
 msgid "The local email account was edited."
 msgstr "Le compte mail local a été modifié."
 
-#: users/views.py:553
-msgid "Edit a local email account"
-msgstr "Modifier un compte mail local"
-
-#: users/views.py:565
+#: users/views.py:503
 msgid "The local email account was deleted."
 msgstr "Le compte mail local a été supprimé."
 
-#: users/views.py:589
+#: users/views.py:508
+msgid "email address"
+msgstr "adresse mail"
+
+#: users/views.py:524
 msgid "The email settings were edited."
 msgstr "Les paramètres mail ont été modifiés."
 
-#: users/views.py:598
-msgid "Edit the email settings"
-msgstr "Modifier les paramètres mail"
-
-#: users/views.py:612
+#: users/views.py:548
 msgid "The school was added."
 msgstr "L'établissement a été ajouté."
 
-#: users/views.py:615
-msgid "Add a school"
-msgstr "Ajouter un établissement"
-
-#: users/views.py:630
+#: users/views.py:566
 msgid "The school was edited."
 msgstr "L'établissement a été modifié."
 
-#: users/views.py:633
-msgid "Edit a school"
-msgstr "Modifier un établissement"
-
-#: users/views.py:652
+#: users/views.py:588
 msgid "The school was deleted."
 msgstr "L'établissement a été supprimé."
 
-#: users/views.py:656
+#: users/views.py:593
 #, python-format
 msgid ""
 "The school %s is assigned to at least one user, impossible to delete it."
@@ -1400,51 +1390,31 @@ msgstr ""
 "L'établissement %s est assigné à au moins un utilisateur, impossible de le "
 "supprimer."
 
-#: users/views.py:660 users/views.py:772
-msgid "Delete"
-msgstr "Supprimer"
-
-#: users/views.py:673
+#: users/views.py:611
 msgid "The shell was added."
 msgstr "L'interface en ligne de commande a été ajoutée."
 
-#: users/views.py:676
-msgid "Add a shell"
-msgstr "Ajouter une interface en ligne de commande"
-
-#: users/views.py:690
+#: users/views.py:626
 msgid "The shell was edited."
 msgstr "L'interface en ligne de commande a été modifiée."
 
-#: users/views.py:693
-msgid "Edit a shell"
-msgstr "Modifier une interface en ligne de commande"
-
-#: users/views.py:705
+#: users/views.py:641
 msgid "The shell was deleted."
 msgstr "L'interface en ligne de commande a été supprimée."
 
-#: users/views.py:722
+#: users/views.py:654
 msgid "The group of rights was added."
 msgstr "Le groupe de droits a été ajouté."
 
-#: users/views.py:725
-msgid "Add a group of rights"
-msgstr "Ajouter un groupe de droits"
-
-#: users/views.py:743
+#: users/views.py:672
 msgid "The group of rights was edited."
 msgstr "Le groupe de droits a été modifié."
 
-#: users/views.py:746
-msgid "Edit a group of rights"
-msgstr "Modifier un groupe de droits"
-
-#: users/views.py:763
+#: users/views.py:692
 msgid "The group of rights was deleted."
 msgstr "Le groupe de droits a été supprimé."
 
-#: users/views.py:768
+#: users/views.py:697
 #, python-format
 msgid ""
 "The group of rights %s is assigned to at least one user, impossible to "
@@ -1453,36 +1423,32 @@ msgstr ""
 "Le groupe de droits %s est assigné à au moins un utilisateur, impossible de "
 "le supprimer."
 
-#: users/views.py:797
+#: users/views.py:733
 #, python-format
 msgid "%s users were archived."
 msgstr "%s utilisateurs ont été archivés."
 
-#: users/views.py:1053
+#: users/views.py:962
 msgid "The user doesn't exist."
 msgstr "L'utilisateur n'existe pas."
 
-#: users/views.py:1055 users/views.py:1063
+#: users/views.py:964 users/views.py:972
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: users/views.py:1060
+#: users/views.py:969
 msgid "An email to reset the password was sent."
 msgstr "Un mail pour réinitialiser le mot de passe a été envoyé."
 
-#: users/views.py:1077
+#: users/views.py:984
 msgid "Error: please contact an admin."
 msgstr "Erreur : veuillez contacter un admin."
 
-#: users/views.py:1089
-msgid "Password reset"
-msgstr "Réinitialisation du mot de passe"
-
-#: users/views.py:1106
+#: users/views.py:1020
 msgid "Incorrect URL, or already registered device."
 msgstr "URL incorrect, ou appareil déjà enregistré."
 
-#: users/views.py:1114
+#: users/views.py:1032
 msgid ""
 "Successful registration! Please disconnect and reconnect your Ethernet cable "
 "to get Internet access."
@@ -1490,30 +1456,22 @@ msgstr ""
 "Enregistrement réussi ! Veuillez débrancher et rebrancher votre câble "
 "Ethernet pour avoir accès à Internet."
 
-#: users/views.py:1158 users/views.py:1182 users/views.py:1197
+#: users/views.py:1072 users/views.py:1096 users/views.py:1111
 msgid "The mailing list doesn't exist."
 msgstr "La liste de diffusion n'existe pas."
 
-#: users/widgets.py:36
+#: users/widgets.py:39
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: users/widgets.py:44
+#: users/widgets.py:59
 msgid "Next"
 msgstr "Suivant"
 
-#: users/widgets.py:45
+#: users/widgets.py:60
 msgid "Previous"
 msgstr "Précédent"
 
-#: users/widgets.py:46
+#: users/widgets.py:61
 msgid "Wk"
-msgstr "Wk"
-
-#, fuzzy
-#~| msgid "Summary of the General Terms of Use"
-#~ msgid "General Terms of Use"
-#~ msgstr "Résumé des Conditions Générales d'Utilisation"
-
-#~ msgid "Archiving"
-#~ msgstr "Archivage"
+msgstr "Sem"
diff --git a/users/management/commands/anonymize.py b/users/management/commands/anonymise.py
similarity index 52%
rename from users/management/commands/anonymize.py
rename to users/management/commands/anonymise.py
index 7f54de42..700905b9 100644
--- a/users/management/commands/anonymize.py
+++ b/users/management/commands/anonymise.py
@@ -13,7 +13,7 @@ from random import randint
 
 
 class Command(BaseCommand):
-    help = "Anonymize the data in the database in order to use them on critical servers (dev, personnal...). Every information will be overwritten using non-personnal informations. This script must follow any modification of the database.\nOptionnal argument: {id|id|id|...} to exclude users from anonymisation"
+    help = "Anonymise the data in the database in order to use them on critical servers (dev, personal...). Every information will be overwritten using non-personal information. This script must follow any modification of the database.\nOptional argument: {id|id|id|...} to exclude users from anonymisation."
 
     def add_arguments(self, parser):
         parser.add_argument("user_id", nargs="+", type=int, help="User ID")
@@ -22,14 +22,14 @@ class Command(BaseCommand):
         users_ids = kwargs["user_id"]
         for user_id in users_ids:
             self.stdout.write(
-                "User: {} will not be anonymised".format(
+                "User: {} will not be anonymised.".format(
                     User.objects.filter(id=user_id).get().name
                 )
             )
 
         self.stdout.write(
             self.style.WARNING(
-                "\nDISCLAIMER\nThis function will make your database unusable for production. Are you sure you want to run this ?(doit): "
+                "\nDISCLAIMER\nThis function will make your database unusable for production. Are you sure you want to run this? (doit): "
             )
         )
         if input() == "doit":
@@ -43,52 +43,52 @@ class Command(BaseCommand):
             d = Domain.objects.all()
             m = Machine.objects.filter(~Q(user_id__in=users_ids))
 
-            self.stdout.write("Supression de l'école...")
+            self.stdout.write("Deletion of the school...")
             # Create a fake School to put everyone in it.
-            ecole = School(name="Ecole des Ninja")
+            ecole = School(name="Ninja School")
             ecole.save()
             u.update(school=ecole)
-            self.stdout.write(self.style.SUCCESS("done ..."))
+            self.stdout.write(self.style.SUCCESS("Done..."))
 
-            self.stdout.write("Supression des chambres...")
+            self.stdout.write("Deletion of rooms...")
             a.update(room=None)
             c.update(room=None)
-            self.stdout.write(self.style.SUCCESS("done ..."))
+            self.stdout.write(self.style.SUCCESS("Done..."))
 
-            self.stdout.write("Supression des mails...")
+            self.stdout.write("Deletion of email addresses...")
             u.update(
                 email="example@example.org",
                 local_email_redirect=False,
                 local_email_enabled=False,
             )
-            self.stdout.write(self.style.SUCCESS("done ..."))
+            self.stdout.write(self.style.SUCCESS("Done..."))
 
             self.stdout.write(
-                "Supression des noms, prenoms, pseudo, telephone, commentaire..."
+                "Deletion of first names, surnames, usernames, telephone numbers, comments..."
             )
-            a.update(name=Concat(Value("name of "), "id"))
-            self.stdout.write(self.style.SUCCESS("done name"))
+            a.update(name=Concat(Value("First name of "), "id"))
+            self.stdout.write(self.style.SUCCESS("Done for first names..."))
 
-            a.update(surname=Concat(Value("surname of "), "id"))
-            self.stdout.write(self.style.SUCCESS("done surname"))
+            a.update(surname=Concat(Value("Surname of "), "id"))
+            self.stdout.write(self.style.SUCCESS("Done for surnames..."))
 
             u.update(pseudo=F("id"))
-            self.stdout.write(self.style.SUCCESS("done pseudo"))
+            self.stdout.write(self.style.SUCCESS("Done for usernames..."))
 
-            a.update(telephone=Concat(Value("phone of "), "id"))
-            self.stdout.write(self.style.SUCCESS("done phone"))
+            a.update(telephone=Concat(Value("Telephone number of "), "id"))
+            self.stdout.write(self.style.SUCCESS("Done for telephone numbers..."))
 
-            a.update(comment=Concat(Value("commentaire of "), "id"))
-            self.stdout.write(self.style.SUCCESS("done ..."))
+            a.update(comment=Concat(Value("Comment of "), "id"))
+            self.stdout.write(self.style.SUCCESS("Done for comments..."))
 
-            self.stdout.write("Renommage des machines...")
+            self.stdout.write("Renaming of machines...")
             m.update(
                 name=Concat(Value("Machine "), F("id"), Value(" of "), F("user_id"))
             )
-            d.update(name=Concat(Value("Domaine id "), F("id")))
-            self.stdout.write(self.style.SUCCESS("done ..."))
+            d.update(name=Concat(Value("Domain id "), F("id")))
+            self.stdout.write(self.style.SUCCESS("Done..."))
 
-            self.stdout.write("Unification du mot de passe...")
+            self.stdout.write("Unification of the password...")
             # Define the password
             chars = string.ascii_letters + string.digits + "!@#$%^&*()"
             taille = 20
@@ -99,19 +99,19 @@ class Command(BaseCommand):
 
             self.stdout.write(
                 self.style.HTTP_NOT_MODIFIED(
-                    "The password will be: {}".format(password)
+                    "The password will be: {}.".format(password)
                 )
             )
 
             u.update(pwd_ntlm=hashNT(password))
             u.update(password=makeSecret(password))
-            self.stdout.write(self.style.SUCCESS("done..."))
+            self.stdout.write(self.style.SUCCESS("Done..."))
 
-            self.stdout.write("Suppression de l'historique (This may take some time)")
+            self.stdout.write("Deletion of the history (this may take some time)...")
             Revision.objects.all().delete()
-            self.stdout.write(self.style.SUCCESS("done..."))
+            self.stdout.write(self.style.SUCCESS("Done..."))
 
-            self.stdout.write("Data anonymized!")
+            self.stdout.write("Data anonymised!")
 
         else:
-            self.stdout.write("Anonymisation aborted")
+            self.stdout.write("Anonymisation aborted!")
diff --git a/users/management/commands/archive.py b/users/management/commands/archive.py
index 8d054eae..1e4601a0 100644
--- a/users/management/commands/archive.py
+++ b/users/management/commands/archive.py
@@ -45,14 +45,14 @@ class Command(BaseCommand):
             "--full",
             "-f",
             action="store_true",
-            help="Full archive users, i.e. delete their email address, machines and remove them from the LDAP.",
+            help="Fully archive users, i.e. delete their email address, machines and remove them from the LDAP.",
         )
         parser.add_argument(
             "--date",
             "-d",
             default=datetime.date.today().strftime("%d/%m/%Y"),
             type=valid_date,
-            help="Users which membership ends sooner than this date will be archived.",
+            help="Users whose membership ends sooner than this date will be archived.",
         )
         parser.add_argument(
             "--show",
@@ -63,7 +63,7 @@ class Command(BaseCommand):
         parser.add_argument(
             "-y",
             action="store_true",
-            help="Do not ask for confirmation befor full archiving.",
+            help="Do not ask for confirmation before fully archiving.",
         )
 
     def handle(self, *args, **kwargs):
@@ -87,7 +87,7 @@ class Command(BaseCommand):
         if full_archive and not force:
             self.stdout.write(
                 self.style.WARNING(
-                    "Please confirm full archiving (it is a critical operation !) [Y/n]"
+                    "Please confirm fully archiving (it is a critical operation!) [Y/n]"
                 )
             )
             if input() != "Y":
@@ -95,13 +95,13 @@ class Command(BaseCommand):
                 return
         if full_archive:
             self.stdout.write(
-                "Full archiving users with a membership ending prior to %s"
+                "Fully archiving users with a membership ending prior to %s."
                 % date.strftime("%d/%m/%Y")
             )
             User.mass_full_archive(to_archive_list)
         else:
             self.stdout.write(
-                "Archiving users with a membership ending prior to %s"
+                "Archiving users with a membership ending prior to %s."
                 % date.strftime("%d/%m/%Y")
             )
             to_archive_list = to_archive_list.exclude(state=User.STATE_ARCHIVE)
diff --git a/users/management/commands/chgpass.py b/users/management/commands/chgpass.py
index a88eeecb..2937bb3c 100644
--- a/users/management/commands/chgpass.py
+++ b/users/management/commands/chgpass.py
@@ -28,7 +28,7 @@ from re2o.script_utils import get_user, get_system_user, form_cli
 
 
 class Command(BaseCommand):
-    help = "Changer le mot de passe d'un utilisateur"
+    help = "Change the password of a user."
 
     def add_arguments(self, parser):
         parser.add_argument("target_username", nargs="?")
@@ -44,8 +44,8 @@ class Command(BaseCommand):
         if not ok:
             raise CommandError(msg)
 
-        self.stdout.write("Changement du mot de passe de %s" % target_user.pseudo)
+        self.stdout.write("Password change of %s" % target_user.pseudo)
 
         form_cli(
-            PassForm, current_user, "Changement du mot de passe", instance=target_user
+            PassForm, current_user, "Password change", instance=target_user
         )
diff --git a/users/management/commands/chsh.py b/users/management/commands/chsh.py
index 574bd0f1..95be7b44 100644
--- a/users/management/commands/chsh.py
+++ b/users/management/commands/chsh.py
@@ -32,7 +32,7 @@ from re2o.script_utils import get_user, get_system_user
 
 
 class Command(BaseCommand):
-    help = "Change the default shell of a user"
+    help = "Change the default shell of a user."
 
     def add_arguments(self, parser):
         parser.add_argument("target_username", nargs="?")
@@ -52,37 +52,36 @@ class Command(BaseCommand):
 
         shells = ListShell.objects.all()
 
-        current_shell = "inconnu"
+        current_shell = "unknown"
         if target_user.shell:
             current_shell = target_user.shell.get_pretty_name()
         self.stdout.write(
-            "Choisissez un shell pour l'utilisateur %s (le shell actuel est "
-            "%s) :" % (target_user.pseudo, current_shell)
+            "Choose a shell for the user %s (the current shell is"
+            " %s):" % (target_user.pseudo, current_shell)
         )
         for shell in shells:
             self.stdout.write(
                 "%d - %s (%s)" % (shell.id, shell.get_pretty_name(), shell.shell)
             )
-        shell_id = input("Entrez un nombre : ")
+        shell_id = input("Enter a number: ")
 
         try:
             shell_id = int(shell_id)
         except:
-            raise CommandError("Choix invalide")
+            raise CommandError("Invalid choice.")
 
         shell = ListShell.objects.filter(id=shell_id)
         if not shell:
-            raise CommandError("Choix invalide")
+            raise CommandError("Invalid choice.")
 
         target_user.shell = shell.first()
         with transaction.atomic(), reversion.create_revision():
             target_user.save()
             reversion.set_user(current_user)
-            reversion.set_comment("Shell modifié")
+            reversion.set_comment("Shell changed.")
 
         self.stdout.write(
             self.style.SUCCESS(
-                "Shell modifié. La modification peut prendre quelques minutes "
-                "pour s'appliquer."
+                "Shell changed. The change may take a few minutes to apply."
             )
         )
diff --git a/users/management/commands/clean_notyetactive.py b/users/management/commands/clean_notyetactive.py
index b6056230..994abfc2 100644
--- a/users/management/commands/clean_notyetactive.py
+++ b/users/management/commands/clean_notyetactive.py
@@ -27,7 +27,7 @@ from django.utils import timezone
 
 
 class Command(BaseCommand):
-    help = "Delete non members users (not yet active)"
+    help = "Delete non members users (not yet active)."
 
     def handle(self, *args, **options):
         """First deleting invalid invoices, and then deleting the users"""
@@ -38,6 +38,6 @@ class Command(BaseCommand):
             .exclude(facture__valid=True)
             .distinct()
         )
-        print("Deleting " + str(users_to_delete.count()) + " users")
+        print("Deleting " + str(users_to_delete.count()) + " users.")
         Facture.objects.filter(user__in=users_to_delete).delete()
         users_to_delete.delete()
diff --git a/users/management/commands/derniere_connexion.py b/users/management/commands/derniere_connexion.py
index 9d52ecf0..38352640 100644
--- a/users/management/commands/derniere_connexion.py
+++ b/users/management/commands/derniere_connexion.py
@@ -57,8 +57,8 @@ DATE_FORMATS = [
 
 class Command(BaseCommand):
     help = (
-        "Update the time of the latest connection for users by matching "
-        "stdin against a set of regular expressions"
+        "Update the time of the latest connection for users by matching"
+        " stdin against a set of regular expressions."
     )
 
     def handle(self, *args, **options):
diff --git a/users/management/commands/ldap_rebuild.py b/users/management/commands/ldap_rebuild.py
index 82bb0f0e..c8b172f9 100644
--- a/users/management/commands/ldap_rebuild.py
+++ b/users/management/commands/ldap_rebuild.py
@@ -96,8 +96,8 @@ def sync_ldap():
 
 class Command(BaseCommand):
     help = (
-        "Destroy the current LDAP data and rebuild it from the DB data. "
-        "Use with caution."
+        "Destroy the current LDAP data and rebuild it from the DB data."
+        " Use with caution."
     )
 
     def handle(self, *args, **options):
@@ -109,6 +109,6 @@ class Command(BaseCommand):
         server = settings.DATABASES["ldap"]["NAME"]
 
         flush_ldap(binddn, bindpass, server, usersdn, groupsdn)
-        self.stdout.write("LDAP emptied")
+        self.stdout.write("LDAP emptied.")
         sync_ldap()
-        self.stdout.write("LDAP rebuilt")
+        self.stdout.write("LDAP rebuilt.")
diff --git a/users/management/commands/ldap_sync.py b/users/management/commands/ldap_sync.py
index 5495fa30..73f6698e 100644
--- a/users/management/commands/ldap_sync.py
+++ b/users/management/commands/ldap_sync.py
@@ -22,7 +22,7 @@ from users.models import User
 
 
 class Command(BaseCommand):
-    help = "Synchronise le ldap à partir du sql. A utiliser dans un cron"
+    help = "Synchronise the LDAP from SQL. To be used in a cron."
 
     def add_arguments(self, parser):
 
@@ -32,7 +32,7 @@ class Command(BaseCommand):
             action="store_true",
             dest="full",
             default=False,
-            help="Régénération complète du ldap (y compris des machines)",
+            help="Complete regeneration of the LDAP (including machines).",
         )
 
     def handle(self, *args, **options):
diff --git a/users/migrations/0084_auto_20191120_0159.py b/users/migrations/0084_auto_20191120_0159.py
new file mode 100644
index 00000000..f4acc90d
--- /dev/null
+++ b/users/migrations/0084_auto_20191120_0159.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-11-20 00:59
+from __future__ import unicode_literals
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0083_user_shortcuts_enabled'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='user',
+            options={'permissions': (('change_user_password', 'Can change the password of a user'), ('change_user_state', 'Can edit the state of a user'), ('change_user_force', 'Can force the move'), ('change_user_shell', 'Can edit the shell of a user'), ('change_user_groups', 'Can edit the groups of rights of a user (critical permission)'), ('change_all_users', 'Can edit all users, including those with rights'), ('view_user', 'Can view a user object')), 'verbose_name': 'user (member or club)', 'verbose_name_plural': 'users (members or clubs)'},
+        ),
+        migrations.AlterField(
+            model_name='emailaddress',
+            name='local_part',
+            field=models.CharField(help_text='Local part of the email address.', max_length=128, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='emailaddress',
+            name='user',
+            field=models.ForeignKey(help_text='User of the local email account.', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='listright',
+            name='details',
+            field=models.CharField(blank=True, help_text='Description.', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='listright',
+            name='unix_name',
+            field=models.CharField(max_length=255, unique=True, validators=[django.core.validators.RegexValidator('^[a-z]+$', message='UNIX group names can only contain lower case letters.')]),
+        ),
+        migrations.AlterField(
+            model_name='serviceuser',
+            name='comment',
+            field=models.CharField(blank=True, help_text='Comment.', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='comment',
+            field=models.CharField(blank=True, help_text='Comment, school year.', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='shortcuts_enabled',
+            field=models.BooleanField(default=True, verbose_name='enable shortcuts on Re2o website'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='state',
+            field=models.IntegerField(choices=[(0, 'Active'), (1, 'Disabled'), (2, 'Archived'), (3, 'Not yet active'), (4, 'Fully archived')], default=3),
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
index 225c4a9f..ba15354b 100755
--- a/users/models.py
+++ b/users/models.py
@@ -102,7 +102,7 @@ def linux_user_validator(login):
     pas les contraintes unix (maj, min, chiffres ou tiret)"""
     if not linux_user_check(login):
         raise forms.ValidationError(
-            _("The username '%(label)s' contains forbidden characters."),
+            _("The username \"%(label)s\" contains forbidden characters."),
             params={"label": login},
         )
 
@@ -181,7 +181,7 @@ class User(
         (1, _("Disabled")),
         (2, _("Archived")),
         (3, _("Not yet active")),
-        (4, _("Full Archived")),
+        (4, _("Fully archived")),
     )
 
     surname = models.CharField(max_length=255)
@@ -213,7 +213,7 @@ class User(
         "ListShell", on_delete=models.PROTECT, null=True, blank=True
     )
     comment = models.CharField(
-        help_text=_("Comment, school year"), max_length=255, blank=True
+        help_text=_("Comment, school year."), max_length=255, blank=True
     )
     pwd_ntlm = models.CharField(max_length=255)
     state = models.IntegerField(choices=STATES, default=STATE_NOT_YET_ACTIVE)
@@ -222,7 +222,7 @@ class User(
     uid_number = models.PositiveIntegerField(default=get_fresh_user_uid, unique=True)
     rezo_rez_uid = models.PositiveIntegerField(unique=True, blank=True, null=True)
     shortcuts_enabled = models.BooleanField(
-        verbose_name=_("Enable shortcuts on Re2o website"), default=True
+        verbose_name=_("enable shortcuts on Re2o website"), default=True
     )
 
     USERNAME_FIELD = "pseudo"
@@ -238,9 +238,9 @@ class User(
             ("change_user_shell", _("Can edit the shell of a user")),
             (
                 "change_user_groups",
-                _("Can edit the groups of rights of a user (critical" " permission)"),
+                _("Can edit the groups of rights of a user (critical permission)"),
             ),
-            ("change_all_users", _("Can edit all users, including those with rights.")),
+            ("change_all_users", _("Can edit all users, including those with rights")),
             ("view_user", _("Can view a user object")),
         )
         verbose_name = _("user (member or club)")
@@ -548,21 +548,21 @@ class User(
         interfaces = self.user_interfaces()
         with transaction.atomic(), reversion.create_revision():
             Interface.mass_assign_ipv4(interfaces)
-            reversion.set_comment(_("IPv4 assigning"))
+            reversion.set_comment("IPv4 assignment")
 
     def unassign_ips(self):
         """ Désassigne les ipv4 aux machines de l'user"""
         interfaces = self.user_interfaces()
         with transaction.atomic(), reversion.create_revision():
             Interface.mass_unassign_ipv4(interfaces)
-            reversion.set_comment(_("IPv4 unassigning"))
+            reversion.set_comment("IPv4 unassignment")
 
     @classmethod
     def mass_unassign_ips(cls, users_list):
         interfaces = cls.users_interfaces(users_list)
         with transaction.atomic(), reversion.create_revision():
             Interface.mass_unassign_ipv4(interfaces)
-            reversion.set_comment(_("IPv4 assigning"))
+            reversion.set_comment("IPv4 assignment")
 
     @classmethod
     def mass_disable_email(cls, queryset_users):
@@ -761,11 +761,10 @@ class User(
             "url": request.build_absolute_uri(
                 reverse("users:process", kwargs={"token": req.token})
             ),
-            "expire_in": str(GeneralOption.get_cached_value("req_expire_hrs"))
-            + " hours",
+            "expire_in": str(GeneralOption.get_cached_value("req_expire_hrs")),
         }
         send_mail(
-            "Changement de mot de passe du %(name)s / Password renewal for "
+            "Changement de mot de passe de %(name)s / Password change for "
             "%(name)s" % {"name": AssoOption.get_cached_value("name")},
             template.render(context),
             GeneralOption.get_cached_value("email_from"),
@@ -902,7 +901,7 @@ class User(
                 if self.groups.filter(listright__critical=True):
                     return (
                         False,
-                        _("User with critical rights, can't be edited. "),
+                        _("User with critical rights, can't be edited."),
                         ("users.change_all_users",),
                     )
                 elif self == AssoOption.get_cached_value("utilisateur_asso"):
@@ -910,7 +909,7 @@ class User(
                         False,
                         _(
                             "Impossible to edit the organisation's"
-                            " user without the 'change_all_users' right."
+                            " user without the \"change_all_users\" right."
                         ),
                         ("users.change_all_users",),
                     )
@@ -985,7 +984,7 @@ class User(
         ):
             return (
                 False,
-                _("Permission required to change the room."),
+                _("You don't have the right to change the room."),
                 ("users.change_user",),
             )
         else:
@@ -1002,7 +1001,7 @@ class User(
         can = user_request.has_perm("users.change_user_state")
         return (
             can,
-            _("Permission required to change the state.") if not can else None,
+            _("You don't have the right to change the state.") if not can else None,
             ("users.change_user_state",),
         )
 
@@ -1022,7 +1021,7 @@ class User(
         ):
             return (
                 False,
-                _("Permission required to change the shell."),
+                _("You don't have the right to change the shell."),
                 ("users.change_user_shell",),
             )
         else:
@@ -1069,7 +1068,7 @@ class User(
         can = user_request.has_perm("users.change_user_force")
         return (
             can,
-            _("Permission required to force the move.") if not can else None,
+            _("You don't have the right to force the move.") if not can else None,
             ("users.change_user_force",),
         )
 
@@ -1084,7 +1083,7 @@ class User(
         can = user_request.has_perm("users.change_user_grou")
         return (
             can,
-            _("Permission required to edit the user's groups of rights.")
+            _("You don't have the right to edit the user's groups of rights.")
             if not can
             else None,
             ("users.change_user_groups"),
@@ -1100,7 +1099,7 @@ class User(
         can = user_request.is_superuser
         return (
             can,
-            _("'superuser' right required to edit the superuser flag.")
+            _("\"superuser\" right required to edit the superuser flag.")
             if not can
             else None,
             [],
@@ -1241,7 +1240,7 @@ class Adherent(User):
             gpg_fingerprint = self.gpg_fingerprint.replace(" ", "").upper()
             if not re.match("^[0-9A-F]{40}$", gpg_fingerprint):
                 raise ValidationError(
-                    _("A GPG fingerprint must contain 40 hexadecimal characters")
+                    _("A GPG fingerprint must contain 40 hexadecimal characters.")
                 )
             self.gpg_fingerprint = gpg_fingerprint
 
@@ -1265,7 +1264,7 @@ class Adherent(User):
         if not user_request.is_authenticated and not OptionalUser.get_cached_value(
             "self_adhesion"
         ):
-            return False, _("Self adhesion is disabled."), None
+            return False, _("Self registration is disabled."), None
         else:
             if OptionalUser.get_cached_value(
                 "all_can_create_adherent"
@@ -1418,7 +1417,7 @@ class ServiceUser(RevMixin, AclMixin, AbstractBaseUser):
         validators=[linux_user_validator],
     )
     access_group = models.CharField(choices=ACCESS, default=readonly, max_length=32)
-    comment = models.CharField(help_text=_("Comment"), max_length=255, blank=True)
+    comment = models.CharField(help_text=_("Comment."), max_length=255, blank=True)
 
     USERNAME_FIELD = "pseudo"
     objects = UserManager()
@@ -1518,13 +1517,13 @@ class ListRight(RevMixin, AclMixin, Group):
         validators=[
             RegexValidator(
                 "^[a-z]+$",
-                message=(_("UNIX groups can only contain lower case letters.")),
+                message=(_("UNIX group names can only contain lower case letters.")),
             )
         ],
     )
     gid = models.PositiveIntegerField(unique=True, null=True)
     critical = models.BooleanField(default=False)
-    details = models.CharField(help_text=_("Description"), max_length=255, blank=True)
+    details = models.CharField(help_text=_("Description."), max_length=255, blank=True)
 
     class Meta:
         permissions = (("view_listright", _("Can view a group of rights object")),)
@@ -1643,7 +1642,7 @@ class Ban(RevMixin, AclMixin, models.Model):
         if not user_request.has_perm("users.view_ban") and self.user != user_request:
             return (
                 False,
-                _("You don't have the right to view bans other than yours."),
+                _("You don't have the right to view other bans than yours."),
                 ("users.view_ban",),
             )
         else:
@@ -1713,7 +1712,7 @@ class Whitelist(RevMixin, AclMixin, models.Model):
         ):
             return (
                 False,
-                _("You don't have the right to view whitelists other than yours."),
+                _("You don't have the right to view other whitelists than yours."),
                 ("users.view_whitelist",),
             )
         else:
@@ -1910,10 +1909,10 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
     """
 
     user = models.ForeignKey(
-        User, on_delete=models.CASCADE, help_text=_("User of the local email account")
+        User, on_delete=models.CASCADE, help_text=_("User of the local email account.")
     )
     local_part = models.CharField(
-        unique=True, max_length=128, help_text=_("Local part of the email address")
+        unique=True, max_length=128, help_text=_("Local part of the email address.")
     )
 
     class Meta:
@@ -1990,7 +1989,7 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
         return (
             False,
             _(
-                "You don't have the right to edit another user's local"
+                "You don't have the right to view another user's local"
                 " email account."
             ),
             ("users.view_emailaddress",),
@@ -2025,7 +2024,7 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
             False,
             _(
                 "You don't have the right to delete another user's"
-                " local email account"
+                " local email account."
             ),
             ("users.delete_emailaddress",),
         )
diff --git a/users/templates/users/aff_listright.html b/users/templates/users/aff_listright.html
index 2a829e7e..489a713a 100644
--- a/users/templates/users/aff_listright.html
+++ b/users/templates/users/aff_listright.html
@@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <i class="fa fa-address-book"></i>
             {% trans "Superuser" %}
         </h4>
-        {% trans "Django's specific pre-defined right that supersed any other rights." %}
+        {% trans "Django's specific pre-defined right that supersedes any other rights." %}
     </div>
     <div class="panel-collapse collapse" id="collapse_superuser">
         <div class="panel-body">
diff --git a/users/templates/users/aff_serviceusers.html b/users/templates/users/aff_serviceusers.html
index 6d0c7dc8..68de1d99 100644
--- a/users/templates/users/aff_serviceusers.html
+++ b/users/templates/users/aff_serviceusers.html
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <thead>
             <tr>
                 <th>{% trans "Name" %}</th>
-                <th>{% trans "Role" %}</th>
+                <th>{% trans "Access group" %}</th>
                 <th>{% trans "Comment" %}</th>
                 <th></th>
             </tr>
diff --git a/users/templates/users/email_auto_newmachine b/users/templates/users/email_auto_newmachine
index d98cc160..69ae6dec 100644
--- a/users/templates/users/email_auto_newmachine
+++ b/users/templates/users/email_auto_newmachine
@@ -1,27 +1,31 @@
-<p>Bonjour {{nom}} </p>
+<p>Bonjour {{ nom }},</p>
 
 <p>Une nouvelle machine a automatiquement été inscrite sur votre compte.</p>
 
-<p>Si vous êtes à l'origine de la connexion de cet appareil en filaire ou wifi, ne tenez pas compte de cette notification</p>
+<p>Si vous êtes à l'origine de la connexion de cet appareil en filaire ou Wi-Fi, ne tenez pas compte de ce mail.</p>
 
-<p>La nouvelle machine possède l'adresse mac {{ mac_address }}, et s'est vu assigner le nom suivant : {{ interface_name }}</p>
+<p>La nouvelle machine possède l'adresse MAC {{ mac_address }}, et s'est vu assigner le nom suivant : {{ interface_name }}.</p>
 
-<p>Vous pouvez à tout moment modifier ces informations sur votre compte en ligne</p>
+<p>Vous pouvez à tout moment modifier ces informations sur votre compte en ligne.</p>
 
-<p>Si vous n'êtes pas à l'origine de cette connexion, merci de le signaler rapidement à {{asso_email}}</p>
+<p>Si vous n'êtes pas à l'origine de cette connexion, veuillez le signaler rapidement à {{ asso_email }}.</p>
 
-<p>À bientôt,<br>
-L'équipe de {{asso_name}}.</p>
+<p>Respectueusement,<br>
+L'équipe de {{ asso_name }}.</p>
 
 <p>---</p>
 
-<p>A new device has been automatically added on your account.</p>
+<p>Hello {{ nom }},</p>
 
-<p>If you connected a new device recently, please don't take this mail into account<p>
+<p>A new machine has been automatically added on your account.</p>
 
-<p>The new device has this mac address : {{ mac_address }}, and this name : {{ interface_name }}</p>
+<p>If you are the one who connected this machine with wire of Wi-Fi, don't take this mail into account.<p>
 
-<p>Please contact us if you didn't connect a new device with this mail address {{asso_email}}.</p>
+<p>The new machine has this MAC address: {{ mac_address }}, and has been assigned this name: {{ interface_name }}</p>
+
+<p>At any time, you can edit this information on your online account.</p>
+
+<p>If you didn't connect this machine, please report it quickly to {{ asso_email }}.</p>
 
 <p>Regards,<br>
-The {{asso_name}} team.</p>
+The {{ asso_name }} team.</p>
diff --git a/users/templates/users/email_ban_notif b/users/templates/users/email_ban_notif
index f61cd840..294bb1e5 100644
--- a/users/templates/users/email_ban_notif
+++ b/users/templates/users/email_ban_notif
@@ -1,8 +1,19 @@
-Bonjour {{name}},
+<p>Bonjour {{ name }},</p>
 
-Vous avez été banni par un administrateur de {{ asso_name }} en raison de {{raison}}. Vous n'avez plus accès au réseau jusqu'au {{date_end}}.
+<p>Vous avez été banni par un administrateur de {{ asso_name }} pour la raison suivante : {{ raison }}. Vous n'avez plus accès au réseau jusqu'au {{ date_end }}.</p>
 
-Pour de plus amples informations, rendez-vous à l'accueil de {{ asso_name }}.
+<p>Pour de plus amples renseignements, contactez le comité de direction de {{ asso_name }}.</p>
 
-Cordialement,
-	L'équipe de {{ asso_name }}. 
+<p>Respectueusement,<br>
+L'équipe de {{ asso_name }}.</p>
+
+<p>---</p>
+
+<p>Hello {{ name }},</p>
+
+<p>You have been banned by a administrator of {{ asso_name }} for the following reason: {{ raison }}. You don't have access to the network anymore until {{ date_end }}.</p>
+
+<p>For more information, contact the steering committee of {{ asso_name }}.</p>
+
+<p>Regards,<br>
+The {{ asso_name }} team.</p>
diff --git a/users/templates/users/email_passwd_request b/users/templates/users/email_passwd_request
index 2a648d55..21049ae4 100644
--- a/users/templates/users/email_passwd_request
+++ b/users/templates/users/email_passwd_request
@@ -1,33 +1,33 @@
 Bonjour {{ name }},
 
-Vous trouverez ci-dessous une url permetant d'initialiser ou de reinitialiser votre
-compte {{ site_name }}. Celui-ci vous permet de gérer l'ensemble de vos équipements
-connectés, votre compte, vos factures, et tous les services proposés sur le réseau.
+Vous trouverez ci-dessous une URL permettant d'initialiser ou de réinitialiser votre
+mot de passe pour votre compte {{ site_name }}. Celui-ci vous permet de gérer l'ensemble
+de vos équipements, votre compte, vos factures, et tous les services proposés sur le réseau.
 
     {{ url }}
 
 Contactez les administrateurs si vous n'êtes pas à l'origine de cette requête.
 
-Ce lien expirera dans {{ expire_in }}.
+Ce lien expirera dans {{ expire_in }} heures.
 
-Cordialement,
+Respectueusement,
 
 L'équipe de {{ asso }} (contact : {{ asso_mail }}).
 
-----------------------
+---
 
-Hi {{ name }},
+Hello {{ name }},
 
-You will find a link allowing you to change the password of your account on {{ site_name }}.
-On this website you will then be able to manage your devices on the {{ asso }}.
+You will find below an URL allowing you to set or reset your the password of your account
+on {{ site_name }}. It enables you to manage your devices, your account, your invoices, and all
+the services offered on the network.
 
     {{ url }}
 
-This link will expire in {{ expire_in }}.
+Contact the administrators if you didn't request this.
 
-Send an email at {{ asso_mail }} if you didn't request this or if you have
-any other question.
+This link will expire in {{ expire_in }} hours.
 
-Thanks
+Regards,
 
-The team of {{ asso }} (contact : {{ asso_mail }}).
+The {{ asso }} team (contact: {{ asso_mail }}).
diff --git a/users/templates/users/email_welcome b/users/templates/users/email_welcome
index 27e92cc7..ba1b1756 100644
--- a/users/templates/users/email_welcome
+++ b/users/templates/users/email_welcome
@@ -2,7 +2,7 @@
 
 <p>Il vous suffit maintenant de payer l'adhésion pour devenir adhérent de {{asso_name}} et bénéficier des services. Pour avoir accès à Internet, il vous faudra payer la connexion.</p>
 
-<p>Pour ce faire, rien de plus simple. Une fois que vous aurez défini votre mot de passe, il vous suffira d'accéder à votre profil et de cliquer sur 'Payer la connexion'</p>
+<p>Pour ce faire, rien de plus simple. Une fois que vous aurez défini votre mot de passe, il vous suffira d'accéder à votre profil et de cliquer sur « Payer une connexion »</p>
 
 <p>Votre pseudo est : {{pseudo}}</p>
 
@@ -10,21 +10,22 @@
 
 <p>Pour nous faire part de toute remarque, suggestion ou problème vous pouvez nous envoyer un mail à {{asso_email}}.</p>
 
-<p>À bientôt,<br>
+<p>Respectueusement,<br>
 L'équipe de {{asso_name}}.</p>
 
 <p>---</p>
 
-<p>You just need to pay membership to become a full member of {{asso_name}} and benefit from the services. To have Internet access, you will need to pay the connexion. </p>
+<p>Hello {{nom}}!</p>
 
-<p>Nothing could be simpler. Once your password is defined, you just need to visit your profile and click on 'Pay for a connexion'.</p>
+<p>You just need to pay the membership fee to become a contributing member of {{asso_name}} and benefit from the services. To get Internet access, you will need to pay the connection.</p>
 
-<p>Your username is : {{pseudo}}<p>
+<p>Nothing could be simpler. Once your password is defined, you just need to access your profile and click on "Pay for a connection".</p>
+
+<p>Your username is: {{pseudo}}<p>
 
 {{welcome_mail_en|safe}}
 
-<p>For any information, suggestion or problem, you can contact us via email at<br>
-{{asso_email}}.</p>
+<p>To express any comment, suggestion or problem, you can send us an email to {{asso_email}}.</p>
 
 <p>Regards,<br>
 The {{asso_name}} team.</p>
diff --git a/users/templates/users/index_listright.html b/users/templates/users/index_listright.html
index cb5b86d6..32b18134 100644
--- a/users/templates/users/index_listright.html
+++ b/users/templates/users/index_listright.html
@@ -32,9 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
 <h2>{% trans "List of groups of rights" %}</h2>
   {% can_create ListRight %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-listright'  %}"><i class="fa fa-plus"></i>{% trans " Add a group of rights" %}</a>
+  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-listright'  %}"><i class="fa fa-plus"></i> {% trans "Add a group of rights" %}</a>
   {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-listright'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several groups of rights" %}</a>
+  <a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-listright'  %}"><i class="fa fa-trash"></i> {% trans "Delete one or several groups of rights" %}</a>
   <br />
   <br />
   {%  include 'users/aff_listright.html' %}
diff --git a/users/templates/users/index_schools.html b/users/templates/users/index_schools.html
index 4d86ce67..6e98465b 100644
--- a/users/templates/users/index_schools.html
+++ b/users/templates/users/index_schools.html
@@ -31,11 +31,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>{% trans "List of schools" %}</h2>
-  <h5>{% trans "List of schools for created users" %}</h5>
+  <h5>{% trans "List of schools for registered users" %}</h5>
   {% can_create School %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-school'  %}"><i class="fa fa-plus"></i>{% trans " Add a school" %}</a>
+  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-school'  %}"><i class="fa fa-plus"></i> {% trans "Add a school" %}</a>
   {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-school'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several schools" %}</a>
+  <a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-school'  %}"><i class="fa fa-trash"></i> {% trans "Delete one or several schools" %}</a>
   <hr>
   {%  include 'users/aff_schools.html' with  school_list=school_list %}
   <br />
diff --git a/users/templates/users/index_serviceusers.html b/users/templates/users/index_serviceusers.html
index c7684488..0ab7db9b 100644
--- a/users/templates/users/index_serviceusers.html
+++ b/users/templates/users/index_serviceusers.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   <h2>{% trans "List of LDAP service users" %}</h2>
   <h5>{% trans "The LDAP service users are special users having access only to the LDAP for authentication operations. It is recommended to create a service user with a login and a password for any concerned service." %}</h5>
   {% can_create ServiceUser %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:new-serviceuser'  %}"><i class="fa fa-plus"></i>{% trans " Add a service user" %}</a>
+  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:new-serviceuser'  %}"><i class="fa fa-plus"></i> {% trans "Add a service user" %}</a>
   {% acl_end %}
   {%  include 'users/aff_serviceusers.html' with  serviceusers_list=serviceusers_list %}
   <br />
diff --git a/users/templates/users/index_shell.html b/users/templates/users/index_shell.html
index d476f9d2..e029b107 100644
--- a/users/templates/users/index_shell.html
+++ b/users/templates/users/index_shell.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
   <h2>{% trans "List of shells" %}</h2>
   {% can_create ListShell %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-shell'  %}"><i class="fa fa-plus"></i>{% trans " Add a shell" %}</a>
+  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-shell'  %}"><i class="fa fa-plus"></i> {% trans "Add a shell" %}</a>
   {% acl_end %}
   {%  include 'users/aff_shell.html' with shell_list=shell_list %}
   <br />
diff --git a/users/templates/users/mass_archive.html b/users/templates/users/mass_archive.html
index c3f67a34..5b44f6ec 100644
--- a/users/templates/users/mass_archive.html
+++ b/users/templates/users/mass_archive.html
@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <input type="submit" name="valider" value={% trans "Confirm" %} class="btn btn-primary" id="submit-id-submit">
 </form>
 
-<h3>{% blocktrans %}The following users will be archived ({{ to_archive_list|length }}):{% endblocktrans %}</h3>
+<h3>{% blocktrans %}The following users will be archived:{% endblocktrans %}</h3>
 {%  include 'users/aff_users.html' with  users_list=to_archive_list %}
 <br />
 <br />
diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index bf3fd9e5..0bd25f75 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -43,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <div class="col-sm-6 {% if solde_activated %}col-md-4{% else %}col_md-6{% endif %}">
             {% if users.is_ban%}
             <div class="panel panel-danger">
-                <div class="panel-heading dashboard">{% trans "Your account has been banned" %}</div>
+                <div class="panel-heading dashboard">{% trans "Your account has been banned." %}</div>
                 <div class="panel-body dashboard">
                     <i class="text-danger">{% blocktrans with end_ban_date=users.end_ban|date:"SHORT_DATE_FORMAT" %}End of the ban: {{ end_ban_date }}{% endblocktrans %}</i>
                 </div>
@@ -57,7 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                         <i class="fa fa-sign-in"></i> {% trans "Pay for a connection" %}
                     </a>
                     {% acl_else %}
-                    {% trans "Ask for someone with the appropriate rights to pay for a connection." %}
+                    {% trans "Ask someone with the appropriate rights to pay for a connection." %}
                     {% acl_end %}
                 </div>
             </div>
@@ -94,11 +94,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <div class="panel panel-info">
                 <div class="panel-heading dashboard" data-parent="#accordion" data-toggle="collapse"
                      data-target="#machines">
-                <i class="fa fa-desktop"></i>{% trans " Machines" %} <span class="badge"> {{ nb_machines }}</span>
+                <i class="fa fa-desktop"></i> {% trans "Machines" %} <span class="badge"> {{ nb_machines }}</span>
                 </div>
                 <div class="panel-body dashboard">
                     <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
-                        <i class="fa fa-desktop"></i>{% trans " Add a machine" %}
+                        <i class="fa fa-desktop"></i> {% trans "Add a machine" %}
                     </a>
                 </div>
             </div>
@@ -110,7 +110,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 </div>
                 <div class="panel-body dashboard">
                     <a class="btn btn-warning btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
-                        <i class="fa fa-desktop"></i>{% trans " Add a machine" %}
+                        <i class="fa fa-desktop"></i> {% trans "Add a machine" %}
                     </a>
                 </div>
             </div>
@@ -125,7 +125,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <div class="panel-heading clearfix profil" data-parent="#accordion" data-toggle="collapse"
              data-target="#information">
             <h3 class="panel-title pull-left">
-                <i class="fa fa-user"></i>{% trans " Detailed information" %}
+                <i class="fa fa-user"></i> {% trans "Detailed information" %}
             </h3>
         </div>
         <div class="panel-collapse collapse collapse-default" id="information">
@@ -225,7 +225,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                         {% if users.end_adhesion != None %}
                             <dd><i class="text-success">{{ users.end_adhesion }}</i></dd>
                         {% else %}
-                            <dd><i class="text-danger">{% trans "not a member" %}</i></dd>
+                            <dd><i class="text-danger">{% trans "Not a member" %}</i></dd>
                         {% endif %}
                     </div>
 
@@ -256,9 +256,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                         {% elif users.state == 2 %}
                             <dd><i class="text-danger">{% trans "Archived" %}</i></dd>
                         {% elif users.state == 3 %}
-                            <dd><i class="text-danger">{% trans "Not yet member" %}</i></dd>
+                            <dd><i class="text-danger">{% trans "Not yet active" %}</i></dd>
                         {% elif users.state == 4 %}
-                            <dd><i class="text-danger">{% trans "Full Archived" %}</i></dd>
+                            <dd><i class="text-danger">{% trans "Fully archived" %}</i></dd>
                         {% endif %}
                     </div>
 
@@ -320,7 +320,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div class="panel panel-default">
         <div class="panel-heading clearfix profil" data-parent="#accordion" data-toggle="collapse" data-target="#club">
             <h3 class="panel-title pull-left">
-                <i class="fa fa-users"></i>{% trans " Manage the club" %}
+                <i class="fa fa-users"></i> {% trans "Manage the club" %}
             </h3>
         </div>
         <div class="panel-collapse collapse" id="club">
@@ -484,14 +484,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div class="panel panel-default">
         <div class="panel-heading clearfix profil" data-parent="#accordion" data-toggle="collapse" data-target="#email">
             <h3 class="panel-title pull-left">
-                <i class="fa fa-envelope"></i>{% trans " Email settings" %}
+                <i class="fa fa-envelope"></i> {% trans "Email settings" %}
             </h3>
         </div>
         <div id="email" class="panel-collapse collapse">
             <div class="panel-body">
                 {% can_edit users %}
                 <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-email-settings' users.id %}">
-                    <i class="fa fa-pencil"></i>{% trans " Edit email settings" %}
+                    <i class="fa fa-pencil"></i> {% trans "Edit email settings" %}
                 </a>
                 {% acl_end %}
             </div>
@@ -510,12 +510,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             <td>{{ users.local_email_redirect | tick }}</td>
                         </tr>
                     </table>
-                    <p>{% trans "The contact email address is the email address where we send emails to contact you. If you would like to use your external email address for that, you can either disable your local email address or enable the local email redirection." %}</p>
+                    <p>{% trans "The contact email address is the email address to which we send emails to contact you. If you would like to use your external email address for that, you can either disable your local email address or enable the local email redirection." %}</p>
                 </div>
                 {% if users.local_email_enabled %}
                 {% can_create EMailAddress users.id %}
                 <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-emailaddress' users.id %}">
-                    <i class="fa fa-plus-square"></i>{% trans " Add an email address" %}
+                    <i class="fa fa-plus-square"></i> {% trans "Add an email address" %}
                 </a>
                 {% acl_end %}
                 {% if emailaddress_list %}
diff --git a/users/templates/users/user_autocapture.html b/users/templates/users/user_autocapture.html
index 79a4b3c2..469e2ec3 100644
--- a/users/templates/users/user_autocapture.html
+++ b/users/templates/users/user_autocapture.html
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block content %}
 {% bootstrap_form_errors userform %}
 
-<h2>{% blocktrans %}Device and room register form{% endblocktrans %}</h2>
+<h2>{% trans "Device and room register form" %}</h2>
 
 <form class="form" method="post">
     {% csrf_token %}
@@ -61,7 +61,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </div>
 </div>
 
-<center>{% bootstrap_button _("OK") button_type="submit" icon='ok' button_class='btn-success' %}</center>
+{% trans "OK" as tr_ok %}
+<center>{% bootstrap_button tr_ok button_type="submit" icon='ok' button_class='btn-success' %}</center>
 </form>
 
 
diff --git a/users/views.py b/users/views.py
index abc7025e..3fb4d472 100644
--- a/users/views.py
+++ b/users/views.py
@@ -124,7 +124,7 @@ def new_user(request):
         user.reset_passwd_mail(request)
         messages.success(
             request,
-            _("The user %s was created, an email to set" " the password was sent.")
+            _("The user %s was created, an email to set the password was sent.")
             % user.pseudo,
         )
         return redirect(reverse("users:profil", kwargs={"userid": str(user.id)}))
@@ -153,7 +153,7 @@ def new_club(request):
         club.reset_passwd_mail(request)
         messages.success(
             request,
-            _("The club %s was created, an email to set" " the password was sent.")
+            _("The club %s was created, an email to set the password was sent.")
             % club.pseudo,
         )
         return redirect(reverse("users:profil", kwargs={"userid": str(club.id)}))
@@ -181,7 +181,7 @@ def edit_club_admin_members(request, club_instance, **_kwargs):
         {
             "userform": club,
             "showCGU": False,
-            "action_name": _("Edit the admins and members"),
+            "action_name": _("Edit"),
         },
         "users/user.html",
         request,
@@ -208,7 +208,7 @@ def edit_info(request, user, userid):
             messages.success(request, _("The user was edited."))
         return redirect(reverse("users:profil", kwargs={"userid": str(userid)}))
     return form(
-        {"userform": user_form, "action_name": _("Edit the user")},
+        {"userform": user_form, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -225,7 +225,7 @@ def state(request, user, userid):
             messages.success(request, _("The state was edited."))
         return redirect(reverse("users:profil", kwargs={"userid": str(userid)}))
     return form(
-        {"userform": state_form, "action_name": _("Edit the state")},
+        {"userform": state_form, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -242,7 +242,7 @@ def groups(request, user, userid):
             messages.success(request, _("The groups were edited."))
         return redirect(reverse("users:profil", kwargs={"userid": str(userid)}))
     return form(
-        {"userform": group_form, "action_name": _("Edit the groups")},
+        {"userform": group_form, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -297,7 +297,7 @@ def new_serviceuser(request):
         messages.success(request, _("The service user was created."))
         return redirect(reverse("users:index-serviceusers"))
     return form(
-        {"userform": user, "action_name": _("Create a service user")},
+        {"userform": user, "action_name": _("Add")},
         "users/user.html",
         request,
     )
@@ -314,7 +314,7 @@ def edit_serviceuser(request, serviceuser, **_kwargs):
         messages.success(request, _("The service user was edited."))
         return redirect(reverse("users:index-serviceusers"))
     return form(
-        {"userform": serviceuser, "action_name": _("Edit a service user")},
+        {"userform": serviceuser, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -329,7 +329,7 @@ def del_serviceuser(request, serviceuser, **_kwargs):
         messages.success(request, _("The service user was deleted."))
         return redirect(reverse("users:index-serviceusers"))
     return form(
-        {"objet": serviceuser, "objet_name": "service user"},
+        {"objet": serviceuser, "objet_name": _("service user")},
         "users/delete.html",
         request,
     )
@@ -351,7 +351,7 @@ def add_ban(request, user, userid):
     if user.is_ban():
         messages.error(request, _("Warning: this user already has an active ban."))
     return form(
-        {"userform": ban, "action_name": _("Add a ban")}, "users/user.html", request
+        {"userform": ban, "action_name": _("Add")}, "users/user.html", request
     )
 
 
@@ -368,7 +368,7 @@ def edit_ban(request, ban_instance, **_kwargs):
             messages.success(request, _("The ban was edited."))
         return redirect(reverse("users:index"))
     return form(
-        {"userform": ban, "action_name": _("Edit a ban")}, "users/user.html", request
+        {"userform": ban, "action_name": _("Edit")}, "users/user.html", request
     )
 
 
@@ -380,7 +380,7 @@ def del_ban(request, ban, **_kwargs):
         ban.delete()
         messages.success(request, _("The ban was deleted."))
         return redirect(reverse("users:profil", kwargs={"userid": str(ban.user.id)}))
-    return form({"objet": ban, "objet_name": "ban"}, "users/delete.html", request)
+    return form({"objet": ban, "objet_name": _("ban")}, "users/delete.html", request)
 
 
 @login_required
@@ -402,7 +402,7 @@ def add_whitelist(request, user, userid):
             request, _("Warning: this user already has an active whitelist.")
         )
     return form(
-        {"userform": whitelist, "action_name": _("Add a whitelist")},
+        {"userform": whitelist, "action_name": _("Add")},
         "users/user.html",
         request,
     )
@@ -422,7 +422,7 @@ def edit_whitelist(request, whitelist_instance, **_kwargs):
             messages.success(request, _("The whitelist was edited."))
         return redirect(reverse("users:index"))
     return form(
-        {"userform": whitelist, "action_name": _("Edit a whitelist")},
+        {"userform": whitelist, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -439,7 +439,7 @@ def del_whitelist(request, whitelist, **_kwargs):
             reverse("users:profil", kwargs={"userid": str(whitelist.user.id)})
         )
     return form(
-        {"objet": whitelist, "objet_name": "whitelist"}, "users/delete.html", request
+        {"objet": whitelist, "objet_name": _("whitelist")}, "users/delete.html", request
     )
 
 
@@ -460,7 +460,7 @@ def add_emailaddress(request, user, userid):
         {
             "userform": emailaddress,
             "showCGU": False,
-            "action_name": _("Add a local email account"),
+            "action_name": _("Add"),
         },
         "users/user.html",
         request,
@@ -487,7 +487,7 @@ def edit_emailaddress(request, emailaddress_instance, **_kwargs):
         {
             "userform": emailaddress,
             "showCGU": False,
-            "action_name": _("Edit a local email account"),
+            "action_name": _("Edit"),
         },
         "users/user.html",
         request,
@@ -505,7 +505,7 @@ def del_emailaddress(request, emailaddress, **_kwargs):
             reverse("users:profil", kwargs={"userid": str(emailaddress.user.id)})
         )
     return form(
-        {"objet": emailaddress, "objet_name": "emailaddress"},
+        {"objet": emailaddress, "objet_name": _("email address")},
         "users/delete.html",
         request,
     )
@@ -530,7 +530,7 @@ def edit_email_settings(request, user_instance, **_kwargs):
             "userform": email_settings,
             "showCGU": False,
             "load_js_file": "/static/js/email_address.js",
-            "action_name": _("Edit the email settings"),
+            "action_name": _("Edit"),
         },
         "users/user.html",
         request,
@@ -548,7 +548,7 @@ def add_school(request):
         messages.success(request, _("The school was added."))
         return redirect(reverse("users:index-school"))
     return form(
-        {"userform": school, "action_name": _("Add a school")},
+        {"userform": school, "action_name": _("Add")},
         "users/user.html",
         request,
     )
@@ -566,7 +566,7 @@ def edit_school(request, school_instance, **_kwargs):
             messages.success(request, _("The school was edited."))
         return redirect(reverse("users:index-school"))
     return form(
-        {"userform": school, "action_name": _("Edit a school")},
+        {"userform": school, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -597,7 +597,7 @@ def del_school(request, instances):
                 )
         return redirect(reverse("users:index-school"))
     return form(
-        {"userform": school, "action_name": _("Delete")}, "users/user.html", request
+        {"userform": school, "action_name": _("Confirm")}, "users/user.html", request
     )
 
 
@@ -611,7 +611,7 @@ def add_shell(request):
         messages.success(request, _("The shell was added."))
         return redirect(reverse("users:index-shell"))
     return form(
-        {"userform": shell, "action_name": _("Add a shell")}, "users/user.html", request
+        {"userform": shell, "action_name": _("Add")}, "users/user.html", request
     )
 
 
@@ -626,7 +626,7 @@ def edit_shell(request, shell_instance, **_kwargs):
             messages.success(request, _("The shell was edited."))
         return redirect(reverse("users:index-shell"))
     return form(
-        {"userform": shell, "action_name": _("Edit a shell")},
+        {"userform": shell, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -640,7 +640,7 @@ def del_shell(request, shell, **_kwargs):
         shell.delete()
         messages.success(request, _("The shell was deleted."))
         return redirect(reverse("users:index-shell"))
-    return form({"objet": shell, "objet_name": "shell"}, "users/delete.html", request)
+    return form({"objet": shell, "objet_name": _("shell")}, "users/delete.html", request)
 
 
 @login_required
@@ -654,7 +654,7 @@ def add_listright(request):
         messages.success(request, _("The group of rights was added."))
         return redirect(reverse("users:index-listright"))
     return form(
-        {"userform": listright, "action_name": _("Add a group of rights")},
+        {"userform": listright, "action_name": _("Add")},
         "users/user.html",
         request,
     )
@@ -672,7 +672,7 @@ def edit_listright(request, listright_instance, **_kwargs):
             messages.success(request, _("The group of rights was edited."))
         return redirect(reverse("users:index-listright"))
     return form(
-        {"userform": listright, "action_name": _("Edit a group of rights")},
+        {"userform": listright, "action_name": _("Edit")},
         "users/user.html",
         request,
     )
@@ -689,7 +689,7 @@ def del_listright(request, instances):
         for listright_del in listright_dels:
             try:
                 listright_del.delete()
-                messages.success(request, _("The group of rights was" " deleted."))
+                messages.success(request, _("The group of rights was deleted."))
             except ProtectedError:
                 messages.error(
                     request,
@@ -701,7 +701,7 @@ def del_listright(request, instances):
                 )
         return redirect(reverse("users:index-listright"))
     return form(
-        {"userform": listright, "action_name": _("Delete")}, "users/user.html", request
+        {"userform": listright, "action_name": _("Confirm")}, "users/user.html", request
     )
 
 
@@ -993,7 +993,7 @@ def process_passwd(request, req):
     if u_form.is_valid():
         with transaction.atomic(), reversion.create_revision():
             u_form.save()
-            reversion.set_comment(_("Password reset"))
+            reversion.set_comment("Password reset")
         req.delete()
         messages.success(request, _("The password was changed."))
         return redirect(reverse("index"))