Rename pseudo to username

api/locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-12 15:20+0200\n"
+"POT-Creation-Date: 2019-04-24 09:44+0200\n"
 "PO-Revision-Date: 2019-01-07 01:37+0100\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"

api/serializers.py

@@ -583,7 +583,7 @@ class UserSerializer(NamespacedHMSerializer):
 
     class Meta:
         model = users.User
-        fields = ('surname', 'pseudo', 'email', 'local_email_redirect',
+        fields = ('surname', 'username', 'email', 'local_email_redirect',
                   'local_email_enabled', 'school', 'shell', 'comment',
                   'state', 'registered', 'telephone', 'solde', 'access',
                   'end_access', 'uid', 'class_name', 'api_url')
@@ -601,7 +601,7 @@ class ClubSerializer(NamespacedHMSerializer):
 
     class Meta:
         model = users.Club
-        fields = ('name', 'pseudo', 'email', 'local_email_redirect',
+        fields = ('name', 'username', 'email', 'local_email_redirect',
                   'local_email_enabled', 'school', 'shell', 'comment',
                   'state', 'registered', 'telephone', 'solde', 'room',
                   'access', 'end_access', 'administrators', 'members',
@@ -619,7 +619,7 @@ class AdherentSerializer(NamespacedHMSerializer):
 
     class Meta:
         model = users.Adherent
-        fields = ('name', 'surname', 'pseudo', 'email', 'local_email_redirect',
+        fields = ('name', 'surname', 'username', 'email', 'local_email_redirect',
                   'local_email_enabled', 'school', 'shell', 'comment',
                   'state', 'registered', 'telephone', 'room', 'solde',
                   'access', 'end_access', 'uid', 'api_url', 'gid')
@@ -635,7 +635,7 @@ class BasicUserSerializer(NamespacedHMSerializer):
 
     class Meta:
         model = users.User
-        fields = ('pseudo', 'uid', 'gid')
+        fields = ('username', 'uid', 'gid')
 
 
 class ServiceUserSerializer(NamespacedHMSerializer):
@@ -644,7 +644,7 @@ class ServiceUserSerializer(NamespacedHMSerializer):
 
     class Meta:
         model = users.ServiceUser
-        fields = ('pseudo', 'access_group', 'comment', 'api_url')
+        fields = ('username', 'access_group', 'comment', 'api_url')
 
 
 class SchoolSerializer(NamespacedHMSerializer):
@@ -701,7 +701,7 @@ class WhitelistSerializer(NamespacedHMSerializer):
 class EMailAddressSerializer(NamespacedHMSerializer):
     """Serialize `users.models.EMailAddress` objects.
     """
-    user = serializers.CharField(source='user.pseudo', read_only=True)
+    user = serializers.CharField(source='user.username', read_only=True)
 
     class Meta:
         model = users.EMailAddress
@@ -1077,7 +1077,7 @@ class MailingMemberSerializer(UserSerializer):
     """
 
     class Meta(UserSerializer.Meta):
-        fields = ('name', 'pseudo', 'get_mail')
+        fields = ('name', 'username', 'get_mail')
 
 
 class MailingSerializer(ClubSerializer):

api/tests.py

@@ -245,7 +245,7 @@ class APIEndpointsTestCase(APITestCase):
             password="password",
             last_login=datetime.datetime.now(datetime.timezone.utc),
             surname="users_adherent_1",
-            pseudo="usersadherent1",
+            username="usersadherent1",
             email="users_adherent_1@example.net",
             school=cls.users_school_1,  # Dep users.School
             shell=cls.users_listshell_1,  # Dep users.ListShell
@@ -499,7 +499,7 @@ class APIEndpointsTestCase(APITestCase):
             password="password",
             last_login=datetime.datetime.now(datetime.timezone.utc),
             surname="users_club_1",
-            pseudo="usersclub1",
+            username="usersclub1",
             email="users_club_1@example.net",
             school=cls.users_school_1,  # Dep users.School
             shell=cls.users_listshell_1,  # Dep users.ListShell
@@ -522,7 +522,7 @@ class APIEndpointsTestCase(APITestCase):
         cls.users_serviceuser_1 = users.ServiceUser.objects.create(
             password="password",
             last_login=datetime.datetime.now(datetime.timezone.utc),
-            pseudo="usersserviceuser1",
+            username="usersserviceuser1",
             access_group=users.ServiceUser.ACCESS[0][0],
             comment="users ServiceUser 1"
         )

cotisations/locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-12 15:20+0200\n"
+"POT-Creation-Date: 2019-04-24 09:44+0200\n"
 "PO-Revision-Date: 2018-03-31 16:09+0002\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language: fr_FR\n"
@@ -566,7 +566,7 @@ msgid "no"
 msgstr "non"
 
 #: cotisations/payment_methods/note_kfet/forms.py:17
-msgid "pseudo note"
+msgid "username note"
 msgstr "pseudo note"
 
 #: cotisations/payment_methods/note_kfet/forms.py:20
@@ -743,7 +743,7 @@ msgstr "Modifier la facture"
 
 #: cotisations/templates/cotisations/edit_facture.html:45
 #: cotisations/templates/cotisations/facture.html:62
-#: cotisations/templates/cotisations/index_article.html:30
+#: cotisations/templates/cotisations/index_article.html:29
 msgid "Articles"
 msgstr "Articles"
 
@@ -769,41 +769,41 @@ msgstr "Ajouter un article supplémentaire"
 msgid "Total price: <span id=\"total_price\">0,00</span> €"
 msgstr "Prix total : <span id=\"total_price\">0,00</span> €"
 
-#: cotisations/templates/cotisations/index.html:29
+#: cotisations/templates/cotisations/index.html:28
 #: cotisations/templates/cotisations/sidebar.html:40
 msgid "Invoices"
 msgstr "Factures"
 
-#: cotisations/templates/cotisations/index.html:32
+#: cotisations/templates/cotisations/index.html:31
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: cotisations/templates/cotisations/index_article.html:33
+#: cotisations/templates/cotisations/index_article.html:32
 msgid "List of article types"
 msgstr "Liste des types d'article"
 
-#: cotisations/templates/cotisations/index_article.html:36
+#: cotisations/templates/cotisations/index_article.html:35
 msgid "Add an article type"
 msgstr "Ajouter un type d'article"
 
-#: cotisations/templates/cotisations/index_article.html:40
+#: cotisations/templates/cotisations/index_article.html:39
 msgid "Delete one or several article types"
 msgstr "Supprimer un ou plusieurs types d'article"
 
-#: cotisations/templates/cotisations/index_banque.html:30
+#: cotisations/templates/cotisations/index_banque.html:29
 #: cotisations/templates/cotisations/sidebar.html:60
 msgid "Banks"
 msgstr "Banques"
 
-#: cotisations/templates/cotisations/index_banque.html:33
+#: cotisations/templates/cotisations/index_banque.html:32
 msgid "List of banks"
 msgstr "Liste des banques"
 
-#: cotisations/templates/cotisations/index_banque.html:36
+#: cotisations/templates/cotisations/index_banque.html:35
 msgid "Add a bank"
 msgstr "Ajouter une banque"
 
-#: cotisations/templates/cotisations/index_banque.html:40
+#: cotisations/templates/cotisations/index_banque.html:39
 msgid "Delete one or several banks"
 msgstr "Supprimer une ou plusieurs banques"
 
@@ -825,20 +825,20 @@ msgstr "Factures personnalisées"
 msgid "List of custom invoices"
 msgstr "Liste des factures personnalisées"
 
-#: cotisations/templates/cotisations/index_paiement.html:30
+#: cotisations/templates/cotisations/index_paiement.html:29
 #: cotisations/templates/cotisations/sidebar.html:65
 msgid "Payment methods"
 msgstr "Moyens de paiement"
 
-#: cotisations/templates/cotisations/index_paiement.html:33
+#: cotisations/templates/cotisations/index_paiement.html:32
 msgid "List of payment methods"
 msgstr "Liste des moyens de paiement"
 
-#: cotisations/templates/cotisations/index_paiement.html:36
+#: cotisations/templates/cotisations/index_paiement.html:35
 msgid "Add a payment method"
 msgstr "Ajouter un moyen de paiement"
 
-#: cotisations/templates/cotisations/index_paiement.html:40
+#: cotisations/templates/cotisations/index_paiement.html:39
 msgid "Delete one or several payment methods"
 msgstr "Supprimer un ou plusieurs moyens de paiement"
 

cotisations/models.py

@@ -778,7 +778,7 @@ class Paiement(RevMixin, AclMixin, models.Model):
                 request,
                 _("The subscription of %(member_name)s was extended to"
                   " %(end_date)s.") % {
-                    'member_name': invoice.user.pseudo,
+                    'member_name': invoice.user.username,
                     'end_date': invoice.user.end_adhesion()
                 }
             )

cotisations/payment_methods/comnpay/views.py

@@ -47,7 +47,7 @@ def accept_payment(request, factureid):
                 request,
                 _("The subscription of %(member_name)s was extended to"
                   " %(end_date)s.") % {
-                    'member_name': invoice.user.pseudo,
+                    'member_name': invoice.user.username,
                     'end_date': invoice.user.end_adhesion()
                 }
             )

cotisations/payment_methods/note_kfet/forms.py

@@ -14,7 +14,7 @@ class NoteCredentialForm(forms.Form):
     object.
     """
     login = forms.CharField(
-            label=_("pseudo note")
+            label=_("username note")
         )
     password = forms.CharField(
             label=_("Password"),

cotisations/payment_methods/note_kfet/views.py

@@ -49,9 +49,9 @@ def note_payment(request, facture, factureid):
          ))
     noteform = NoteCredentialForm(request.POST or None)
     if noteform.is_valid():
-        pseudo = noteform.cleaned_data['login']
+        username = noteform.cleaned_data['login']
         password = noteform.cleaned_data['password']
-        result, sock, err = login(payment_method.server, payment_method.port, pseudo, password)
+        result, sock, err = login(payment_method.server, payment_method.port, username, password)
         if not result:
             messages.error(request, err)
             return form(

freeradius_utils/auth.py

@@ -275,7 +275,7 @@ def check_user_machine_and_register(nas_type, username, mac_address):
     Renvoie le mot de passe ntlm de l'user si tout est ok
     Utilise pour les authentifications en 802.1X"""
     interface = Interface.objects.filter(mac_address=mac_address).first()
-    user = User.objects.filter(pseudo__iexact=username).first()
+    user = User.objects.filter(username__iexact=username).first()
     if not user:
         return (False, u"User inconnu", '')
     if not user.has_access():

logs/locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-12 15:20+0200\n"
+"POT-Creation-Date: 2019-04-24 09:44+0200\n"
 "PO-Revision-Date: 2018-06-23 16:01+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -119,11 +119,11 @@ msgstr "+%(duration)s mois"
 msgid "%(username)s has edited an interface of"
 msgstr "%(username)s a modifié une interface de"
 
-#: logs/templates/logs/delete.html:29
+#: logs/templates/logs/delete.html:28
 msgid "Deletion of actions"
 msgstr "Suppression d'actions"
 
-#: logs/templates/logs/delete.html:35
+#: logs/templates/logs/delete.html:33
 #, python-format
 msgid ""
 "Warning: are you sure you want to delete this action %(objet_name)s "
@@ -132,18 +132,18 @@ msgstr ""
 "Attention: voulez-vous vraiment supprimer cette action %(objet_name)s "
 "( %(objet)s ) ?"
 
-#: logs/templates/logs/delete.html:36
+#: logs/templates/logs/delete.html:35
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: logs/templates/logs/index.html:29 logs/templates/logs/stats_general.html:29
-#: logs/templates/logs/stats_logs.html:29
-#: logs/templates/logs/stats_models.html:29
-#: logs/templates/logs/stats_users.html:29
+#: logs/templates/logs/index.html:28 logs/templates/logs/stats_general.html:28
+#: logs/templates/logs/stats_logs.html:28
+#: logs/templates/logs/stats_models.html:28
+#: logs/templates/logs/stats_users.html:28
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: logs/templates/logs/index.html:32 logs/templates/logs/stats_logs.html:32
+#: logs/templates/logs/index.html:31 logs/templates/logs/stats_logs.html:31
 #: logs/views.py:404
 msgid "Actions performed"
 msgstr "Actions effectuées"
@@ -172,15 +172,15 @@ msgstr "Actions de câblage"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: logs/templates/logs/stats_general.html:32
+#: logs/templates/logs/stats_general.html:31
 msgid "General statistics"
 msgstr "Statistiques générales"
 
-#: logs/templates/logs/stats_models.html:32
+#: logs/templates/logs/stats_models.html:31
 msgid "Database statistics"
 msgstr "Statistiques sur la base de données"
 
-#: logs/templates/logs/stats_users.html:32
+#: logs/templates/logs/stats_users.html:31
 msgid "Statistics about users"
 msgstr "Statistiques sur les utilisateurs"
 

machines/admin.py

@@ -80,7 +80,7 @@ class InterfaceAdmin(VersionAdmin):
     inlines = (DomainInline, Ipv6ListInline)
     filter_horizontal = ('port_lists',)
     search_fields = ('domain__name', 'mac_address', 'ipv4__ipv4',
-                     'machine__name', 'machine__user__pseudo',
+                     'machine__name', 'machine__user__username',
                      'machine__user__surname')
     # TODO(erdnaxe): we need to split alias and domain
 
@@ -105,7 +105,7 @@ class MachineAdmin(VersionAdmin):
     list_filter = ('active',)
     inlines = (InterfaceInline, SshFpInline)
     empty_value_display = _('- no name -')
-    search_fields = ('name', 'user__pseudo', 'user__surname')
+    search_fields = ('name', 'user__username', 'user__surname')
 
 
 @admin.register(MachineType)
@@ -158,7 +158,7 @@ class OuverturePortListAdmin(VersionAdmin):
 @admin.register(Role)
 class RoleAdmin(VersionAdmin):
     """Admin view of a Role object"""
-    list_display = ('role_type', 'specific_role', 'servers')
+    list_display = ('role_type', 'specific_role')
     filter_horizontal = ('servers',)
     # TODO(erdnaxe): investigate why it was buggy before switching to admin
     # TODO(erdnaxe): print machines on change list like in edit mode
@@ -180,8 +180,7 @@ class ServiceLinkInline(admin.TabularInline):
 @admin.register(Service)
 class ServiceAdmin(VersionAdmin):
     """Admin view of a Service object"""
-    list_display = ('service_type', 'min_time_regen', 'regular_time_regen',
-                    'servers')
+    list_display = ('service_type', 'min_time_regen', 'regular_time_regen')
     inlines = (ServiceLinkInline,)
     # TODO(erdnaxe): print machines on change list like in edit mode
 

machines/locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-14 08:49+0200\n"
+"POT-Creation-Date: 2019-04-24 09:44+0200\n"
 "PO-Revision-Date: 2018-06-23 16:35+0200\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "You don't have the right to view this application."
 msgstr "Vous n'avez pas le droit de voir cette application."
 
-#: machines/admin.py:104
+#: machines/admin.py:107
 msgid "- no name -"
 msgstr "- sans nom -"
 
@@ -1032,11 +1032,11 @@ msgstr "Algorithme utilisé"
 msgid "Comment"
 msgstr "Commentaire"
 
-#: machines/templates/machines/delete.html:29
+#: machines/templates/machines/delete.html:28
 msgid "Deletion of machines"
 msgstr "Suppression de machines"
 
-#: machines/templates/machines/delete.html:35
+#: machines/templates/machines/delete.html:33
 #, python-format
 msgid ""
 "Warning: are you sure you want to delete this object %(objet_name)s "
@@ -1045,43 +1045,43 @@ msgstr ""
 "Attention : voulez-vous vraiment supprimer cet objet %(objet_name)s "
 "( %(objet)s ) ?"
 
-#: machines/templates/machines/delete.html:36
+#: machines/templates/machines/delete.html:35
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: machines/templates/machines/index.html:29
-#: machines/templates/machines/index.html:32
-#: machines/templates/machines/index_alias.html:29
-#: machines/templates/machines/index_iptype.html:30
-#: machines/templates/machines/index_ipv6.html:30
+#: machines/templates/machines/index.html:28
+#: machines/templates/machines/index.html:31
+#: machines/templates/machines/index_alias.html:28
+#: machines/templates/machines/index_iptype.html:28
+#: machines/templates/machines/index_ipv6.html:29
 #: machines/templates/machines/index_service.html:28
-#: machines/templates/machines/index_sshfp.html:28
+#: machines/templates/machines/index_sshfp.html:27
 #: machines/templates/machines/machine.html:31
 #: machines/templates/machines/sidebar.html:33
 msgid "Machines"
 msgstr "Machines"
 
-#: machines/templates/machines/index_alias.html:32
+#: machines/templates/machines/index_alias.html:31
 msgid "List of the aliases of the interface"
 msgstr "Liste des alias de l'interface"
 
-#: machines/templates/machines/index_alias.html:34
+#: machines/templates/machines/index_alias.html:33
 msgid " Add an alias"
 msgstr " Ajouter un alias"
 
-#: machines/templates/machines/index_alias.html:36
+#: machines/templates/machines/index_alias.html:35
 msgid " Delete one or several aliases"
 msgstr " Supprimer un ou plusieurs alias"
 
-#: machines/templates/machines/index_iptype.html:33
+#: machines/templates/machines/index_iptype.html:31
 msgid "List of IP types"
 msgstr "Liste des types d'IP"
 
-#: machines/templates/machines/index_ipv6.html:33
+#: machines/templates/machines/index_ipv6.html:32
 msgid "List of the IPv6 addresses of the interface"
 msgstr "Liste des adresses IPv6 de l'interface"
 
-#: machines/templates/machines/index_ipv6.html:36
+#: machines/templates/machines/index_ipv6.html:35
 msgid " Add an IPv6 address"
 msgstr " Ajouter une adresse IPv6"
 
@@ -1093,11 +1093,11 @@ msgstr "Liste des services"
 msgid "States of servers"
 msgstr "États des serveurs"
 
-#: machines/templates/machines/index_sshfp.html:31
+#: machines/templates/machines/index_sshfp.html:30
 msgid "SSH fingerprints"
 msgstr "Empreintes SSH"
 
-#: machines/templates/machines/index_sshfp.html:34
+#: machines/templates/machines/index_sshfp.html:33
 msgid " Add an SSH fingerprint"
 msgstr " Ajouter une empreinte SSH"
 

re2o/base.py

@@ -108,18 +108,18 @@ class SortTable:
     USERS_INDEX = {
         'user_name': ['name'],
         'user_surname': ['surname'],
-        'user_pseudo': ['pseudo'],
+        'user_username': ['username'],
         'user_room': ['room'],
-        'default': ['state', 'pseudo']
+        'default': ['state', 'username']
     }
     USERS_INDEX_BAN = {
-        'ban_user': ['user__pseudo'],
+        'ban_user': ['user__username'],
         'ban_start': ['date_start'],
         'ban_end': ['date_end'],
         'default': ['-date_end']
     }
     USERS_INDEX_WHITE = {
-        'white_user': ['user__pseudo'],
+        'white_user': ['user__username'],
         'white_start': ['date_start'],
         'white_end': ['date_end'],
         'default': ['-date_end']
@@ -133,7 +133,7 @@ class SortTable:
         'default': ['pk']
     }
     COTISATIONS_INDEX = {
-        'cotis_user': ['user__pseudo'],
+        'cotis_user': ['user__username'],
         'cotis_paiement': ['paiement__moyen'],
         'cotis_date': ['date'],
         'cotis_id': ['id'],

re2o/locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-12 15:20+0200\n"
+"POT-Creation-Date: 2019-04-24 09:44+0200\n"
 "PO-Revision-Date: 2018-03-31 16:09+0002\n"
 "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
 "Language-Team: \n"
@@ -68,16 +68,16 @@ msgstr "Anglais"
 msgid "French"
 msgstr "Français"
 
-#: re2o/templates/re2o/about.html:29 re2o/templates/re2o/about.html:35
+#: re2o/templates/re2o/about.html:28 re2o/templates/re2o/about.html:34
 msgid "About Re2o"
 msgstr "À propos de Re2o"
 
-#: re2o/templates/re2o/about.html:32
+#: re2o/templates/re2o/about.html:31
 #, python-format
 msgid "About %(AssoName)s"
 msgstr "À propos de %(AssoName)s"
 
-#: re2o/templates/re2o/about.html:36
+#: re2o/templates/re2o/about.html:35
 msgid ""
 "Re2o is an administration tool initiated by <a href=\"https://rezometz.org/"
 "\">Rezo Metz</a> and a few members of other <a href=\"https://federez.net"
@@ -104,35 +104,35 @@ msgstr ""
 "développement, nous serons heureux de vous accueillir donc n'hésitez pas à "
 "nous contacter et à venir nous aider à construire le futur de Re2o."
 
-#: re2o/templates/re2o/about.html:55
+#: re2o/templates/re2o/about.html:54
 msgid "Contributors list"
 msgstr "Liste des contributeurs"
 
-#: re2o/templates/re2o/about.html:64
+#: re2o/templates/re2o/about.html:63
 msgid "Version information"
 msgstr "Informations de versions"
 
-#: re2o/templates/re2o/about.html:66
+#: re2o/templates/re2o/about.html:65
 #, python-format
 msgid "<b>Remote URL</b>: %(git_info_remote)s"
 msgstr "<b>URL distante</b> : %(git_info_remote)s"
 
-#: re2o/templates/re2o/about.html:69
+#: re2o/templates/re2o/about.html:68
 #, python-format
 msgid "<b>Branch</b>: %(git_info_branch)s"
 msgstr "<b>Branche</b> : %(git_info_branch)s"
 
-#: re2o/templates/re2o/about.html:72
+#: re2o/templates/re2o/about.html:71
 #, python-format
 msgid "<b>Commit</b>: %(git_info_commit)s"
 msgstr "<b>Commit</b> : %(git_info_commit)s"
 
-#: re2o/templates/re2o/about.html:75
+#: re2o/templates/re2o/about.html:74
 #, python-format
 msgid "<b>Commit date</b>: %(git_info_commit_date)s"
 msgstr "<b>Date du commit</b> : %(git_info_commit_date)s"
 
-#: re2o/templates/re2o/about.html:80
+#: re2o/templates/re2o/about.html:79
 msgid "Dependencies"
 msgstr "Dépendances"
 
@@ -174,20 +174,20 @@ msgstr "Historique"
 msgid "History of %(object)s"
 msgstr "Historique de %(object)s"
 
-#: re2o/templates/re2o/index.html:30
+#: re2o/templates/re2o/index.html:29
 msgid "Home"
 msgstr "Accueil"
 
-#: re2o/templates/re2o/index.html:34
+#: re2o/templates/re2o/index.html:33
 #, python-format
 msgid "Welcome to %(name_website)s"
 msgstr "Bienvenue sur %(name_website)s"
 
-#: re2o/templates/re2o/index.html:43
+#: re2o/templates/re2o/index.html:42
 msgid "Registration"
 msgstr "Inscription"
 
-#: re2o/templates/re2o/index.html:44
+#: re2o/templates/re2o/index.html:43
 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."
@@ -195,15 +195,15 @@ 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."
 
-#: re2o/templates/re2o/index.html:45
+#: re2o/templates/re2o/index.html:44
 msgid "Sign up"
 msgstr "S'inscrire"
 
-#: re2o/templates/re2o/index.html:55
+#: re2o/templates/re2o/index.html:54
 msgid "Logging in"
 msgstr "Identification"
 
-#: re2o/templates/re2o/index.html:56
+#: re2o/templates/re2o/index.html:55
 msgid ""
 "If you already have an account, log in. You can manage your subscriptions to "
 "the organisation, your machines and all your services."
@@ -211,15 +211,15 @@ msgstr ""
 "Si vous avez déjà un compte, identifiez-vous. Vous pouvez gérer vos "
 "cotisations à l'association, vos machines et tous vos services."
 
-#: re2o/templates/re2o/index.html:57
+#: re2o/templates/re2o/index.html:56
 msgid "Log in"
 msgstr "Se connecter"
 
-#: re2o/templates/re2o/index.html:68
+#: re2o/templates/re2o/index.html:67
 msgid "My profil