Typo and regenerate traductions

`Firt name` was changed to `First name` and Django messages files (.po)
were regenerated to reflect new line numbers.

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: 2018-08-15 20:12+0200\n"
+"POT-Creation-Date: 2018-12-29 21:16+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,107 +30,116 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: acl.py:42
+#: logs/acl.py:42
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: templates/logs/aff_stats_logs.html:36
+#: logs/templates/logs/aff_stats_logs.html:36
 msgid "Edited object"
 msgstr "Objet modifié"
 
-#: templates/logs/aff_stats_logs.html:37
+#: logs/templates/logs/aff_stats_logs.html:37
-#: templates/logs/aff_stats_models.html:32
+#: logs/templates/logs/aff_stats_models.html:32
 msgid "Object type"
 msgstr "Type d'objet"
 
-#: templates/logs/aff_stats_logs.html:38
+#: logs/templates/logs/aff_stats_logs.html:38
 msgid "Edited by"
 msgstr "Modifié par"
 
-#: templates/logs/aff_stats_logs.html:40
+#: logs/templates/logs/aff_stats_logs.html:40
 msgid "Date of editing"
 msgstr "Date de modification"
 
-#: templates/logs/aff_stats_logs.html:42
+#: logs/templates/logs/aff_stats_logs.html:42
 msgid "Comment"
 msgstr "Commentaire"
 
-#: templates/logs/aff_stats_logs.html:58 templates/logs/aff_summary.html:62
+#: logs/templates/logs/aff_stats_logs.html:58
-#: templates/logs/aff_summary.html:85 templates/logs/aff_summary.html:104
+#: logs/templates/logs/aff_summary.html:62
-#: templates/logs/aff_summary.html:123 templates/logs/aff_summary.html:142
+#: logs/templates/logs/aff_summary.html:85
+#: logs/templates/logs/aff_summary.html:104
+#: logs/templates/logs/aff_summary.html:128
+#: logs/templates/logs/aff_summary.html:147
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/logs/aff_stats_models.html:29
+#: logs/templates/logs/aff_stats_models.html:29
 #, python-format
 msgid "Statistics of the set %(key)s"
 msgstr "Statistiques de l'ensemble %(key)s"
 
-#: templates/logs/aff_stats_models.html:33
+#: logs/templates/logs/aff_stats_models.html:33
 msgid "Number of stored entries"
 msgstr "Nombre d'entrées enregistrées"
 
-#: templates/logs/aff_stats_users.html:31
+#: logs/templates/logs/aff_stats_users.html:31
 #, python-format
 msgid "Statistics per %(key_dict)s of %(key)s"
 msgstr "Statistiques par %(key_dict)s de %(key)s"
 
-#: templates/logs/aff_stats_users.html:34
+#: logs/templates/logs/aff_stats_users.html:34
 #, python-format
 msgid "Number of %(key)s per %(key_dict)s"
 msgstr "Nombre de %(key)s par %(key_dict)s"
 
-#: templates/logs/aff_stats_users.html:35
+#: logs/templates/logs/aff_stats_users.html:35
 msgid "Rank"
 msgstr "Rang"
 
-#: templates/logs/aff_summary.html:37
+#: logs/templates/logs/aff_summary.html:37
 msgid "Date"
 msgstr "Date"
 
-#: templates/logs/aff_summary.html:39
+#: logs/templates/logs/aff_summary.html:39
 msgid "Editing"
 msgstr "Modification"
 
-#: templates/logs/aff_summary.html:48
+#: logs/templates/logs/aff_summary.html:48
 #, python-format
 msgid "%(username)s has banned"
 msgstr "%(username)s a banni"
 
-#: templates/logs/aff_summary.html:52 templates/logs/aff_summary.html:75
+#: logs/templates/logs/aff_summary.html:52
+#: logs/templates/logs/aff_summary.html:75
 msgid "No reason"
 msgstr "Aucun motif"
 
-#: templates/logs/aff_summary.html:71
+#: logs/templates/logs/aff_summary.html:71
 #, python-format
 msgid "%(username)s has graciously authorised"
 msgstr "%(username)s a autorisé gracieusement"
 
-#: templates/logs/aff_summary.html:94
+#: logs/templates/logs/aff_summary.html:94
 #, python-format
 msgid "%(username)s has updated"
 msgstr "%(username)s a mis à jour"
 
-#: templates/logs/aff_summary.html:113
+#: logs/templates/logs/aff_summary.html:113
-#, python-format
+#, fuzzy, python-format
-msgid "%(username)s has sold %(number)sx %(name)s to"
+#| msgid "%(username)s has sold %(number)sx %(name)s to"
+msgid "%(username)s has sold %(number)sx %(name)s"
 msgstr "%(username)s a vendu %(number)sx %(name)s à"
 
-#: templates/logs/aff_summary.html:116
+#: logs/templates/logs/aff_summary.html:116
+msgid " to"
+msgstr ""
+
+#: logs/templates/logs/aff_summary.html:119
 #, python-format
 msgid "+%(duration)s months"
 msgstr "+%(duration)s mois"
 
-#: templates/logs/aff_summary.html:132
+#: logs/templates/logs/aff_summary.html:137
 #, python-format
 msgid "%(username)s has edited an interface of"
 msgstr "%(username)s a modifié une interface de"
 
-#: templates/logs/delete.html:29
+#: logs/templates/logs/delete.html:29
 msgid "Deletion of actions"
 msgstr "Suppression d'actions"
 
-#: templates/logs/delete.html:35
+#: logs/templates/logs/delete.html:35
 #, python-format
 msgid ""
 "Warning: are you sure you want to delete this action %(objet_name)s "
@@ -139,200 +148,209 @@ msgstr ""
 "Attention: voulez-vous vraiment supprimer cette action %(objet_name)s "
 "( %(objet)s ) ?"
 
-#: templates/logs/delete.html:36
+#: logs/templates/logs/delete.html:36
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: templates/logs/index.html:29 templates/logs/stats_general.html:29
+#: logs/templates/logs/index.html:29 logs/templates/logs/stats_general.html:29
-#: templates/logs/stats_logs.html:29 templates/logs/stats_models.html:29
+#: logs/templates/logs/stats_logs.html:29
-#: templates/logs/stats_users.html:29
+#: logs/templates/logs/stats_models.html:29
+#: logs/templates/logs/stats_users.html:29
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: templates/logs/index.html:32 templates/logs/stats_logs.html:32 views.py:403
+#: logs/templates/logs/index.html:32 logs/templates/logs/stats_logs.html:32
+#: logs/views.py:414
 msgid "Actions performed"
 msgstr "Actions effectuées"
 
-#: templates/logs/sidebar.html:33
+#: logs/templates/logs/sidebar.html:33
 msgid "Summary"
 msgstr "Résumé"
 
-#: templates/logs/sidebar.html:37
+#: logs/templates/logs/sidebar.html:37
 msgid "Events"
 msgstr "Évènements"
 
-#: templates/logs/sidebar.html:41
+#: logs/templates/logs/sidebar.html:41
 msgid "General"
 msgstr "Général"
 
-#: templates/logs/sidebar.html:45
+#: logs/templates/logs/sidebar.html:45
 msgid "Database"
 msgstr "Base de données"
 
-#: templates/logs/sidebar.html:49
+#: logs/templates/logs/sidebar.html:49
 msgid "Wiring actions"
 msgstr "Actions de câblage"
 
-#: templates/logs/sidebar.html:53 views.py:325
+#: logs/templates/logs/sidebar.html:53 logs/views.py:336
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/logs/stats_general.html:32
+#: logs/templates/logs/stats_general.html:32
 msgid "General statistics"
 msgstr "Statistiques générales"
 
-#: templates/logs/stats_models.html:32
+#: logs/templates/logs/stats_models.html:32
 msgid "Database statistics"
 msgstr "Statistiques sur la base de données"
 
-#: templates/logs/stats_users.html:32
+#: logs/templates/logs/stats_users.html:32
 msgid "Statistics about users"
 msgstr "Statistiques sur les utilisateurs"
 
-#: views.py:191
+#: logs/views.py:194
 msgid "Nonexistent revision."
 msgstr "Révision inexistante."
 
-#: views.py:194
+#: logs/views.py:197
 msgid "The action was deleted."
 msgstr "L'action a été supprimée."
 
-#: views.py:227
+#: logs/views.py:230
 msgid "Category"
 msgstr "Catégorie"
 
-#: views.py:228
+#: logs/views.py:231
 msgid "Number of users (members and clubs)"
 msgstr "Nombre d'utilisateurs (adhérents et clubs)"
 
-#: views.py:229
+#: logs/views.py:232
 msgid "Number of members"
 msgstr "Nombre d'adhérents"
 
-#: views.py:230
+#: logs/views.py:233
 msgid "Number of clubs"
 msgstr "Nombre de clubs"
 
-#: views.py:234
+#: logs/views.py:237
 msgid "Activated users"
 msgstr "Utilisateurs activés"
 
-#: views.py:242
+#: logs/views.py:245
 msgid "Disabled users"
 msgstr "Utilisateurs désactivés"
 
-#: views.py:250
+#: logs/views.py:253
 msgid "Archived users"
 msgstr "Utilisateurs archivés"
 
-#: views.py:258
+#: logs/views.py:261
+#, fuzzy
+#| msgid "Activated users"
+msgid "Not yet active users"
+msgstr "Utilisateurs activés"
+
+#: logs/views.py:269
 msgid "Contributing members"
 msgstr "Adhérents cotisants"
 
-#: views.py:264
+#: logs/views.py:275
 msgid "Users benefiting from a connection"
 msgstr "Utilisateurs bénéficiant d'une connexion"
 
-#: views.py:270
+#: logs/views.py:281
 msgid "Banned users"
 msgstr "Utilisateurs bannis"
 
-#: views.py:276
+#: logs/views.py:287
 msgid "Users benefiting from a free connection"
 msgstr "Utilisateurs bénéficiant d'une connexion gratuite"
 
-#: views.py:282
+#: logs/views.py:293
 msgid "Active interfaces (with access to the network)"
 msgstr "Interfaces actives (ayant accès au réseau)"
 
-#: views.py:292
+#: logs/views.py:303
 msgid "Active interfaces assigned IPv4"
 msgstr "Interfaces actives assignées IPv4"
 
-#: views.py:305
+#: logs/views.py:316
 msgid "IP range"
 msgstr "Plage d'IP"
 
-#: views.py:306
+#: logs/views.py:317
 msgid "VLAN"
 msgstr "VLAN"
 
-#: views.py:307
+#: logs/views.py:318
 msgid "Total number of IP addresses"
 msgstr "Nombre total d'adresses IP"
 
-#: views.py:308
+#: logs/views.py:319
 msgid "Number of assigned IP addresses"
 msgstr "Nombre d'adresses IP non assignées"
 
-#: views.py:309
+#: logs/views.py:320
 msgid "Number of IP address assigned to an activated machine"
 msgstr "Nombre d'adresses IP assignées à une machine activée"
 
-#: views.py:310
+#: logs/views.py:321
 msgid "Number of nonassigned IP addresses"
 msgstr "Nombre d'adresses IP non assignées"
 
-#: views.py:337
+#: logs/views.py:348
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: views.py:359 views.py:420
+#: logs/views.py:370 logs/views.py:431
 msgid "Machines"
 msgstr "Machines"
 
-#: views.py:386
+#: logs/views.py:397
 msgid "Topology"
 msgstr "Topologie"
 
-#: views.py:405
+#: logs/views.py:416
 msgid "Number of actions"
 msgstr "Nombre d'actions"
 
-#: views.py:419 views.py:437 views.py:442 views.py:447 views.py:462
+#: logs/views.py:430 logs/views.py:448 logs/views.py:453 logs/views.py:458
+#: logs/views.py:473
 msgid "User"
 msgstr "Utilisateur"
 
-#: views.py:423
+#: logs/views.py:434
 msgid "Invoice"
 msgstr "Facture"
 
-#: views.py:426
+#: logs/views.py:437
 msgid "Ban"
 msgstr "Bannissement"
 
-#: views.py:429
+#: logs/views.py:440
 msgid "Whitelist"
 msgstr "Accès gracieux"
 
-#: views.py:432
+#: logs/views.py:443
 msgid "Rights"
 msgstr "Droits"
 
-#: views.py:436
+#: logs/views.py:447
 msgid "School"
 msgstr "Établissement"
 
-#: views.py:441
+#: logs/views.py:452
 msgid "Payment method"
 msgstr "Moyen de paiement"
 
-#: views.py:446
+#: logs/views.py:457
 msgid "Bank"
 msgstr "Banque"
 
-#: views.py:463
+#: logs/views.py:474
 msgid "Action"
 msgstr "Action"
 
-#: views.py:494
+#: logs/views.py:505
 msgid "No model found."
 msgstr "Aucun modèle trouvé."
 
-#: views.py:500
+#: logs/views.py:511
 msgid "Nonexistent entry."
 msgstr "Entrée inexistante."
 
-#: views.py:507
+#: logs/views.py:518
 msgid "You don't have the right to access this menu."
 msgstr "Vous n'avez pas le droit d'accéder à ce menu."

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: 2018-10-15 00:30+0200\n"
+"POT-Creation-Date: 2018-12-29 21:16+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,286 +30,309 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: acl.py:42
+#: preferences/acl.py:42
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: forms.py:62 templates/preferences/display_preferences.html:68
+#: preferences/forms.py:63
+#: preferences/templates/preferences/display_preferences.html:138
 msgid "Telephone number required"
 msgstr "Numéro de téléphone requis"
 
-#: forms.py:64
+#: preferences/forms.py:65
 msgid "GPG fingerprint"
 msgstr "Empreinte GPG"
 
-#: forms.py:65
+#: preferences/forms.py:66
 msgid "All can create a club"
 msgstr "Tous peuvent créer un club"
 
-#: forms.py:66
+#: preferences/forms.py:67
 msgid "All can create a member"
 msgstr "Tous peuvent créer un adhérent"
 
-#: forms.py:67 templates/preferences/display_preferences.html:50
+#: preferences/forms.py:68
+#: preferences/templates/preferences/display_preferences.html:120
 msgid "Self registration"
 msgstr "Autoinscription"
 
-#: forms.py:68
+#: preferences/forms.py:69
 msgid "Default shell"
 msgstr "Interface système par défaut"
 
-#: forms.py:84
+#: preferences/forms.py:85
 msgid "Possibility to set a password per machine"
 msgstr "Possibilité de mettre un mot de passe par machine"
 
-#: forms.py:86 templates/preferences/display_preferences.html:101
+#: preferences/forms.py:87
+#: preferences/templates/preferences/display_preferences.html:168
 msgid "Maximum number of interfaces allowed for a standard user"
 msgstr "Nombre maximum d'interfaces autorisé pour un utilisateur standard"
 
-#: forms.py:90 templates/preferences/display_preferences.html:105
+#: preferences/forms.py:91
+#: preferences/templates/preferences/display_preferences.html:172
 msgid "Maximum number of DNS aliases allowed for a standard user"
 msgstr "Nombre maximum d'alias DNS autorisé pour un utilisateur standard"
 
-#: forms.py:93
+#: preferences/forms.py:94
 msgid "IPv6 mode"
 msgstr "Mode IPv6"
 
-#: forms.py:94
+#: preferences/forms.py:95
 msgid "Can create a machine"
 msgstr "Peut créer une machine"
 
-#: forms.py:117
+#: preferences/forms.py:118
 msgid "RADIUS general policy"
 msgstr "Politique générale de RADIUS"
 
-#: forms.py:118 templates/preferences/display_preferences.html:130
+#: preferences/forms.py:119
+#: preferences/templates/preferences/aff_radiusoptions.html:33
+#: preferences/templates/preferences/display_preferences.html:206
 msgid "VLAN for machines accepted by RADIUS"
 msgstr "VLAN pour les machines acceptées par RADIUS"
 
-#: forms.py:120 templates/preferences/display_preferences.html:132
+#: preferences/forms.py:121
+#: preferences/templates/preferences/display_preferences.html:208
 msgid "VLAN for machines rejected by RADIUS"
 msgstr "VLAN pour les machines rejetées par RADIUS"
 
-#: forms.py:145
+#: preferences/forms.py:146
 #, fuzzy
 #| msgid "General message"
 msgid "General message in French"
 msgstr "Message général"
 
-#: forms.py:146
+#: preferences/forms.py:147
 #, fuzzy
 #| msgid "General message"
 msgid "General message in English"
 msgstr "Message général"
 
-#: forms.py:147 templates/preferences/display_preferences.html:213
+#: preferences/forms.py:148
+#: 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"
 
-#: forms.py:150
+#: preferences/forms.py:151
 msgid "Number of items per page, standard size (e.g. users)"
 msgstr "Nombre d'éléments par page, taille standard (ex : utilisateurs)"
 
-#: forms.py:153
+#: preferences/forms.py:154
 msgid "Number of items per page, large size (e.g. machines)"
 msgstr "Nombre d'éléments par page, taille importante (ex : machines)"
 
-#: forms.py:156 templates/preferences/display_preferences.html:221
+#: preferences/forms.py:157
+#: 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)"
 
-#: forms.py:159 templates/preferences/display_preferences.html:207
+#: preferences/forms.py:160
+#: preferences/templates/preferences/display_preferences.html:52
 msgid "Website name"
 msgstr "Nom du site"
 
-#: forms.py:160 templates/preferences/display_preferences.html:209
+#: preferences/forms.py:161
+#: preferences/templates/preferences/display_preferences.html:54
 msgid "Email address for automatic emailing"
 msgstr "Adresse mail pour les mails automatiques"
 
-#: forms.py:162 templates/preferences/display_preferences.html:227
+#: preferences/forms.py:163
+#: 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"
 
-#: forms.py:164 templates/preferences/display_preferences.html:231
+#: preferences/forms.py:165
+#: preferences/templates/preferences/display_preferences.html:78
 msgid "General Terms of Use"
 msgstr "Conditions Générales d'Utilisation"
 
-#: forms.py:180
+#: preferences/forms.py:181
 msgid "Organisation name"
 msgstr "Nom de l'association"
 
-#: forms.py:181 templates/preferences/display_preferences.html:246
+#: preferences/forms.py:182
+#: preferences/templates/preferences/display_preferences.html:319
 msgid "SIRET number"
 msgstr "Numéro SIRET"
 
-#: forms.py:182
+#: preferences/forms.py:183
 msgid "Address (line 1)"
 msgstr "Adresse (ligne 1)"
 
-#: forms.py:183
+#: preferences/forms.py:184
 msgid "Address (line 2)"
 msgstr "Adresse (ligne 2)"
 
-#: forms.py:184 models.py:482
+#: preferences/forms.py:185 preferences/models.py:463
-#: templates/preferences/display_preferences.html:254
+#: preferences/templates/preferences/display_preferences.html:327
 msgid "Contact email address"
 msgstr "Adresse mail de contact"
 
-#: forms.py:185 templates/preferences/display_preferences.html:258
+#: preferences/forms.py:186
+#: preferences/templates/preferences/display_preferences.html:331
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: forms.py:186 templates/preferences/display_preferences.html:260
+#: preferences/forms.py:187
+#: preferences/templates/preferences/display_preferences.html:333
 msgid "Usual name"
 msgstr "Nom d'usage"
 
-#: forms.py:187
+#: preferences/forms.py:188
 msgid "Account used for editing from /admin"
 msgstr "Compte utilisé pour les modifications depuis /admin"
 
-#: forms.py:189
+#: preferences/forms.py:190
 msgid "Payment"
 msgstr "Paiement"
 
-#: forms.py:190
+#: preferences/forms.py:191
 msgid "Payment ID"
 msgstr "ID de paiement"
 
-#: forms.py:191
+#: preferences/forms.py:192
 msgid "Payment password"
 msgstr "Mot de passe de paiement"
 
-#: forms.py:192 forms.py:243 templates/preferences/aff_service.html:33
+#: preferences/forms.py:193 preferences/forms.py:251
+#: preferences/templates/preferences/aff_service.html:33
 msgid "Description"
 msgstr "Description"
 
-#: forms.py:208
+#: preferences/forms.py:209
 msgid "Message for the French welcome email"
 msgstr "Message pour le mail de bienvenue en français"
 
-#: forms.py:210
+#: preferences/forms.py:211
 msgid "Message for the English welcome email"
 msgstr "Message pour le mail de bienvenue en anglais"
 
-#: forms.py:227
+#: preferences/forms.py:228
 msgid "Facebook URL"
 msgstr "URL du compte Facebook"
 
-#: forms.py:228
+#: preferences/forms.py:229
 msgid "Twitter URL"
 msgstr "URL du compte Twitter"
 
-#: forms.py:229 templates/preferences/display_preferences.html:314
+#: preferences/forms.py:230
+#: preferences/templates/preferences/display_preferences.html:441
 msgid "Twitter account name"
 msgstr "Nom du compte Twitter"
 
-#: forms.py:241 templates/preferences/aff_service.html:31
+#: preferences/forms.py:249
-#: templates/preferences/display_preferences.html:244
+#: preferences/templates/preferences/aff_service.html:31
+#: preferences/templates/preferences/display_preferences.html:317
 msgid "Name"
 msgstr "Nom"
 
-#: forms.py:242 templates/preferences/aff_service.html:32
+#: preferences/forms.py:250
+#: preferences/templates/preferences/aff_service.html:32
 msgid "URL"
 msgstr "URL"
 
-#: forms.py:244 templates/preferences/aff_service.html:34
+#: preferences/forms.py:252
+#: preferences/templates/preferences/aff_service.html:34
 msgid "Image"
 msgstr "Image"
 
-#: forms.py:251
+#: preferences/forms.py:259
 msgid "Current services"
 msgstr "Services actuels"
 
-#: models.py:76
+#: preferences/models.py:76
 msgid "Users can create a club"
 msgstr "Les utilisateurs peuvent créer un club"
 
-#: models.py:80
+#: preferences/models.py:80
 msgid "Users can create a member"
 msgstr "Les utilisateurs peuvent créer un adhérent"
 
-#: models.py:91 templates/preferences/display_preferences.html:62
+#: preferences/models.py:91
+#: preferences/templates/preferences/display_preferences.html:132
 msgid "Users can edit their shell"
 msgstr "Les utilisateurs peuvent modifier leur interface système"
 
-#: models.py:95 templates/preferences/display_preferences.html:66
+#: preferences/models.py:95
+#: preferences/templates/preferences/display_preferences.html:136
 #, fuzzy
 #| msgid "Users can edit their shell"
 msgid "Users can edit their room"
 msgstr "Les utilisateurs peuvent modifier leur interface système"
 
-#: models.py:99
+#: preferences/models.py:99
 msgid "Enable local email accounts for users"
 msgstr "Active les comptes mail locaux pour les utilisateurs"
 
-#: models.py:104
+#: preferences/models.py:104
 msgid "Domain to use for local email accounts"
 msgstr "Domaine à utiliser pour les comptes mail locaux"
 
-#: models.py:108
+#: preferences/models.py:108
 msgid "Maximum number of local email addresses for a standard user"
 msgstr ""
 "Nombre maximum d'adresses mail locales autorisé pour un utilisateur standard"
 
-#: models.py:113
+#: preferences/models.py:113
 msgid "Inactive users will be deleted after this number of days"
 msgstr "Les utilisateurs n'ayant jamais adhéré seront supprimés après (jours)"
 
-#: models.py:117
+#: preferences/models.py:117
 msgid "A new user can create their account on Re2o"
 msgstr "Un nouvel utilisateur peut créer son compte sur Re2o"
 
-#: models.py:122
+#: preferences/models.py:122
 msgid "Can view the user options"
 msgstr "Peut voir les options d'utilisateur"
 
-#: models.py:124
+#: preferences/models.py:124
 msgid "user options"
 msgstr "options d'utilisateur"
 
-#: models.py:131
+#: preferences/models.py:131
 msgid "Email domain must begin with @"
 msgstr "Un domaine mail doit commencer par @"
 
-#: models.py:149
+#: preferences/models.py:149
 msgid "Autoconfiguration by RA"
 msgstr "Configuration automatique par RA"
 
-#: models.py:150
+#: preferences/models.py:150
 msgid "IP addresses assigning by DHCPv6"
 msgstr "Attribution d'adresses IP par DHCPv6"
 
-#: models.py:151
+#: preferences/models.py:151
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: models.py:173
+#: preferences/models.py:173
 msgid "Can view the machine options"
 msgstr "Peut voir les options de machine"
 
-#: models.py:175
+#: preferences/models.py:175
 msgid "machine options"
 msgstr "options de machine"
 
-#: models.py:194
+#: preferences/models.py:194 preferences/models.py:579
 msgid "On the IP range's VLAN of the machine"
 msgstr "Sur le VLAN de la plage d'IP de la machine"
 
-#: models.py:195
+#: preferences/models.py:195 preferences/models.py:580
 msgid "Preset in 'VLAN for machines accepted by RADIUS'"
 msgstr "Prédéfinie dans 'VLAN pour les machines acceptées par RADIUS'"
 
-#: models.py:315
+#: preferences/models.py:295
 msgid "Can view the topology options"
 msgstr "Peut voir les options de topologie"
 
-#: models.py:317
+#: preferences/models.py:297
 msgid "topology options"
 msgstr "options de topologie"
 
-#: models.py:419
+#: preferences/models.py:399
 msgid ""
 "General message displayed on the French version of the website (e.g. in case "
 "of maintenance)"
@@ -317,7 +340,7 @@ msgstr ""
 "Message général affiché sur la version française du site (ex : en cas de "
 "maintenance)"
 
-#: models.py:425
+#: preferences/models.py:405
 msgid ""
 "General message displayed on the English version of the website (e.g. in "
 "case of maintenance)"
@@ -325,185 +348,174 @@ msgstr ""
 "Message général affiché sur la version anglaise du site (ex : en cas de "
 "maintenance)"
 
-#: models.py:447
+#: preferences/models.py:428
 msgid "Can view the general options"
 msgstr "Peut voir les options générales"
 
-#: models.py:449
+#: preferences/models.py:430
 msgid "general options"
 msgstr "options générales"
 
-#: models.py:469
+#: preferences/models.py:450
 msgid "Can view the service options"
 msgstr "Peut voir les options de service"
 
-#: models.py:471
+#: preferences/models.py:452
 msgid "service"
 msgstr "service"
 
-#: models.py:472
+#: preferences/models.py:453
 msgid "services"
 msgstr "services"
 
-#: models.py:489
+#: preferences/models.py:470
 msgid "Description of the associated email address."
 msgstr "Description de l'adresse mail associée."
 
-#: models.py:499
+#: preferences/models.py:480
 msgid "Can view a contact email address object"
 msgstr "Peut voir un objet adresse mail de contact"
 
-#: models.py:501
+#: preferences/models.py:482
 msgid "contact email address"
 msgstr "adresse mail de contact"
 
-#: models.py:502
+#: preferences/models.py:483
 msgid "contact email addresses"
 msgstr "adresses mail de contact"
 
-#: models.py:512
+#: preferences/models.py:493
 msgid "Networking organisation school Something"
 msgstr "Association de réseau de l'école Machin"
 
-#: models.py:516
+#: preferences/models.py:497
 msgid "Threadneedle Street"
 msgstr "1 rue de la Vrillière"
 
-#: models.py:517
+#: preferences/models.py:498
 msgid "London EC2R 8AH"
 msgstr "75001 Paris"
 
-#: models.py:520
+#: preferences/models.py:501
 msgid "Organisation"
 msgstr "Association"
 
-#: models.py:534
+#: preferences/models.py:515
 msgid "Can view the organisation options"
 msgstr "Peut voir les options d'association"
 
-#: models.py:536
+#: preferences/models.py:517
 msgid "organisation options"
 msgstr "options d'association"
 
-#: models.py:565
+#: preferences/models.py:546
 msgid "Can view the homepage options"
 msgstr "Peut voir les options de page d'accueil"
 
-#: models.py:567
+#: preferences/models.py:548
 msgid "homepage options"
 msgstr "options de page d'accueil"
 
-#: models.py:585
+#: preferences/models.py:566
 msgid "Can view the email message options"
 msgstr "Peut voir les options de message pour les mails"
 
-#: models.py:588
+#: preferences/models.py:569
 msgid "email message options"
 msgstr "options de messages pour les mails"
 
-#: templates/preferences/aff_mailcontact.html:31
+#: preferences/models.py:574
-#: templates/preferences/display_preferences.html:250
+msgid "radius policies"
+msgstr ""
+
+#: preferences/models.py:585
+msgid "Reject the machine"
+msgstr ""
+
+#: preferences/models.py:586
+msgid "Place the machine on the VLAN"
+msgstr ""
+
+#: preferences/models.py:597
+msgid "Policy for unknown machines"
+msgstr ""
+
+#: preferences/models.py:605
+msgid "Unknown machine Vlan"
+msgstr ""
+
+#: preferences/models.py:607
+msgid "Vlan for unknown machines if not rejected."
+msgstr ""
+
+#: preferences/models.py:614
+msgid "Policy for unknown port"
+msgstr ""
+
+#: preferences/models.py:622
+#, fuzzy
+#| msgid "Unknown object"
+msgid "Unknown port Vlan"
+msgstr "Objet inconnu"
+
+#: preferences/models.py:624
+msgid "Vlan for unknown ports if not rejected."
+msgstr ""
+
+#: preferences/models.py:632
+msgid ""
+"Policy for machine connecting from unregistered room (relevant on ports with "
+"STRICT radius mode)"
+msgstr ""
+
+#: preferences/models.py:643
+msgid "Unknown room Vlan"
+msgstr ""
+
+#: preferences/models.py:645
+msgid "Vlan for unknown room if not rejected."
+msgstr ""
+
+#: preferences/models.py:652
+msgid "Policy non member users."
+msgstr ""
+
+#: preferences/models.py:660
+msgid "Non member Vlan"
+msgstr ""
+
+#: preferences/models.py:662
+msgid "Vlan for non members if not rejected."
+msgstr ""
+
+#: preferences/models.py:669
+msgid "Policy for banned users."
+msgstr ""
+
+#: preferences/models.py:677
+msgid "Banned Vlan"
+msgstr ""
+
+#: preferences/models.py:679
+msgid "Vlan for banned if not rejected."
+msgstr ""
+
+#: preferences/templates/preferences/aff_mailcontact.html:31
+#: preferences/templates/preferences/display_preferences.html:323
 msgid "Address"
 msgstr "Adresse"
 
-#: templates/preferences/aff_mailcontact.html:32
+#: preferences/templates/preferences/aff_mailcontact.html:32
 msgid "Comment"
 msgstr "Commentaire"
 
-#: templates/preferences/display_preferences.html:31
+#: preferences/templates/preferences/aff_radiusoptions.html:28
-#: templates/preferences/edit_preferences.html:30
+#: preferences/templates/preferences/display_preferences.html:200
-#: templates/preferences/preferences.html:30
-msgid "Preferences"
-msgstr "Préférences"
-
-#: templates/preferences/display_preferences.html:34
-msgid "User preferences"
-msgstr "Préférences d'utilisateur"
-
-#: templates/preferences/display_preferences.html:37
-#: templates/preferences/display_preferences.html:93
-#: templates/preferences/display_preferences.html:118
-#: templates/preferences/display_preferences.html:201
-#: templates/preferences/display_preferences.html:238
-#: templates/preferences/display_preferences.html:273
-#: templates/preferences/display_preferences.html:300
-#: templates/preferences/edit_preferences.html:40 views.py:173 views.py:221
-#: views.py:375
-msgid "Edit"
-msgstr "Modifier"
-
-#: templates/preferences/display_preferences.html:41
-#: templates/preferences/display_preferences.html:198
-msgid "General preferences"
-msgstr "Préférences générales"
-
-#: templates/preferences/display_preferences.html:44
-msgid "Creation of members by everyone"
-msgstr "Création d'adhérents par tous"
-
-#: templates/preferences/display_preferences.html:46
-msgid "Creation of clubs by everyone"
-msgstr "Création de clubs par tous"
-
-#: templates/preferences/display_preferences.html:52
-msgid "Delete not yet active users after"
-msgstr "Suppression des utilisateurs n'ayant jamais adhéré après"
-
-#: templates/preferences/display_preferences.html:57
-#, fuzzy
-#| msgid "general options"
-msgid "Users general permissions"
-msgstr "Permissions générales des utilisateurs"
-
-#: templates/preferences/display_preferences.html:60
-msgid "Default shell for users"
-msgstr "Interface système par défaut pour les utilisateurs"
-
-#: templates/preferences/display_preferences.html:72
-msgid "GPG fingerprint field"
-msgstr "Champ empreinte GPG"
-
-#: templates/preferences/display_preferences.html:77
-msgid "Email accounts preferences"
-msgstr "Préférences de comptes mail"
-
-#: templates/preferences/display_preferences.html:80
-msgid "Local email accounts enabled"
-msgstr "Comptes mail locaux activés"
-
-#: templates/preferences/display_preferences.html:82
-msgid "Local email domain"
-msgstr "Domaine de mail local"
-
-#: templates/preferences/display_preferences.html:86
-msgid "Maximum number of email aliases allowed"
-msgstr "Nombre maximum d'alias mail autorisé pour un utilisateur standard"
-
-#: templates/preferences/display_preferences.html:90
-msgid "Machines preferences"
-msgstr "Préférences de machines"
-
-#: templates/preferences/display_preferences.html:99
-msgid "Password per machine"
-msgstr "Mot de passe par machine"
-
-#: templates/preferences/display_preferences.html:107
-msgid "IPv6 support"
-msgstr "Support de l'IPv6"
-
-#: templates/preferences/display_preferences.html:111
-msgid "Creation of machines"
-msgstr "Création de machines"
-
-#: templates/preferences/display_preferences.html:115
-msgid "Topology preferences"
-msgstr "Préférences de topologie"
-
-#: templates/preferences/display_preferences.html:124
 msgid "General policy for VLAN setting"
 msgstr "Politique générale pour le placement sur un VLAN"
 
-#: templates/preferences/display_preferences.html:126
+#: preferences/templates/preferences/aff_radiusoptions.html:30
+#: preferences/templates/preferences/display_preferences.html:202
 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 "
@@ -513,124 +525,270 @@ msgstr ""
 "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'"
 
-#: templates/preferences/display_preferences.html:215
+#: preferences/templates/preferences/aff_radiusoptions.html:41
+#, fuzzy
+#| msgid "Self registration"
+msgid "Situation"
+msgstr "Autoinscription"
+
+#: preferences/templates/preferences/aff_radiusoptions.html:42
+msgid "Behavior"
+msgstr ""
+
+#: preferences/templates/preferences/aff_radiusoptions.html:46
+#, fuzzy
+#| msgid "Unknown object"
+msgid "Unknown machine"
+msgstr "Objet inconnu"
+
+#: 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
+msgid "Reject"
+msgstr ""
+
+#: preferences/templates/preferences/aff_radiusoptions.html:56
+#, fuzzy
+#| msgid "Unknown object"
+msgid "Unknown port"
+msgstr "Objet inconnu"
+
+#: preferences/templates/preferences/aff_radiusoptions.html:66
+#, fuzzy
+#| msgid "Unknown object"
+msgid "Unknown room"
+msgstr "Objet inconnu"
+
+#: preferences/templates/preferences/aff_radiusoptions.html:76
+msgid "Non member"
+msgstr ""
+
+#: preferences/templates/preferences/aff_radiusoptions.html:86
+msgid "Banned user"
+msgstr ""
+
+#: preferences/templates/preferences/display_preferences.html:31
+#: preferences/templates/preferences/edit_preferences.html:30
+#: preferences/templates/preferences/preferences.html:30
+msgid "Preferences"
+msgstr "Préférences"
+
+#: preferences/templates/preferences/display_preferences.html:39
+msgid "General preferences"
+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:161
+#: preferences/templates/preferences/display_preferences.html:195
+#: preferences/templates/preferences/display_preferences.html:236
+#: preferences/templates/preferences/display_preferences.html:297
+#: preferences/templates/preferences/display_preferences.html:312
+#: preferences/templates/preferences/display_preferences.html:356
+#: preferences/templates/preferences/display_preferences.html:434
+#: preferences/templates/preferences/edit_preferences.html:46
+#: preferences/views.py:178 preferences/views.py:226 preferences/views.py:380
+msgid "Edit"
+msgstr "Modifier"
+
+#: preferences/templates/preferences/display_preferences.html:60
 msgid "Number of items per page (standard size)"
 msgstr "Nombre d'éléments par page (taille standard)"
 
-#: templates/preferences/display_preferences.html:219
+#: preferences/templates/preferences/display_preferences.html:64
 msgid "Number of items per page (large size)"
 msgstr "Nombre d'éléments par page (taille importante)"
 
-#: templates/preferences/display_preferences.html:225
+#: preferences/templates/preferences/display_preferences.html:70
 msgid "General message displayed on the website"
 msgstr "Message général affiché sur le site"
 
-#: templates/preferences/display_preferences.html:235
+#: preferences/templates/preferences/display_preferences.html:72
+msgid "Main site url"
+msgstr ""
+
+#: preferences/templates/preferences/display_preferences.html:84
+msgid "Local email accounts enabled"
+msgstr "Comptes mail locaux activés"
+
+#: preferences/templates/preferences/display_preferences.html:86
+msgid "Local email domain"
+msgstr "Domaine de mail local"
+
+#: preferences/templates/preferences/display_preferences.html:90
+msgid "Maximum number of email aliases allowed"
+msgstr "Nombre maximum d'alias mail autorisé pour un utilisateur standard"
+
+#: preferences/templates/preferences/display_preferences.html:100
+msgid "User preferences"
+msgstr "Préférences d'utilisateur"
+
+#: preferences/templates/preferences/display_preferences.html:114
+msgid "Creation of members by everyone"
+msgstr "Création d'adhérents par tous"
+
+#: preferences/templates/preferences/display_preferences.html:116
+msgid "Creation of clubs by everyone"
+msgstr "Création de clubs par tous"
+
+#: preferences/templates/preferences/display_preferences.html:122
+msgid "Delete not yet active users after"
+msgstr "Suppression des utilisateurs n'ayant jamais adhéré après"
+
+#: preferences/templates/preferences/display_preferences.html:127
+#, fuzzy
+#| msgid "general options"
+msgid "Users general permissions"
+msgstr "Permissions générales des utilisateurs"
+
+#: preferences/templates/preferences/display_preferences.html:130
+msgid "Default shell for users"
+msgstr "Interface système par défaut pour les utilisateurs"
+
+#: preferences/templates/preferences/display_preferences.html:142
+msgid "GPG fingerprint field"
+msgstr "Champ empreinte GPG"
+
+#: preferences/templates/preferences/display_preferences.html:153
+msgid "Machines preferences"
+msgstr "Préférences de machines"
+
+#: preferences/templates/preferences/display_preferences.html:166
+msgid "Password per machine"
+msgstr "Mot de passe par machine"
+
+#: preferences/templates/preferences/display_preferences.html:174
+msgid "IPv6 support"
+msgstr "Support de l'IPv6"
+
+#: preferences/templates/preferences/display_preferences.html:178
+msgid "Creation of machines"
+msgstr "Création de machines"
+
+#: preferences/templates/preferences/display_preferences.html:188
+msgid "Topology preferences"
+msgstr "Préférences de topologie"
+
+#: preferences/templates/preferences/display_preferences.html:212
+msgid "VLAN for non members machines"
+msgstr ""
+
+#: preferences/templates/preferences/display_preferences.html:292
+#, fuzzy
+#| msgid "Machines preferences"
+msgid "Radius preferences"
+msgstr "Préférences de machines"
+
+#: preferences/templates/preferences/display_preferences.html:306
 msgid "Information about the organisation"
 msgstr "Informations sur l'association"
 
-#: templates/preferences/display_preferences.html:264
+#: preferences/templates/preferences/display_preferences.html:337
 msgid "User object of the organisation"
 msgstr "Objet utilisateur de l'association"
 
-#: templates/preferences/display_preferences.html:266
+#: preferences/templates/preferences/display_preferences.html:339
 msgid "Description of the organisation"
 msgstr "Description de l'association"
 
-#: templates/preferences/display_preferences.html:270
+#: preferences/templates/preferences/display_preferences.html:362
-msgid "Custom email message"
-msgstr "Message personnalisé pour les mails"
-
-#: templates/preferences/display_preferences.html:279
 msgid "Welcome email (in French)"
 msgstr "Mail de bienvenue (en français)"
 
-#: templates/preferences/display_preferences.html:283
+#: preferences/templates/preferences/display_preferences.html:366
 msgid "Welcome email (in English)"
 msgstr "Mail de bienvenue (en anglais)"
 
-#: templates/preferences/display_preferences.html:293
+#: preferences/templates/preferences/display_preferences.html:393
 msgid "List of services and homepage preferences"
 msgstr "Liste des services et préférences de page d'accueil"
 
-#: templates/preferences/display_preferences.html:295
+#: preferences/templates/preferences/display_preferences.html:399
 msgid " Add a service"
 msgstr " Ajouter un service"
 
-#: templates/preferences/display_preferences.html:302
+#: preferences/templates/preferences/display_preferences.html:410
 msgid "List of contact email addresses"
 msgstr "Liste des adresses mail de contact"
 
-#: templates/preferences/display_preferences.html:304
+#: preferences/templates/preferences/display_preferences.html:416
 msgid "Add an address"
 msgstr "Ajouter une adresse"
 
-#: templates/preferences/display_preferences.html:306
+#: preferences/templates/preferences/display_preferences.html:418
 msgid "Delete one or several addresses"
 msgstr " Supprimer une ou plusieurs adresses"
 
-#: templates/preferences/display_preferences.html:312
+#: preferences/templates/preferences/display_preferences.html:439
 msgid "Twitter account URL"
 msgstr "URL du compte Twitter"
 
-#: templates/preferences/display_preferences.html:318
+#: preferences/templates/preferences/display_preferences.html:445
 msgid "Facebook account URL"
 msgstr "URL du compte Facebook"
 
-#: templates/preferences/edit_preferences.html:35
+#: preferences/templates/preferences/edit_preferences.html:35
 msgid "Editing of preferences"
 msgstr "Modification des préférences"
 
-#: views.py:111
+#: preferences/views.py:114
 msgid "Unknown object"
 msgstr "Objet inconnu"
 
-#: views.py:117
+#: preferences/views.py:120
 msgid "You don't have the right to edit this option."
 msgstr "Vous n'avez pas le droit de modifier cette option."
 
-#: views.py:134
+#: preferences/views.py:137
 msgid "The preferences were edited."
 msgstr "Les préférences ont été modifiées."
 
-#: views.py:150
+#: preferences/views.py:155
 msgid "The service was added."
 msgstr "Le service a été ajouté."
 
-#: views.py:153 views.py:202
+#: preferences/views.py:158 preferences/views.py:207
 msgid "Add a service"
 msgstr " Ajouter un service"
 
-#: views.py:170 views.py:218
+#: preferences/views.py:175 preferences/views.py:223
 msgid "The service was edited."
 msgstr "Le service a été modifié."
 
-#: views.py:199
+#: preferences/views.py:204
 #, fuzzy
 #| msgid "The service was added."
 msgid "The reminder was added."
 msgstr "Le service a été ajouté."
 
-#: views.py:351
+#: preferences/views.py:356
 msgid "The contact email address was created."
 msgstr "L'adresse mail de contact a été supprimée."
 
-#: views.py:355
+#: preferences/views.py:360
 msgid "Add a contact email address"
 msgstr "Ajouter une adresse mail de contact"
 
-#: views.py:372
+#: preferences/views.py:377
 msgid "The contact email address was edited."
 msgstr "L'adresse mail de contact a été modifiée."
 
-#: views.py:394
+#: preferences/views.py:399
 msgid "The contact email adress was deleted."
 msgstr "L'adresse mail de contact a été supprimée."
 
-#: views.py:397
+#: preferences/views.py:402
 msgid "Delete"
 msgstr "Supprimer"
 
+#~ msgid "Email accounts preferences"
+#~ msgstr "Préférences de comptes mail"
+
+#~ msgid "Custom email message"
+#~ msgstr "Message personnalisé pour les mails"
+
 #~ msgid " Delete one or several services"
 #~ msgstr " Supprimer un ou plusieurs services"
 

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: 2018-08-23 15:03+0200\n"
+"POT-Creation-Date: 2018-12-29 21:16+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,72 +30,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: acl.py:142
+#: re2o/acl.py:142
 msgid "Nonexistent entry."
 msgstr "Entrée inexistante."
 
-#: acl.py:159 acl.py:224
+#: re2o/acl.py:159 re2o/acl.py:224
 msgid "You don't have the right to access this menu."
 msgstr "Vous n'avez pas le droit d'accéder à ce menu."
 
-#: acl.py:274
+#: re2o/acl.py:274
 msgid "You don't have the right to edit the history."
 msgstr "Vous n'avez pas le droit de modifier l'historique."
 
-#: mixins.py:111
+#: re2o/base.py:76
+msgid "This domain is already taken"
+msgstr ""
+
+#: re2o/base.py:78
+msgid "Smtp unreachable"
+msgstr ""
+
+#: re2o/mixins.py:111
 #, 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."
 
-#: mixins.py:125
+#: re2o/mixins.py:125
 #, 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."
 
-#: mixins.py:139
+#: re2o/mixins.py:139
 #, 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."
 
-#: mixins.py:153
+#: re2o/mixins.py:153
 #, 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."
 
-#: mixins.py:167
+#: re2o/mixins.py:167
 #, 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."
 
-#: settings.py:155
+#: re2o/settings.py:155
 msgid "English"
 msgstr "Anglais"
 
-#: settings.py:156
+#: re2o/settings.py:156
 msgid "French"
 msgstr "Français"
 
-#: templates/re2o/about.html:29 templates/re2o/about.html:35
+#: re2o/templates/re2o/about.html:29 re2o/templates/re2o/about.html:35
 msgid "About Re2o"
 msgstr "À propos de Re2o"
 
-#: templates/re2o/about.html:32
+#: re2o/templates/re2o/about.html:32
 #, python-format
 msgid "About %(AssoName)s"
 msgstr "À propos de %(AssoName)s"
 
-#: templates/re2o/about.html:36
+#: re2o/templates/re2o/about.html:36
 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://"
+"\">Rezo Metz</a> and a few members of other <a href=\"https://federez.net"
-"federez.net\">FedeRez</a> associations around the summer 2016.<br /> It is "
+"\">FedeRez</a> associations around the summer 2016.<br /> It is intended to "
-"intended to be a tool independant from any network infrastructure so it can "
+"be a tool independant from any network infrastructure so it can be setup in "
-"be setup in \"a few steps\". This tool is entirely free and available under "
+"\"a few steps\". This tool is entirely free and available under a GNU Public "
-"a GNU Public License v2 (GPLv2) license on <a href=\"https://gitlab.federez."
+"License v2 (GPLv2) license on <a href=\"https://gitlab.federez.net/federez/"
-"net/federez/re2o/\">FedeRez gitlab</a>.<br /> Re2o's mainteners are "
+"re2o/\">FedeRez gitlab</a>.<br /> Re2o's mainteners are volunteers mainly "
-"volunteers mainly from French schools. <br /> If you want to get involved in "
+"from French schools. <br /> If you want to get involved in the development "
-"the development process, we will be glad to welcome you so do not hesitate "
+"process, we will be glad to welcome you so do not hesitate to contact us and "
-"to contact us and come help us build the future of Re2o."
+"come help us build the future of Re2o."
 msgstr ""
 "Re2o est un outil d'administration initié par <a href=\"https://rezometz.org/"
 "\">Rézo Metz</a> et quelques membres d'autres associations de <a href="
@@ -111,90 +119,90 @@ 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."
 
-#: templates/re2o/about.html:55
+#: re2o/templates/re2o/about.html:55
 msgid "Contributors list"
 msgstr "Liste des contributeurs"
 
-#: templates/re2o/about.html:64
+#: re2o/templates/re2o/about.html:64
 msgid "Version information"
 msgstr "Informations de versions"
 
-#: templates/re2o/about.html:66
+#: re2o/templates/re2o/about.html:66
 #, python-format
 msgid "<b>Remote URL</b>: %(git_info_remote)s"
 msgstr "<b>URL distante</b> : %(git_info_remote)s"
 
-#: templates/re2o/about.html:69
+#: re2o/templates/re2o/about.html:69
 #, python-format
 msgid "<b>Branch</b>: %(git_info_branch)s"
 msgstr "<b>Branche</b> : %(git_info_branch)s"
 
-#: templates/re2o/about.html:72
+#: re2o/templates/re2o/about.html:72
 #, python-format
 msgid "<b>Commit</b>: %(git_info_commit)s"
 msgstr "<b>Commit</b> : %(git_info_commit)s"
 
-#: templates/re2o/about.html:75
+#: re2o/templates/re2o/about.html:75
 #, python-format
 msgid "<b>Commit date</b>: %(git_info_commit_date)s"
 msgstr "<b>Date du commit</b> : %(git_info_commit_date)s"
 
-#: templates/re2o/about.html:80
+#: re2o/templates/re2o/about.html:80
 msgid "Dependencies"
 msgstr "Dépendances"
 
-#: templates/re2o/aff_history.html:30
+#: re2o/templates/re2o/aff_history.html:30
 msgid "Next"
 msgstr "Suivant"
 
-#: templates/re2o/aff_history.html:37
+#: re2o/templates/re2o/aff_history.html:37
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/re2o/aff_history.html:45
+#: re2o/templates/re2o/aff_history.html:45
 msgid "Date"
 msgstr "Date"
 
-#: templates/re2o/aff_history.html:46
+#: re2o/templates/re2o/aff_history.html:46
 msgid "Performed by"
 msgstr "Effectuée par"
 
-#: templates/re2o/aff_history.html:47
+#: re2o/templates/re2o/aff_history.html:47
 msgid "Comment"
 msgstr "Commentaire"
 
-#: templates/re2o/contact.html:29
+#: re2o/templates/re2o/contact.html:29
 msgid "Contact"
 msgstr "Contact"
 
-#: templates/re2o/contact.html:32
+#: re2o/templates/re2o/contact.html:32
 #, python-format
 msgid "Contact the organisation %(asso_name)s"
 msgstr "Contacter l'association %(asso_name)s"
 
-#: templates/re2o/history.html:29
+#: re2o/templates/re2o/history.html:29
 msgid "History"
 msgstr "Historique"
 
-#: templates/re2o/history.html:32
+#: re2o/templates/re2o/history.html:32
 #, python-format
 msgid "History of %(object)s"
 msgstr "Historique de %(object)s"
 
-#: templates/re2o/index.html:30
+#: re2o/templates/re2o/index.html:30
 msgid "Home"
 msgstr "Accueil"
 
-#: templates/re2o/index.html:34
+#: re2o/templates/re2o/index.html:34
 #, python-format
 msgid "Welcome to %(name_website)s"
 msgstr "Bienvenue sur %(name_website)s"
 
-#: templates/re2o/index.html:43 templates/re2o/index.html:45
+#: re2o/templates/re2o/index.html:43 re2o/templates/re2o/index.html:45
 msgid "Registration"
 msgstr "Inscription"
 
-#: templates/re2o/index.html:44
+#: re2o/templates/re2o/index.html:44
 msgid ""
 "If you don't have an account yet and you want to access the Internet and the "
 "organisation's services, create your own personal account."
@@ -202,11 +210,11 @@ msgstr ""
 "Si vous n'avez pas encore de compte et que vous voulez accéder à Internet et "
 "aux services de l'association, créez votre espace personnel."
 
-#: templates/re2o/index.html:55 templates/re2o/index.html:57
+#: re2o/templates/re2o/index.html:55 re2o/templates/re2o/index.html:57
 msgid "Logging in"
 msgstr "Identification"
 
-#: templates/re2o/index.html:56
+#: re2o/templates/re2o/index.html:56
 msgid ""
 "If you already have an account, log in. You can manage your subscription to "
 "the organisation, your machines and all your services."
@@ -214,11 +222,11 @@ msgstr ""
 "Si vous avez déjà un compte, identifiez-vous. Vous pouvez gérer votre "
 "cotisation à l'association, vos machines et tous vos services."
 
-#: templates/re2o/index.html:68
+#: re2o/templates/re2o/index.html:68
 msgid "My profile"
 msgstr "Mon profil"
 
-#: templates/re2o/index.html:69
+#: re2o/templates/re2o/index.html:69
 msgid ""
 "To manage your subscription, your machines and all your services, access "
 "your profile."
@@ -226,28 +234,28 @@ msgstr ""
 "Pour gérer votre cotisation, vos machines et tous vos services, accéder à "
 "votre profil."
 
-#: templates/re2o/index.html:70
+#: re2o/templates/re2o/index.html:70
 msgid "Access my profile"
 msgstr "Accéder à mon profil"
 
-#: templates/re2o/index.html:79
+#: re2o/templates/re2o/index.html:79
 msgid "Services of the organisation"
 msgstr "Services de l'association"
 
-#: templates/re2o/index.html:93
+#: re2o/templates/re2o/index.html:93
 msgid "Go there"
 msgstr "Accéder"
 
-#: templates/re2o/sidebar.html:47
+#: re2o/templates/re2o/sidebar.html:47
 #, python-format
 msgid "Tweets from @%(twitter_account_name)s"
 msgstr "Tweets de @%(twitter_account_name)s"
 
-#: templates/re2o/sidebar.html:50
+#: re2o/templates/re2o/sidebar.html:50
 #, python-format
 msgid "Follow @%(twitter_account_name)s"
 msgstr "Suivre @%(twitter_account_name)s"
 
-#: views.py:87
+#: re2o/views.py:87
 msgid "Unable to get the information"
 msgstr "Impossible d'obtenir l'information"

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: 2018-08-15 18:15+0200\n"
+"POT-Creation-Date: 2018-12-29 21:16+0100\n"
 "PO-Revision-Date: 2018-06-24 20:10+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -30,56 +30,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:33
+#: search/forms.py:33
 msgid "Active"
 msgstr "Actifs"
 
-#: forms.py:34
+#: search/forms.py:34
 msgid "Disabled"
 msgstr "Désactivés"
 
-#: forms.py:35
+#: search/forms.py:35
 msgid "Archived"
 msgstr "Archivés"
 
-#: forms.py:39
+#: search/forms.py:36
+#, fuzzy
+#| msgid "Active"
+msgid "Not Yet Active"
+msgstr "Actifs"
+
+#: search/forms.py:40
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: forms.py:40
+#: search/forms.py:41
 msgid "Machines"
 msgstr "Machines"
 
-#: forms.py:41
+#: search/forms.py:42
 msgid "Invoices"
 msgstr "Factures"
 
-#: forms.py:42
+#: search/forms.py:43
 msgid "Bans"
 msgstr "Bannissements"
 
-#: forms.py:43
+#: search/forms.py:44
 msgid "Whitelists"
 msgstr "Accès gracieux"
 
-#: forms.py:44
+#: search/forms.py:45
 msgid "Rooms"
 msgstr "Chambres"
 
-#: forms.py:45
+#: search/forms.py:46
 msgid "Ports"
 msgstr "Ports"
 
-#: forms.py:46
+#: search/forms.py:47
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
-#: forms.py:59 forms.py:71 templates/search/search.html:29
+#: search/forms.py:60 search/forms.py:72 search/templates/search/search.html:29
-#: templates/search/search.html:48
+#: search/templates/search/search.html:48
 msgid "Search"
 msgstr "Rechercher"
 
-#: forms.py:61 forms.py:73
+#: search/forms.py:62 search/forms.py:74
 msgid ""
 "Use « » and «,» to specify distinct words, «\"query\"» for an exact search "
 "and «\\» to escape a character."
@@ -87,77 +93,77 @@ msgstr ""
 "Utilisez « » et «,» pour spécifier différents mots, «\"query\"» pour une "
 "recherche exacte et «\\» pour échapper un caractère."
 
-#: forms.py:80
+#: search/forms.py:81
 msgid "Users filter"
 msgstr "Filtre utilisateurs"
 
-#: forms.py:87
+#: search/forms.py:88
 msgid "Display filter"
 msgstr "Filtre affichage"
 
-#: forms.py:95
+#: search/forms.py:96
 msgid "Start date"
 msgstr "Date de début"
 
-#: forms.py:99
+#: search/forms.py:100
 msgid "End date"
 msgstr "Date de fin"
 
-#: templates/search/index.html:29
+#: search/templates/search/index.html:29
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
-#: templates/search/index.html:33
+#: search/templates/search/index.html:33
 msgid "Results among users:"
 msgstr "Résultats parmi les utilisateurs :"
 
-#: templates/search/index.html:37
+#: search/templates/search/index.html:37
 msgid "Results among clubs:"
 msgstr "Résultats parmi les clubs :"
 
-#: templates/search/index.html:41
+#: search/templates/search/index.html:41
 msgid "Results among machines:"
 msgstr "Résultats parmi les machines :"
 
-#: templates/search/index.html:45
+#: search/templates/search/index.html:45
 msgid "Results among invoices:"
 msgstr "Résultats parmi les factures :"
 
-#: templates/search/index.html:49
+#: search/templates/search/index.html:49
 msgid "Results among whitelists:"
 msgstr "Résultats parmi les accès à titre gracieux :"
 
-#: templates/search/index.html:53
+#: search/templates/search/index.html:53
 msgid "Results among bans:"
 msgstr "Résultats parmi les bannissements :"
 
-#: templates/search/index.html:57
+#: search/templates/search/index.html:57
 msgid "Results among rooms:"
 msgstr "Résultats parmi les chambres :"
 
-#: templates/search/index.html:61
+#: search/templates/search/index.html:61
 msgid "Results among ports"
 msgstr "Résultats parmi les ports :"
 
-#: templates/search/index.html:65
+#: search/templates/search/index.html:65
 msgid "Results among switches"
 msgstr "Résultats parmi les commutateurs réseau :"
 
-#: templates/search/index.html:69
+#: search/templates/search/index.html:69
 msgid "No result"
 msgstr "Pas de résultat"
 
-#: templates/search/index.html:71
+#: search/templates/search/index.html:71
 #, python-format
 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)"
 
-#: templates/search/sidebar.html:31
+#: search/templates/search/sidebar.html:31
 msgid "Simple search"
 msgstr "Recherche simple"
 
-#: templates/search/sidebar.html:35
+#: search/templates/search/sidebar.html:35
 msgid "Advanced search"
 msgstr "Recherche avancée"

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: 2018-08-15 16:10+0200\n"
+"POT-Creation-Date: 2018-12-29 21:16+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,219 +30,228 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: base.html:42 errors/404.html:35
+#: api/acl.py:74
+msgid "You cannot see this application."
+msgstr ""
+
+#: api/authentication.py:49
+msgid "Token has expired"
+msgstr ""
+
+#: templates/base.html:42 templates/errors/404.html:35
 msgid "Networking managing website endorsed by FedeRez."
 msgstr "Site de gestion de réseau soutenu par FedeRez."
 
-#: base.html:59
+#: templates/base.html:58
 msgid "Home"
 msgstr "Accueil"
 
-#: base.html:81
+#: templates/base.html:79
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: base.html:84
+#: templates/base.html:82
 msgid "Manage the users"
 msgstr "Gérer les utilisateurs"
 
-#: base.html:85
+#: templates/base.html:83
 msgid "Manage the clubs"
 msgstr "Gérer les clubs"
 
-#: base.html:88
+#: templates/base.html:86
 msgid "Manage the machines"
 msgstr "Gérer les machines"
 
-#: base.html:91
+#: templates/base.html:89
 msgid "Manage the subscriptions"
 msgstr "Gérer les cotisations"
 
-#: base.html:98
+#: templates/base.html:96
 msgid "Topology"
 msgstr "Topologie"
 
-#: base.html:100
+#: templates/base.html:98
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
-#: base.html:101
+#: templates/base.html:99
 msgid "Access points"
 msgstr "Points d'accès sans fil"
 
-#: base.html:102
+#: templates/base.html:100
 msgid "Rooms"
 msgstr "Chambres"
 
-#: base.html:107
+#: templates/base.html:105
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: base.html:112
+#: templates/base.html:110
 msgid "Administration"
 msgstr "Administration"
 
-#: base.html:112
+#: templates/base.html:117
 msgid "More information"
 msgstr "Plus d'informations"
 
-#: base.html:114
+#: templates/base.html:119
 msgid "About"
 msgstr "À propos"
 
-#: base.html:122
+#: templates/base.html:120
 msgid "Contact"
 msgstr "Contact"
 
-#: base.html:129
+#: templates/base.html:127
 msgid "Sign up"
 msgstr "S'enregistrer"
 
-#: base.html:135 registration/login.html:30 registration/login.html:50
+#: templates/base.html:133 templates/registration/login.html:29
+#: templates/registration/login.html:36
 msgid "Log in"
 msgstr "Se connecter"
 
-#: base.html:143
+#: templates/base.html:141
 msgid "Search"
 msgstr "Rechercher"
 
-#: base.html:157
+#: templates/base.html:155
 msgid "My profile"
 msgstr "Mon profil"
 
-#: base.html:158
+#: templates/base.html:156
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: base.html:194
+#: templates/base.html:191
 msgid "Username"
 msgstr "Pseudo"
 
-#: base.html:198
+#: templates/base.html:195
 msgid "Room"
 msgstr "Chambre"
 
-#: base.html:202
+#: templates/base.html:199
 msgid "Internet access"
 msgstr "Accès Internet"
 
-#: base.html:205 base.html:215
+#: templates/base.html:202 templates/base.html:212
 #, python-format
 msgid "Until %(date)s"
 msgstr "Jusqu'au %(date)s"
 
-#: base.html:207
+#: templates/base.html:204
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: base.html:212
+#: templates/base.html:209
 msgid "Membership"
 msgstr "Adhésion"
 
-#: base.html:217
+#: templates/base.html:214
 msgid "Not a member"
 msgstr "Non adhérent"
 
-#: base.html:225
+#: templates/base.html:222
 msgid "View my profile"
 msgstr "Voir mon profil"
 
-#: base.html:229
+#: templates/base.html:227
 msgid "You are not logged in."
 msgstr "Vous n'êtes pas connecté."
 
-#: base.html:235
+#: templates/base.html:234
 #, 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"
 
-#: base.html:244
+#: templates/base.html:243
 msgid "View my machines"
 msgstr "Voir mes machines"
 
-#: base.html:257
+#: templates/base.html:256
 msgid "Back to top"
 msgstr "Retour en haut"
 
-#: base.html:259
+#: templates/base.html:258
 msgid "powered by"
 msgstr "propulsé par"
 
-#: base.html:261
+#: templates/base.html:260
 msgid "Brought to you with <i class=\"fa fa-heart text-danger\"></i>."
 msgstr "Codé avec <i class=\"fa fa-heart text-danger\"></i>."
 
-#: base.html:264
+#: templates/base.html:263
 msgid "About this website"
 msgstr "À propos de ce site"
 
-#: base.html:267
+#: templates/base.html:266
 msgid ""
-"This software is under the terms of the "
+"This software is under the terms of the <a href=\"http://www.gnu.org/"
-"<a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a> License."
+"licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a> License."
 msgstr ""
-"Ce logiciel est sous les termes de la licence "
+"Ce logiciel est sous les termes de la licence <a href=\"http://www.gnu.org/"
-"<a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a>."
+"licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a>."
 
-#: buttons/add.html:27
+#: templates/buttons/add.html:27
 msgid "Add"
 msgstr "Ajouter"
 
-#: buttons/edit.html:27
+#: templates/buttons/edit.html:27
 msgid "Edit"
 msgstr "Modifier"
 
-#: buttons/history.html:26 buttons/history.html:27
+#: templates/buttons/history.html:26 templates/buttons/history.html:27
 msgid "History"
 msgstr "Historique"
 
-#: buttons/setlang.html:34
+#: templates/buttons/setlang.html:34
 msgid "Translation in development"
 msgstr "Traduction en développement"
 
-#: buttons/sort.html:35
+#: templates/buttons/sort.html:35
 msgid "Ascending sort"
 msgstr "Tri croissant"
 
-#: buttons/sort.html:36
+#: templates/buttons/sort.html:36
 msgid "Descending sort"
 msgstr "Tri décroissant"
 
-#: buttons/suppr.html:27
+#: templates/buttons/suppr.html:27
 msgid "Delete"
 msgstr "Supprimer"
 
-#: errors/404.html:39
+#: templates/errors/404.html:39
 msgid "404 error: page not found"
 msgstr "Erreur 404 : page non trouvée"
 
-#: errors/404.html:125
+#: templates/errors/404.html:125
 msgid "Score: "
 msgstr "Score : "
 
-#: errors/404.html:133
+#: templates/errors/404.html:133
 msgid "YOU LOST"
 msgstr "VOUS AVEZ PERDU"
 
-#: errors/404.html:220
+#: templates/errors/404.html:220
 msgid "Yup, that's a 404 error."
 msgstr "Yep, c'est une erreur 404."
 
-#: errors/404.html:220
+#: templates/errors/404.html:220
 msgid "(Go back to a safe page)"
 msgstr "(Retourner à une page sécurisée)"
 
-#: errors/404.html:222
+#: templates/errors/404.html:222
 msgid "Your browser does not support the HTML5 canvas tag."
 msgstr "Votre navigateur ne supporte pas la balise HTML5 canvas."
 
-#: errors/500.html:6 errors/500.html:31
+#: templates/errors/500.html:6 templates/errors/500.html:31
 msgid "500 error: Re2o internal server error"
 msgstr "Erreur 500 : Erreur interne du serveur Re2o"
 
-#: errors/500.html:34
+#: templates/errors/500.html:34
 msgid ""
 "Congratulations! You have discovered a bug on Re2o and you've reached a page "
 "we try to hide, you can be proud of youself. We try to track those bugs down "
@@ -255,7 +264,7 @@ msgstr ""
 "en avons raté un. Nous vous remercions sincèrement pour votre aide: ce n'est "
 "pas si facile de tous les attraper."
 
-#: errors/500.html:40
+#: templates/errors/500.html:40
 msgid ""
 "An email has been automatically sent to the site administrators. Please "
 "avoid spamming them by trigerring the same issue multiple times."
@@ -264,7 +273,7 @@ msgstr ""
 "site. Veuillez éviter de déclencher la même erreur de multiples fois pour ne "
 "pas renvoyer de courrier électronique."
 
-#: errors/500.html:41
+#: templates/errors/500.html:41
 msgid ""
 "The mail should contains all the details necessary to understand what went "
 "wrong but if your help were needed, you will probably be contacted by them."
@@ -273,7 +282,7 @@ msgstr ""
 "compréhension de ce qui s'est mal passé mais si votre aide était requise, "
 "vous serez probablement contacté par eux."
 
-#: errors/500.html:46
+#: templates/errors/500.html:46
 msgid ""
 "This issue will be fixed as soon as possible but please take into "
 "consideration the administrators may not be always available. If your "
@@ -285,22 +294,20 @@ msgstr ""
 "temps disponibles. Si votre requête est vraiment urgente, informez votre "
 "association locale, elle vous aidra à corriger temporairement l'erreur."
 
-#: errors/500.html:54
+#: templates/errors/500.html:54
 msgid "If you have no idea what you've done:"
 msgstr "Si vous n'avez aucune idée de ce que vous avez fait :"
 
-#: errors/500.html:55
+#: templates/errors/500.html:55
 msgid "Go back to a safe page"
 msgstr "Retourner à une page sécurisée"
 
-#: registration/login.html:35
+#: templates/registration/login.html:40
-msgid "Your username and password didn't match. Please try again."
-msgstr "Vos identifiants sont incorrects. Veuillez réessayer."
-
-#: registration/login.html:43
-msgid "Please log in to see this page."
-msgstr "Veuillez vous connecter pour voir cette page."
-
-#: registration/login.html:53
 msgid "Forgotten password?"
 msgstr "Mot de passe oublié ?"
+
+#~ msgid "Your username and password didn't match. Please try again."
+#~ msgstr "Vos identifiants sont incorrects. Veuillez réessayer."
+
+#~ msgid "Please log in to see this page."
+#~ msgstr "Veuillez vous connecter pour voir cette page."

topologie/models.py

@@ -297,15 +297,9 @@ class Switch(AclMixin, Machine):
         begin_range = range(begin, s_begin)
         end_range = range(s_end+1, end+1)
         for i in itertools.chain(begin_range, end_range):
-            port = Port()
+            with transaction.atomic(), reversion.create_revision():       
-            port.switch = self
+                _created, _port = Port.objects.get_or_create(switch=self, port=port)
-            port.port = i
+                reversion.set_comment(_("Creation"))
-            try:
-                with transaction.atomic(), reversion.create_revision():
-                    port.save()
-                    reversion.set_comment(_("Creation"))
-            except IntegrityError:
-                ValidationError(_("Creation of an existing port."))
 
     def main_interface(self):
         """ Returns the 'main' interface of the switch

users/templates/users/aff_users.html

@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <table class="table table-striped">
         <thead>
             <tr>
-                {% trans "Firt name" as tr_name %}
+                {% trans "First name" as tr_name %}
                 <th>{% include "buttons/sort.html" with prefix='user' col="name" text=tr_name %}</th>
                 {% trans "Surname" as tr_surname %}
                 <th>{% include "buttons/sort.html" with prefix='user' col="surname" text=tr_surname %}</th>

users/templates/users/profil.html

@@ -159,7 +159,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 			<td>{% trans "Mailing disabled" %}</td>
 			{% endif %}
 			{% else %}
-			<th>{% trans "Firt name" %}</th>
+			<th>{% trans "First name" %}</th>
                         <td>{{ users.name }}</td>
 			{% endif %}
 			<th>{% trans "Surname" %}</th>