diff --git a/templates/base.html b/templates/base.html
index 9aab928d..85eea9b0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -240,8 +240,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             <td class="text-right">
                                 {% if request_user.has_access %}
                                     <i class="text-success">
-                                        {% blocktrans with end_access_date=request.user.end_access|date:"d b Y" %}Until
-                                            {{ end_access_date }}{% endblocktrans %}</i>
+                                        {% blocktrans with end_access_date=request.user.end_access|date:"d b Y" %}Until {{ end_access_date }}{% endblocktrans %}</i>
                                 {% else %}
                                     <i class="text-danger">{% trans "Disabled" %}</i>
                                 {% endif %}
@@ -252,8 +251,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             <td class="text-right">
                                 {% if request_user.is_adherent %}
                                     <i class="text-success">
-                                        {% blocktrans with end_adhesion_date=request_user.end_adhesion|date:"d b Y" %}
-                                            Until {{ end_adhesion_date }}{% endblocktrans %}</i>
+                                        {% blocktrans with end_adhesion_date=request_user.end_adhesion|date:"d b Y" %}Until {{ end_adhesion_date }}{% endblocktrans %}</i>
                                 {% else %}
                                     <i class="text-danger">{% trans "Non member" %}</i>
                                 {% endif %}
@@ -276,8 +274,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% if request_user.is_authenticated %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h4>{% blocktrans count interfaces|length as nb %}{{ nb }} active machine{% plural %}{{ nb }}
-                            active machines{% endblocktrans %}</h4>
+                        <h4>{% blocktrans count interfaces|length as nb %}{{ nb }} active machine{% plural %}{{ nb }} active machines{% endblocktrans %}</h4>
                     </div>
                     <ul class="list-group">
                         {% for interface in interfaces|slice:":5" %}
diff --git a/templates/locale/fr/LC_MESSAGES/django.po b/templates/locale/fr/LC_MESSAGES/django.po
index f1c841ed..47b86936 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-02-12 08:58+0100\n"
+"POT-Creation-Date: 2019-02-25 20:36+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,161 +30,380 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/base.html:43 templates/errors/404.html:35
+#: templates/admin/actions.html:5
+msgid "Run the selected action"
+msgstr ""
+
+#: templates/admin/actions.html:5
+msgid "Go"
+msgstr ""
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr ""
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr ""
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr ""
+
+#: templates/admin/app_index.html:10 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:32
+#: templates/admin/delete_confirmation.html:15
+#: templates/admin/delete_selected_confirmation.html:15
+#: templates/admin/object_history.html:7 templates/base.html:72
+msgid "Home"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administration Django"
+
+#: templates/admin/change_form.html:22 templates/admin/change_list.html:50
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: templates/admin/change_form.html:34 templates/admin/object_history.html:11
+#: templates/buttons/history.html:26 templates/buttons/history.html:27
+msgid "History"
+msgstr ""
+
+#: templates/admin/change_form.html:36
+#: templates/admin/edit_inline/stacked.html:22
+#: templates/admin/edit_inline/tabular.html:36
+msgid "View on site"
+msgstr ""
+
+#: templates/admin/change_form.html:48 templates/admin/change_list.html:59
+msgid "Please correct the error below."
+msgstr ""
+
+#: templates/admin/change_form.html:48 templates/admin/change_list.html:59
+msgid "Please correct the errors below."
+msgstr ""
+
+#: templates/admin/change_list.html:70
+msgid "Filter"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:20
+msgid "Toggle sorting"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:19
+#: templates/admin/submit_line.html:12 templates/admin/submit_line.html:15
+#: templates/buttons/suppr.html:27
+msgid "Delete"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:32
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:39
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:41
+#: templates/admin/delete_selected_confirmation.html:40
+msgid "Objects"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:48
+#: templates/admin/delete_selected_confirmation.html:51
+msgid "Yes, I'm sure"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:49
+#: templates/admin/delete_selected_confirmation.html:52
+msgid "No, take me back"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:18
+msgid "Delete multiple objects"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:24
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:31
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:38
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+
+#: templates/admin/edit_inline/tabular.html:21
+msgid "Delete?"
+msgstr ""
+
+#: templates/admin/index.html:19
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:34
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr ""
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr ""
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr ""
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: templates/admin/pagination.html:11 templates/admin/search_form.html:13
+msgid "Show all"
+msgstr ""
+
+#: templates/admin/pagination.html:12 templates/admin/submit_line.html:5
+#: templates/admin/submit_line.html:7
+msgid "Save"
+msgstr ""
+
+#: templates/admin/related_widget_wrapper.html:10
+#, python-format
+msgid "Change selected %(model)s"
+msgstr ""
+
+#: templates/admin/related_widget_wrapper.html:17
+#, python-format
+msgid "Add another %(model)s"
+msgstr ""
+
+#: templates/admin/related_widget_wrapper.html:24
+#, python-format
+msgid "Delete selected %(model)s"
+msgstr ""
+
+#: templates/admin/search_form.html:6 templates/admin/search_form.html:8
+#: templates/base.html:169
+msgid "Search"
+msgstr ""
+
+#: templates/admin/search_form.html:13
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin/search_form.html:13
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr ""
+
+#: templates/admin/submit_line.html:19 templates/admin/submit_line.html:21
+msgid "Save as new"
+msgstr ""
+
+#: templates/admin/submit_line.html:25 templates/admin/submit_line.html:28
+msgid "Save and add another"
+msgstr ""
+
+#: templates/admin/submit_line.html:32 templates/admin/submit_line.html:35
+msgid "Save and continue editing"
+msgstr ""
+
+#: templates/base.html:44 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
-msgid "Home"
-msgstr "Accueil"
-
-#: templates/base.html:91
+#: templates/base.html:96
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/base.html:94
+#: templates/base.html:99
 msgid "Manage the users"
 msgstr "Gérer les utilisateurs"
 
-#: templates/base.html:95
+#: templates/base.html:102
 msgid "Manage the clubs"
 msgstr "Gérer les clubs"
 
-#: templates/base.html:98
+#: templates/base.html:106
 msgid "Manage the machines"
 msgstr "Gérer les machines"
 
-#: templates/base.html:101
+#: templates/base.html:110
 msgid "Manage the subscriptions"
 msgstr "Gérer les cotisations"
 
-#: templates/base.html:108
+#: templates/base.html:118
 msgid "Topology"
 msgstr "Topologie"
 
-#: templates/base.html:110
+#: templates/base.html:121
 msgid "Switches"
 msgstr "Commutateurs réseau"
 
-#: templates/base.html:111
+#: templates/base.html:124
 msgid "Access points"
 msgstr "Points d'accès sans fil"
 
-#: templates/base.html:112
+#: templates/base.html:125
 msgid "Rooms"
 msgstr "Chambres"
 
-#: templates/base.html:117
+#: templates/base.html:131
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: templates/base.html:122
+#: templates/base.html:136
 msgid "Administration"
 msgstr "Administration"
 
-#: templates/base.html:129
+#: templates/base.html:144
 msgid "More information"
 msgstr "Plus d'informations"
 
-#: templates/base.html:131
+#: templates/base.html:147
 msgid "About"
 msgstr "À propos"
 
-#: templates/base.html:132
+#: templates/base.html:148
 msgid "Contact"
 msgstr "Contact"
 
-#: templates/base.html:139
+#: templates/base.html:155
 msgid "Sign up"
 msgstr "S'inscrire"
 
-#: templates/base.html:145 templates/registration/login.html:29
+#: templates/base.html:161 templates/registration/login.html:29
 #: templates/registration/login.html:36
 msgid "Log in"
 msgstr "Se connecter"
 
-#: templates/base.html:153
-msgid "Search"
-msgstr "Rechercher"
-
-#: templates/base.html:167
+#: templates/base.html:188
 msgid "My profile"
 msgstr "Mon profil"
 
-#: templates/base.html:168
+#: templates/base.html:190
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/base.html:203
+#: templates/base.html:231
 msgid "Username"
 msgstr "Pseudo"
 
-#: templates/base.html:207
+#: templates/base.html:235
 msgid "Room"
 msgstr "Chambre"
 
-#: templates/base.html:211
+#: templates/base.html:239
 msgid "Internet access"
 msgstr "Accès Internet"
 
-#: templates/base.html:214
+#: templates/base.html:243
 #, python-format
 msgid "Until %(end_access_date)s"
-msgstr "Jusqu'au %(end_access_date)s"
+msgstr ""
 
-#: templates/base.html:216
+#: templates/base.html:246
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: templates/base.html:221
+#: templates/base.html:251
 msgid "Membership"
 msgstr "Adhésion"
 
-#: templates/base.html:224
+#: templates/base.html:255
 #, python-format
 msgid "Until %(end_adhesion_date)s"
 msgstr "Jusqu'au %(end_adhesion_date)s"
 
-#: templates/base.html:226
+#: templates/base.html:258
 msgid "Non member"
 msgstr "Non adhérent"
 
-#: templates/base.html:234
+#: templates/base.html:267
 msgid "View my profile"
 msgstr "Voir mon profil"
 
-#: templates/base.html:239
+#: templates/base.html:272
 msgid "You are not logged in."
 msgstr "Vous n'êtes pas connecté."
 
-#: templates/base.html:246
+#: templates/base.html:279
 #, 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:255
+#: templates/base.html:289
 msgid "View my machines"
 msgstr "Voir mes machines"
 
-#: templates/base.html:268
+#: templates/base.html:302
 msgid "Back to top"
 msgstr "Retour en haut"
 
-#: templates/base.html:270
+#: templates/base.html:304
 msgid "powered by"
 msgstr "propulsé par"
 
-#: templates/base.html:272
+#: templates/base.html:306
 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:275
+#: templates/base.html:309
 msgid "About this website"
 msgstr "À propos de ce site"
 
-#: templates/base.html:278
+#: templates/base.html:312
 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."
@@ -200,10 +419,6 @@ msgstr "Ajouter"
 msgid "Edit"
 msgstr "Modifier"
 
-#: templates/buttons/history.html:26 templates/buttons/history.html:27
-msgid "History"
-msgstr "Historique"
-
 #: templates/buttons/setlang.html:34
 msgid "Translation in development"
 msgstr "Traduction en développement"
@@ -216,10 +431,6 @@ msgstr "Tri croissant"
 msgid "Descending sort"
 msgstr "Tri décroissant"
 
-#: templates/buttons/suppr.html:27
-msgid "Delete"
-msgstr "Supprimer"
-
 #: templates/errors/404.html:39
 msgid "404 error: page not found"
 msgstr "Erreur 404 : page non trouvée"
@@ -318,3 +529,8 @@ msgstr "Dernière page"
 #: templates/registration/login.html:40
 msgid "Forgotten password?"
 msgstr "Mot de passe oublié ?"
+
+#: templates/reversion/change_list.html:8
+#, python-format
+msgid "Recover deleted %(name)s"
+msgstr "Récupérer des %(name)s supprimés"
diff --git a/topologie/locale/fr/LC_MESSAGES/django.po b/topologie/locale/fr/LC_MESSAGES/django.po
index a9424d33..bfc2ab3c 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-02-12 08:58+0100\n"
+"POT-Creation-Date: 2019-02-25 20:36+0100\n"
 "PO-Revision-Date: 2018-06-25 14:53+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -34,11 +34,11 @@ msgstr ""
 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:181
+#: topologie/forms.py:182
 msgid "Start:"
 msgstr "Début :"
 
-#: topologie/forms.py:182
+#: topologie/forms.py:183
 msgid "End:"
 msgstr "Fin :"
 
@@ -79,7 +79,7 @@ msgid "Number of ports"
 msgstr "Nombre de ports"
 
 #: topologie/models.py:228 topologie/templates/topologie/aff_switch.html:48
-#: topologie/templates/topologie/index_p.html:38 topologie/views.py:843
+#: topologie/templates/topologie/index_p.html:38 topologie/views.py:853
 msgid "Switch model"
 msgstr "Modèle de commutateur réseau"
 
@@ -221,63 +221,75 @@ msgstr "baie de brassage"
 msgid "switch bays"
 msgstr "baies de brassage"
 
-#: topologie/models.py:526
+#: topologie/models.py:528
+msgid "Can view a dormitory object"
+msgstr "Peut voir un objet résidence"
+
+#: topologie/models.py:530
+msgid "dormitory"
+msgstr "résidence"
+
+#: topologie/models.py:531
+msgid "dormitories"
+msgstr "résidences"
+
+#: topologie/models.py:553
 msgid "Can view a building object"
 msgstr "Peut voir un objet bâtiment"
 
-#: topologie/models.py:528
+#: topologie/models.py:555
 msgid "building"
 msgstr "bâtiment"
 
-#: topologie/models.py:529
+#: topologie/models.py:556
 msgid "buildings"
 msgstr "bâtiments"
 
-#: topologie/models.py:588 topologie/models.py:589
+#: topologie/models.py:622 topologie/models.py:623
 msgid "Port state Active"
 msgstr "État du port Actif"
 
-#: topologie/models.py:596
+#: topologie/models.py:630
 msgid "Can view a port object"
 msgstr "Peut voir un objet port"
 
-#: topologie/models.py:598
+#: topologie/models.py:632
 msgid "port"
 msgstr "port"
 
-#: topologie/models.py:599
+#: topologie/models.py:633
 msgid "ports"
 msgstr "ports"
 
-#: topologie/models.py:605
+#: topologie/models.py:639
 msgid "Uplink: "
 msgstr "Liaison montante : "
 
-#: topologie/models.py:607
+#: topologie/models.py:641
 msgid "Machine: "
 msgstr "Machine : "
 
-#: topologie/models.py:609
+#: topologie/models.py:643
 msgid "Room: "
 msgstr "Chambre : "
 
-#: topologie/models.py:611
+#: topologie/models.py:645
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: topologie/models.py:678
+#: topologie/models.py:712
 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:684
+#: topologie/models.py:718
 msgid "Room, interface and related port are mutually exclusive."
 msgstr "Chambre, interface et port relié sont mutuellement exclusifs."
 
-#: topologie/models.py:687
+#: topologie/models.py:721
 msgid "A port can't be related to itself."
 msgstr "Un port ne peut être relié à lui-même."
 
-#: topologie/models.py:691
+#: topologie/models.py:725
 msgid ""
 "The related port is already used, please clear it before creating the "
 "relation."
@@ -285,146 +297,146 @@ msgstr ""
 "Le port relié est déjà utilisé, veuillez le modifier avant de créer la "
 "relation."
 
-#: topologie/models.py:712
+#: topologie/models.py:750
 msgid "Can view a room object"
 msgstr "Peut voir un objet chambre"
 
-#: topologie/models.py:714
+#: topologie/models.py:752
 msgid "room"
 msgstr "chambre"
 
-#: topologie/models.py:715
+#: topologie/models.py:753
 msgid "rooms"
 msgstr "chambres"
 
-#: topologie/models.py:726
+#: topologie/models.py:765
 msgid "MAC-RADIUS"
 msgstr "MAC-RADIUS"
 
-#: topologie/models.py:743 topologie/templates/topologie/aff_chambres.html:36
-#: topologie/templates/topologie/aff_port.html:38 topologie/views.py:784
+#: topologie/models.py:782 topologie/templates/topologie/aff_chambres.html:36
+#: topologie/templates/topologie/aff_port.html:38 topologie/views.py:794
 msgid "Room"
 msgstr "Chambre"
 
-#: topologie/models.py:744 topologie/templates/topologie/aff_ap.html:36
+#: topologie/models.py:783 topologie/templates/topologie/aff_ap.html:36
 msgid "Access point"
 msgstr "Point d'accès sans fil"
 
-#: topologie/models.py:745
+#: topologie/models.py:784
 msgid "Uplink"
 msgstr "Liaison montante"
 
-#: topologie/models.py:746
+#: topologie/models.py:785
 msgid "Organisation machine"
 msgstr "Machine d'association"
 
-#: topologie/models.py:747
+#: topologie/models.py:786
 msgid "Nothing"
 msgstr "Rien"
 
-#: topologie/models.py:749
+#: topologie/models.py:788
 #: topologie/templates/topologie/aff_port_profile.html:37
 #: topologie/templates/topologie/aff_vlanoptions.html:34
 msgid "Name"
 msgstr "Nom"
 
-#: topologie/models.py:756
+#: topologie/models.py:795
 msgid "Default profile"
 msgstr "Profil par défaut"
 
-#: topologie/models.py:764
+#: topologie/models.py:803
 msgid "VLAN untagged"
 msgstr "VLAN untagged"
 
-#: topologie/models.py:770
+#: topologie/models.py:809
 msgid "VLAN(s) tagged"
 msgstr "VLAN(s) tagged"
 
-#: topologie/models.py:775
+#: topologie/models.py:814
 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:777
+#: topologie/models.py:816
 msgid "RADIUS type"
 msgstr "Type de RADIUS"
 
-#: topologie/models.py:783
+#: topologie/models.py:822
 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"
 
-#: topologie/models.py:785
+#: topologie/models.py:824
 msgid "RADIUS mode"
 msgstr "Mode de RADIUS"
 
-#: topologie/models.py:791
+#: topologie/models.py:830
 msgid "Port speed limit"
 msgstr "Limite de vitesse du port"
 
-#: topologie/models.py:796
+#: topologie/models.py:835
 msgid "Limit of MAC-address on this port"
 msgstr "Limite de MAC-address sur ce port"
 
-#: topologie/models.py:797
+#: topologie/models.py:836
 msgid "MAC limit"
 msgstr "Limite MAC"
 
-#: topologie/models.py:801
+#: topologie/models.py:840
 msgid "Flow control"
 msgstr "Contrôle du flux"
 
-#: topologie/models.py:805
+#: topologie/models.py:844
 msgid "Protect against rogue DHCP"
 msgstr "Protège contre les DHCP pirates"
 
-#: topologie/models.py:806
+#: topologie/models.py:845
 #: topologie/templates/topologie/aff_vlanoptions.html:36
 msgid "DHCP snooping"
 msgstr "DHCP snooping"
 
-#: topologie/models.py:810
+#: topologie/models.py:849
 msgid "Protect against rogue DHCPv6"
 msgstr "Protège contre les DHCPv6 pirates"
 
-#: topologie/models.py:811
+#: topologie/models.py:850
 #: topologie/templates/topologie/aff_vlanoptions.html:37
 msgid "DHCPv6 snooping"
 msgstr "DHCPv6 snooping"
 
-#: topologie/models.py:815
+#: topologie/models.py:854
 msgid "Check if IP adress is DHCP assigned"
 msgstr "Vérifie si l'adresse IP est attribuée par DHCP"
 
-#: topologie/models.py:816
+#: topologie/models.py:855
 msgid "ARP protection"
 msgstr "Protection ARP"
 
-#: topologie/models.py:820
+#: topologie/models.py:859
 msgid "Protect against rogue RA"
 msgstr "Protège contre les RA pirates"
 
-#: topologie/models.py:821
+#: topologie/models.py:860
 msgid "RA guard"
 msgstr "RA guard"
 
-#: topologie/models.py:825
+#: topologie/models.py:864
 msgid "Protect against loop"
 msgstr "Protège contre une boucle"
 
-#: topologie/models.py:826
+#: topologie/models.py:865
 msgid "Loop protection"
 msgstr "Protection contre une boucle"
 
-#: topologie/models.py:831
+#: topologie/models.py:870
 msgid "Can view a port profile object"
 msgstr "Peut voir un objet profil de port"
 
-#: topologie/models.py:833
+#: topologie/models.py:872
 msgid "port profile"
 msgstr "profil de port"
 
-#: topologie/models.py:834
+#: topologie/models.py:873
 msgid "port profiles"
 msgstr "profils de port"
 
@@ -438,7 +450,7 @@ msgid "IPv4 address"
 msgstr "Adresse IPv4"
 
 #: topologie/templates/topologie/aff_ap.html:42
-#: topologie/templates/topologie/aff_chambres.html:38
+#: topologie/templates/topologie/aff_chambres.html:40
 #: topologie/templates/topologie/aff_port.html:46
 #: topologie/templates/topologie/aff_stacks.html:36
 #: topologie/templates/topologie/aff_switch.html:49
@@ -451,7 +463,9 @@ msgid "Location"
 msgstr "Emplacement"
 
 #: topologie/templates/topologie/aff_building.html:36
-#: topologie/templates/topologie/aff_switch_bay.html:38 topologie/views.py:953
+#: 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:966
 msgid "Building"
 msgstr "Bâtiment"
 
@@ -463,10 +477,14 @@ 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:1013
+#: topologie/views.py:1084
 msgid "Switch constructor"
 msgstr "Constructeur de commutateur réseau"
 
+#: topologie/templates/topologie/aff_dormitory.html:36 topologie/views.py:1024
+msgid "Dormitory"
+msgstr "Résidence"
+
 #: topologie/templates/topologie/aff_model_switch.html:36
 #: topologie/templates/topologie/aff_modules.html:36
 #: topologie/templates/topologie/aff_modules.html:81
@@ -513,7 +531,7 @@ msgstr "Port relié"
 msgid "Port state"
 msgstr "État du port"
 
-#: topologie/templates/topologie/aff_port.html:45 topologie/views.py:1065
+#: topologie/templates/topologie/aff_port.html:45 topologie/views.py:1136
 msgid "Port profile"
 msgstr "Profil de port"
 
@@ -597,7 +615,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:898
+#: topologie/templates/topologie/index_p.html:37 topologie/views.py:908
 msgid "Switch bay"
 msgstr "Baie de brassage"
 
@@ -727,6 +745,16 @@ msgstr "Bâtiments"
 msgid " Add a building"
 msgstr " Ajouter un bâtiment"
 
+#: topologie/templates/topologie/index_physical_grouping.html:60
+msgid "Dormitories"
+msgstr "Résidences"
+
+#: topologie/templates/topologie/index_physical_grouping.html:63
+#, fuzzy
+#| msgid " Add a room"
+msgid " Add a dormitory"
+msgstr " Ajouter une chambre"
+
 #: topologie/templates/topologie/index_portprofile.html:34
 #: topologie/templates/topologie/sidebar.html:43
 msgid "Port profiles"
@@ -769,10 +797,10 @@ msgstr " Aller à la liste des ports"
 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:441
-#: topologie/views.py:745 topologie/views.py:800 topologie/views.py:859
-#: topologie/views.py:914 topologie/views.py:969 topologie/views.py:1027
-#: topologie/views.py:1081
+#: topologie/templates/topologie/switch.html:46 topologie/views.py:451
+#: topologie/views.py:755 topologie/views.py:810 topologie/views.py:869
+#: topologie/views.py:925 topologie/views.py:983 topologie/views.py:1040
+#: topologie/views.py:1098 topologie/views.py:1152
 msgid "Create"
 msgstr "Créer"
 
@@ -790,61 +818,61 @@ msgstr "Réglages généraux pour la machine liée à l'objet %(device)s"
 msgid "Create or edit"
 msgstr "Créer ou modifier"
 
-#: topologie/views.py:347
+#: topologie/views.py:357
 msgid "The VLAN was edited."
 msgstr "Le VLAN a été modifié."
 
-#: topologie/views.py:350 topologie/views.py:403 topologie/views.py:457
-#: topologie/views.py:762 topologie/views.py:821 topologie/views.py:876
-#: topologie/views.py:931 topologie/views.py:990 topologie/views.py:1045
-#: topologie/views.py:1098 topologie/views.py:1152
+#: topologie/views.py:360 topologie/views.py:413 topologie/views.py:467
+#: topologie/views.py:772 topologie/views.py:831 topologie/views.py:886
+#: topologie/views.py:943 topologie/views.py:1001 topologie/views.py:1061
+#: topologie/views.py:1116 topologie/views.py:1169 topologie/views.py:1223
 msgid "Edit"
 msgstr "Modifier"
 
-#: topologie/views.py:363 topologie/views.py:554
+#: topologie/views.py:373 topologie/views.py:564
 msgid "Nonexistent switch."
 msgstr "Commutateur réseau inexistant."
 
-#: topologie/views.py:371
+#: topologie/views.py:381
 msgid "The port was added."
 msgstr "Le port a été ajouté."
 
-#: topologie/views.py:373
+#: topologie/views.py:383
 msgid "The port already exists."
 msgstr "Le port existe déjà."
 
-#: topologie/views.py:379 topologie/views.py:1135
+#: topologie/views.py:389 topologie/views.py:1206
 msgid "Add"
 msgstr "Ajouter"
 
-#: topologie/views.py:394
+#: topologie/views.py:404
 msgid "The port was edited."
 msgstr "Le port a été modifié."
 
-#: topologie/views.py:417
+#: topologie/views.py:427
 msgid "The port was deleted."
 msgstr "Le port a été supprimé."
 
-#: topologie/views.py:421
+#: topologie/views.py:431
 #, 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:438
+#: topologie/views.py:448
 msgid "The stack was created."
 msgstr "La pile a été créée."
 
-#: topologie/views.py:470
+#: topologie/views.py:480
 msgid "The stack was deleted."
 msgstr "La pile a été supprimée."
 
-#: topologie/views.py:474
+#: topologie/views.py:484
 #, 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:516 topologie/views.py:651 topologie/views.py:706
+#: topologie/views.py:526 topologie/views.py:661 topologie/views.py:716
 msgid ""
 "The organisation's user doesn't exist yet, please create or link it in the "
 "preferences."
@@ -852,113 +880,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:531
+#: topologie/views.py:541
 msgid "The switch was created."
 msgstr "Le commutateur réseau a été créé."
 
-#: topologie/views.py:568
+#: topologie/views.py:578
 msgid "The ports were created."
 msgstr "Les ports ont été créés."
 
-#: topologie/views.py:612
+#: topologie/views.py:622
 msgid "The switch was edited."
 msgstr "Le commutateur réseau a été modifié."
 
-#: topologie/views.py:666
+#: topologie/views.py:676
 msgid "The access point was created."
 msgstr "Le point d'accès sans fil a été créé."
 
-#: topologie/views.py:719
+#: topologie/views.py:729
 msgid "The access point was edited."
 msgstr "Le point d'accès sans fil a été modifié."
 
-#: topologie/views.py:742
+#: topologie/views.py:752
 msgid "The room was created."
 msgstr "La chambre a été créée."
 
-#: topologie/views.py:759
+#: topologie/views.py:769
 msgid "The room was edited."
 msgstr "La chambre a été modifiée."
 
-#: topologie/views.py:775
+#: topologie/views.py:785
 msgid "The room was deleted."
 msgstr "La chambre a été supprimée."
 
-#: topologie/views.py:779
+#: topologie/views.py:789
 #, 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:797
+#: topologie/views.py:807
 msgid "The switch model was created."
 msgstr "Le modèle de commutateur réseau a été créé."
 
-#: topologie/views.py:818
+#: topologie/views.py:828
 msgid "The switch model was edited."
 msgstr "Le modèle de commutateur réseau a été modifié."
 
-#: topologie/views.py:834
+#: topologie/views.py:844
 msgid "The switch model was deleted."
 msgstr "Le modèle de commutateur réseau a été supprimé."
 
-#: topologie/views.py:838
+#: topologie/views.py:848
 #, 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:856
+#: topologie/views.py:866
 msgid "The switch bay was created."
 msgstr "La baie de brassage a été créée."
 
-#: topologie/views.py:873
+#: topologie/views.py:883
 msgid "The switch bay was edited."
 msgstr "La baie de brassage a été modifiée."
 
-#: topologie/views.py:889
+#: topologie/views.py:899
 msgid "The switch bay was deleted."
 msgstr "La baie de brassage a été supprimée."
 
-#: topologie/views.py:893
+#: topologie/views.py:903
 #, 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:911
+#: topologie/views.py:922
 msgid "The building was created."
 msgstr "Le bâtiment a été créé."
 
-#: topologie/views.py:928
+#: topologie/views.py:940
 msgid "The building was edited."
 msgstr "Le bâtiment a été modifié."
 
-#: topologie/views.py:944
+#: topologie/views.py:957
 msgid "The building was deleted."
 msgstr "Le bâtiment a été supprimé."
 
-#: topologie/views.py:948
+#: topologie/views.py:961
 #, 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:966
+#: topologie/views.py:980
+msgid "The dormitory was created."
+msgstr "La résidence a été créée."
+
+#: topologie/views.py:998
+msgid "The dormitory was edited."
+msgstr "La résidence a été modifiée."
+
+#: topologie/views.py:1015
+msgid "The dormitory was deleted."
+msgstr "La résidence a été supprimée."
+
+#: topologie/views.py:1019
+#, python-format
+msgid "The dormitory %s is used by another object, impossible to delete it."
+msgstr ""
+"La résidence %s est utilisée par un autre objet, impossible de la supprimer."
+
+#: topologie/views.py:1037
 msgid "The switch constructor was created."
 msgstr "Le constructeur de commutateur réseau a été créé."
 
-#: topologie/views.py:987
+#: topologie/views.py:1058
 msgid "The switch constructor was edited."
 msgstr "Le constructeur de commutateur réseau a été modifié."
 
-#: topologie/views.py:1003
+#: topologie/views.py:1074
 msgid "The switch constructor was deleted."
 msgstr "Le constructeur de commutateur réseau a été supprimé."
 
-#: topologie/views.py:1007
+#: topologie/views.py:1078
 #, python-format
 msgid ""
 "The switch constructor %s is used by another object, impossible to delete it."
@@ -966,49 +1012,49 @@ msgstr ""
 "Le constructeur de commutateur réseau %s est utilisé par un autre objet, "
 "impossible de le supprimer."
 
-#: topologie/views.py:1024
+#: topologie/views.py:1095
 msgid "The port profile was created."
 msgstr "Le profil de port a été créé."
 
-#: topologie/views.py:1042
+#: topologie/views.py:1113
 msgid "The port profile was edited."
 msgstr "Le profil de port a été modifié."
 
-#: topologie/views.py:1059
+#: topologie/views.py:1130
 msgid "The port profile was deleted."
 msgstr "Le profil de port a été supprimé."
 
-#: topologie/views.py:1062
+#: topologie/views.py:1133
 msgid "Impossible to delete the port profile."
 msgstr "Impossible de supprimer le profil de port."
 
-#: topologie/views.py:1078
+#: topologie/views.py:1149
 msgid "The module was created."
 msgstr "Le module a été créé."
 
-#: topologie/views.py:1095 topologie/views.py:1149
+#: topologie/views.py:1166 topologie/views.py:1220
 msgid "The module was edited."
 msgstr "Le module a été modifié."
 
-#: topologie/views.py:1111 topologie/views.py:1165
+#: topologie/views.py:1182 topologie/views.py:1236
 msgid "The module was deleted."
 msgstr "Le module a été supprimé."
 
-#: topologie/views.py:1115 topologie/views.py:1169
+#: topologie/views.py:1186 topologie/views.py:1240
 #, 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:1120 topologie/views.py:1174
+#: topologie/views.py:1191 topologie/views.py:1245
 msgid "Module"
 msgstr "Module"
 
-#: topologie/views.py:1132
+#: topologie/views.py:1203
 msgid "The module was added."
 msgstr "Le module a été ajouté."
 
-#: topologie/views.py:1291
+#: topologie/views.py:1362
 msgid ""
 "The default Django template isn't used. This can lead to rendering errors. "
 "Check the parameters."
diff --git a/users/locale/fr/LC_MESSAGES/django.po b/users/locale/fr/LC_MESSAGES/django.po
index edc80bf8..96103ac8 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-02-12 08:58+0100\n"
+"POT-Creation-Date: 2019-02-25 20:36+0100\n"
 "PO-Revision-Date: 2018-06-27 23:35+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -761,7 +761,6 @@ msgstr[1] "Total: %(perm_count)s permissions"
 #: users/templates/users/index_emailaddress.html:29
 #: users/templates/users/index_listright.html:30
 #: users/templates/users/index_rights.html:29
-#: users/templates/users/index_schools.html:30
 #: users/templates/users/index_serviceusers.html:30
 #: users/templates/users/index_shell.html:30
 #: users/templates/users/index_whitelist.html:29
@@ -836,22 +835,6 @@ msgstr " Supprimer un ou plusieurs groupes de droits"
 msgid "Rights"
 msgstr "Droits"
 
-#: users/templates/users/index_schools.html:33
-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"
-
-#: users/templates/users/index_schools.html:36
-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"
-
 #: users/templates/users/index_serviceusers.html:33
 msgid "List of LDAP service users"
 msgstr "Liste des utilisateurs service LDAP"
@@ -971,7 +954,7 @@ msgstr " Informations détaillées"
 msgid "Edit"
 msgstr "Modifier"
 
-#: users/templates/users/profil.html:138 users/views.py:286 users/views.py:1084
+#: users/templates/users/profil.html:138 users/views.py:286 users/views.py:1022
 msgid "Change the password"
 msgstr "Changer le mot de passe"
 
@@ -1252,7 +1235,7 @@ msgstr "Modifier l'état"
 msgid "The groups were edited."
 msgstr "Les groupes ont été modifiés."
 
-#: users/views.py:280 users/views.py:1081
+#: users/views.py:280 users/views.py:1019
 msgid "The password was changed."
 msgstr "Le mot de passe a été changé."
 
@@ -1358,79 +1341,47 @@ msgstr "Les paramètres mail ont été modifiés."
 msgid "Edit the email settings"
 msgstr "Modifier les paramètres mail"
 
-#: users/views.py:608
-msgid "The school was added."
-msgstr "L'établissement a été ajouté."
-
-#: users/views.py:611
-msgid "Add a school"
-msgstr "Ajouter un établissement"
-
-#: users/views.py:626
-msgid "The school was edited."
-msgstr "L'établissement a été modifié."
-
-#: users/views.py:629
-msgid "Edit a school"
-msgstr "Modifier un établissement"
-
-#: users/views.py:648
-msgid "The school was deleted."
-msgstr "L'établissement a été supprimé."
-
-#: users/views.py:652
-#, python-format
-msgid ""
-"The school %s is assigned to at least one user, impossible to delete it."
-msgstr ""
-"L'établissement %s est assigné à au moins un utilisateur, impossible de le "
-"supprimer."
-
-#: users/views.py:656 users/views.py:768
-msgid "Delete"
-msgstr "Supprimer"
-
-#: users/views.py:669
+#: users/views.py:607
 msgid "The shell was added."
 msgstr "L'interface en ligne de commande a été ajoutée."
 
-#: users/views.py:672
+#: users/views.py:610
 msgid "Add a shell"
 msgstr "Ajouter une interface en ligne de commande"
 
-#: users/views.py:686
+#: users/views.py:624
 msgid "The shell was edited."
 msgstr "L'interface en ligne de commande a été modifiée."
 
-#: users/views.py:689
+#: users/views.py:627
 msgid "Edit a shell"
 msgstr "Modifier une interface en ligne de commande"
 
-#: users/views.py:701
+#: users/views.py:639
 msgid "The shell was deleted."
 msgstr "L'interface en ligne de commande a été supprimée."
 
-#: users/views.py:718
+#: users/views.py:656
 msgid "The group of rights was added."
 msgstr "Le groupe de droits a été ajouté."
 
-#: users/views.py:721
+#: users/views.py:659
 msgid "Add a group of rights"
 msgstr "Ajouter un groupe de droits"
 
-#: users/views.py:739
+#: users/views.py:677
 msgid "The group of rights was edited."
 msgstr "Le groupe de droits a été modifié."
 
-#: users/views.py:742
+#: users/views.py:680
 msgid "Edit a group of rights"
 msgstr "Modifier un groupe de droits"
 
-#: users/views.py:759
+#: users/views.py:697
 msgid "The group of rights was deleted."
 msgstr "Le groupe de droits a été supprimé."
 
-#: users/views.py:764
+#: users/views.py:702
 #, python-format
 msgid ""
 "The group of rights %s is assigned to at least one user, impossible to "
@@ -1439,40 +1390,44 @@ msgstr ""
 "Le groupe de droits %s est assigné à au moins un utilisateur, impossible de "
 "le supprimer."
 
-#: users/views.py:792
+#: users/views.py:706
+msgid "Delete"
+msgstr "Supprimer"
+
+#: users/views.py:730
 msgid "Archiving"
 msgstr "Archivage"
 
-#: users/views.py:793
+#: users/views.py:731
 #, python-format
 msgid "%s users were archived."
 msgstr "%s utilisateurs ont été archivés."
 
-#: users/views.py:1043
+#: users/views.py:981
 msgid "The user doesn't exist."
 msgstr "L'utilisateur n'existe pas."
 
-#: users/views.py:1045 users/views.py:1053
+#: users/views.py:983 users/views.py:991
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: users/views.py:1050
+#: users/views.py:988
 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:1067
+#: users/views.py:1005
 msgid "Error: please contact an admin."
 msgstr "Erreur : veuillez contacter un admin."
 
-#: users/views.py:1079
+#: users/views.py:1017
 msgid "Password reset"
 msgstr "Réinitialisation du mot de passe"
 
-#: users/views.py:1096
+#: users/views.py:1034
 msgid "Incorrect URL, or already registered device."
 msgstr "URL incorrect, ou appareil déjà enregistré."
 
-#: users/views.py:1104
+#: users/views.py:1042
 msgid ""
 "Successful registration! Please disconnect and reconnect your Ethernet cable "
 "to get Internet access."
@@ -1480,7 +1435,7 @@ msgstr ""
 "Enregistrement réussi ! Veuillez débrancher et rebrancher votre câble "
 "Ethernet pour avoir accès à Internet."
 
-#: users/views.py:1148 users/views.py:1172 users/views.py:1187
+#: users/views.py:1086 users/views.py:1110 users/views.py:1125
 msgid "The mailing list doesn't exist."
 msgstr "La liste de diffusion n'existe pas."