Verified Commit 7f94eb61 authored by erdnaxe's avatar erdnaxe 🎇

Rename pseudo to username

parent 93db3fbb
Pipeline #1165 passed with stage
in 2 minutes and 59 seconds
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.5\n" "Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2019-01-07 01:37+0100\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n" "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n" "Language-Team: \n"
......
...@@ -583,7 +583,7 @@ class UserSerializer(NamespacedHMSerializer): ...@@ -583,7 +583,7 @@ class UserSerializer(NamespacedHMSerializer):
class Meta: class Meta:
model = users.User model = users.User
fields = ('surname', 'pseudo', 'email', 'local_email_redirect', fields = ('surname', 'username', 'email', 'local_email_redirect',
'local_email_enabled', 'school', 'shell', 'comment', 'local_email_enabled', 'school', 'shell', 'comment',
'state', 'registered', 'telephone', 'solde', 'access', 'state', 'registered', 'telephone', 'solde', 'access',
'end_access', 'uid', 'class_name', 'api_url') 'end_access', 'uid', 'class_name', 'api_url')
...@@ -601,7 +601,7 @@ class ClubSerializer(NamespacedHMSerializer): ...@@ -601,7 +601,7 @@ class ClubSerializer(NamespacedHMSerializer):
class Meta: class Meta:
model = users.Club model = users.Club
fields = ('name', 'pseudo', 'email', 'local_email_redirect', fields = ('name', 'username', 'email', 'local_email_redirect',
'local_email_enabled', 'school', 'shell', 'comment', 'local_email_enabled', 'school', 'shell', 'comment',
'state', 'registered', 'telephone', 'solde', 'room', 'state', 'registered', 'telephone', 'solde', 'room',
'access', 'end_access', 'administrators', 'members', 'access', 'end_access', 'administrators', 'members',
...@@ -619,7 +619,7 @@ class AdherentSerializer(NamespacedHMSerializer): ...@@ -619,7 +619,7 @@ class AdherentSerializer(NamespacedHMSerializer):
class Meta: class Meta:
model = users.Adherent 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', 'local_email_enabled', 'school', 'shell', 'comment',
'state', 'registered', 'telephone', 'room', 'solde', 'state', 'registered', 'telephone', 'room', 'solde',
'access', 'end_access', 'uid', 'api_url', 'gid') 'access', 'end_access', 'uid', 'api_url', 'gid')
...@@ -635,7 +635,7 @@ class BasicUserSerializer(NamespacedHMSerializer): ...@@ -635,7 +635,7 @@ class BasicUserSerializer(NamespacedHMSerializer):
class Meta: class Meta:
model = users.User model = users.User
fields = ('pseudo', 'uid', 'gid') fields = ('username', 'uid', 'gid')
class ServiceUserSerializer(NamespacedHMSerializer): class ServiceUserSerializer(NamespacedHMSerializer):
...@@ -644,7 +644,7 @@ class ServiceUserSerializer(NamespacedHMSerializer): ...@@ -644,7 +644,7 @@ class ServiceUserSerializer(NamespacedHMSerializer):
class Meta: class Meta:
model = users.ServiceUser model = users.ServiceUser
fields = ('pseudo', 'access_group', 'comment', 'api_url') fields = ('username', 'access_group', 'comment', 'api_url')
class SchoolSerializer(NamespacedHMSerializer): class SchoolSerializer(NamespacedHMSerializer):
...@@ -701,7 +701,7 @@ class WhitelistSerializer(NamespacedHMSerializer): ...@@ -701,7 +701,7 @@ class WhitelistSerializer(NamespacedHMSerializer):
class EMailAddressSerializer(NamespacedHMSerializer): class EMailAddressSerializer(NamespacedHMSerializer):
"""Serialize `users.models.EMailAddress` objects. """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: class Meta:
model = users.EMailAddress model = users.EMailAddress
...@@ -1077,7 +1077,7 @@ class MailingMemberSerializer(UserSerializer): ...@@ -1077,7 +1077,7 @@ class MailingMemberSerializer(UserSerializer):
""" """
class Meta(UserSerializer.Meta): class Meta(UserSerializer.Meta):
fields = ('name', 'pseudo', 'get_mail') fields = ('name', 'username', 'get_mail')
class MailingSerializer(ClubSerializer): class MailingSerializer(ClubSerializer):
......
...@@ -245,7 +245,7 @@ class APIEndpointsTestCase(APITestCase): ...@@ -245,7 +245,7 @@ class APIEndpointsTestCase(APITestCase):
password="password", password="password",
last_login=datetime.datetime.now(datetime.timezone.utc), last_login=datetime.datetime.now(datetime.timezone.utc),
surname="users_adherent_1", surname="users_adherent_1",
pseudo="usersadherent1", username="usersadherent1",
email="users_adherent_1@example.net", email="users_adherent_1@example.net",
school=cls.users_school_1, # Dep users.School school=cls.users_school_1, # Dep users.School
shell=cls.users_listshell_1, # Dep users.ListShell shell=cls.users_listshell_1, # Dep users.ListShell
...@@ -499,7 +499,7 @@ class APIEndpointsTestCase(APITestCase): ...@@ -499,7 +499,7 @@ class APIEndpointsTestCase(APITestCase):
password="password", password="password",
last_login=datetime.datetime.now(datetime.timezone.utc), last_login=datetime.datetime.now(datetime.timezone.utc),
surname="users_club_1", surname="users_club_1",
pseudo="usersclub1", username="usersclub1",
email="users_club_1@example.net", email="users_club_1@example.net",
school=cls.users_school_1, # Dep users.School school=cls.users_school_1, # Dep users.School
shell=cls.users_listshell_1, # Dep users.ListShell shell=cls.users_listshell_1, # Dep users.ListShell
...@@ -522,7 +522,7 @@ class APIEndpointsTestCase(APITestCase): ...@@ -522,7 +522,7 @@ class APIEndpointsTestCase(APITestCase):
cls.users_serviceuser_1 = users.ServiceUser.objects.create( cls.users_serviceuser_1 = users.ServiceUser.objects.create(
password="password", password="password",
last_login=datetime.datetime.now(datetime.timezone.utc), last_login=datetime.datetime.now(datetime.timezone.utc),
pseudo="usersserviceuser1", username="usersserviceuser1",
access_group=users.ServiceUser.ACCESS[0][0], access_group=users.ServiceUser.ACCESS[0][0],
comment="users ServiceUser 1" comment="users ServiceUser 1"
) )
......
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.5\n" "Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n" "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language: fr_FR\n" "Language: fr_FR\n"
...@@ -566,7 +566,7 @@ msgid "no" ...@@ -566,7 +566,7 @@ msgid "no"
msgstr "non" msgstr "non"
#: cotisations/payment_methods/note_kfet/forms.py:17 #: cotisations/payment_methods/note_kfet/forms.py:17
msgid "pseudo note" msgid "username note"
msgstr "pseudo note" msgstr "pseudo note"
#: cotisations/payment_methods/note_kfet/forms.py:20 #: cotisations/payment_methods/note_kfet/forms.py:20
...@@ -743,7 +743,7 @@ msgstr "Modifier la facture" ...@@ -743,7 +743,7 @@ msgstr "Modifier la facture"
#: cotisations/templates/cotisations/edit_facture.html:45 #: cotisations/templates/cotisations/edit_facture.html:45
#: cotisations/templates/cotisations/facture.html:62 #: cotisations/templates/cotisations/facture.html:62
#: cotisations/templates/cotisations/index_article.html:30 #: cotisations/templates/cotisations/index_article.html:29
msgid "Articles" msgid "Articles"
msgstr "Articles" msgstr "Articles"
...@@ -769,41 +769,41 @@ msgstr "Ajouter un article supplémentaire" ...@@ -769,41 +769,41 @@ msgstr "Ajouter un article supplémentaire"
msgid "Total price: <span id=\"total_price\">0,00</span> €" msgid "Total price: <span id=\"total_price\">0,00</span> €"
msgstr "Prix total : <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 #: cotisations/templates/cotisations/sidebar.html:40
msgid "Invoices" msgid "Invoices"
msgstr "Factures" msgstr "Factures"
#: cotisations/templates/cotisations/index.html:32 #: cotisations/templates/cotisations/index.html:31
msgid "Subscriptions" msgid "Subscriptions"
msgstr "Cotisations" msgstr "Cotisations"
#: cotisations/templates/cotisations/index_article.html:33 #: cotisations/templates/cotisations/index_article.html:32
msgid "List of article types" msgid "List of article types"
msgstr "Liste des types d'article" 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" msgid "Add an article type"
msgstr "Ajouter un type d'article" 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" msgid "Delete one or several article types"
msgstr "Supprimer un ou plusieurs types d'article" 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 #: cotisations/templates/cotisations/sidebar.html:60
msgid "Banks" msgid "Banks"
msgstr "Banques" msgstr "Banques"
#: cotisations/templates/cotisations/index_banque.html:33 #: cotisations/templates/cotisations/index_banque.html:32
msgid "List of banks" msgid "List of banks"
msgstr "Liste des banques" msgstr "Liste des banques"
#: cotisations/templates/cotisations/index_banque.html:36 #: cotisations/templates/cotisations/index_banque.html:35
msgid "Add a bank" msgid "Add a bank"
msgstr "Ajouter une banque" msgstr "Ajouter une banque"
#: cotisations/templates/cotisations/index_banque.html:40 #: cotisations/templates/cotisations/index_banque.html:39
msgid "Delete one or several banks" msgid "Delete one or several banks"
msgstr "Supprimer une ou plusieurs banques" msgstr "Supprimer une ou plusieurs banques"
...@@ -825,20 +825,20 @@ msgstr "Factures personnalisées" ...@@ -825,20 +825,20 @@ msgstr "Factures personnalisées"
msgid "List of custom invoices" msgid "List of custom invoices"
msgstr "Liste des factures personnalisées" 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 #: cotisations/templates/cotisations/sidebar.html:65
msgid "Payment methods" msgid "Payment methods"
msgstr "Moyens de paiement" msgstr "Moyens de paiement"
#: cotisations/templates/cotisations/index_paiement.html:33 #: cotisations/templates/cotisations/index_paiement.html:32
msgid "List of payment methods" msgid "List of payment methods"
msgstr "Liste des moyens de paiement" 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" msgid "Add a payment method"
msgstr "Ajouter un moyen de paiement" 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" msgid "Delete one or several payment methods"
msgstr "Supprimer un ou plusieurs moyens de paiement" msgstr "Supprimer un ou plusieurs moyens de paiement"
......
...@@ -778,7 +778,7 @@ class Paiement(RevMixin, AclMixin, models.Model): ...@@ -778,7 +778,7 @@ class Paiement(RevMixin, AclMixin, models.Model):
request, request,
_("The subscription of %(member_name)s was extended to" _("The subscription of %(member_name)s was extended to"
" %(end_date)s.") % { " %(end_date)s.") % {
'member_name': invoice.user.pseudo, 'member_name': invoice.user.username,
'end_date': invoice.user.end_adhesion() 'end_date': invoice.user.end_adhesion()
} }
) )
......
...@@ -47,7 +47,7 @@ def accept_payment(request, factureid): ...@@ -47,7 +47,7 @@ def accept_payment(request, factureid):
request, request,
_("The subscription of %(member_name)s was extended to" _("The subscription of %(member_name)s was extended to"
" %(end_date)s.") % { " %(end_date)s.") % {
'member_name': invoice.user.pseudo, 'member_name': invoice.user.username,
'end_date': invoice.user.end_adhesion() 'end_date': invoice.user.end_adhesion()
} }
) )
......
...@@ -14,7 +14,7 @@ class NoteCredentialForm(forms.Form): ...@@ -14,7 +14,7 @@ class NoteCredentialForm(forms.Form):
object. object.
""" """
login = forms.CharField( login = forms.CharField(
label=_("pseudo note") label=_("username note")
) )
password = forms.CharField( password = forms.CharField(
label=_("Password"), label=_("Password"),
......
...@@ -49,9 +49,9 @@ def note_payment(request, facture, factureid): ...@@ -49,9 +49,9 @@ def note_payment(request, facture, factureid):
)) ))
noteform = NoteCredentialForm(request.POST or None) noteform = NoteCredentialForm(request.POST or None)
if noteform.is_valid(): if noteform.is_valid():
pseudo = noteform.cleaned_data['login'] username = noteform.cleaned_data['login']
password = noteform.cleaned_data['password'] 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: if not result:
messages.error(request, err) messages.error(request, err)
return form( return form(
......
...@@ -275,7 +275,7 @@ def check_user_machine_and_register(nas_type, username, mac_address): ...@@ -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 Renvoie le mot de passe ntlm de l'user si tout est ok
Utilise pour les authentifications en 802.1X""" Utilise pour les authentifications en 802.1X"""
interface = Interface.objects.filter(mac_address=mac_address).first() 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: if not user:
return (False, u"User inconnu", '') return (False, u"User inconnu", '')
if not user.has_access(): if not user.has_access():
......
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.5\n" "Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2018-06-23 16:01+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n" "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n" "Language-Team: \n"
...@@ -119,11 +119,11 @@ msgstr "+%(duration)s mois" ...@@ -119,11 +119,11 @@ msgstr "+%(duration)s mois"
msgid "%(username)s has edited an interface of" msgid "%(username)s has edited an interface of"
msgstr "%(username)s a modifié une interface de" msgstr "%(username)s a modifié une interface de"
#: logs/templates/logs/delete.html:29 #: logs/templates/logs/delete.html:28
msgid "Deletion of actions" msgid "Deletion of actions"
msgstr "Suppression d'actions" msgstr "Suppression d'actions"
#: logs/templates/logs/delete.html:35 #: logs/templates/logs/delete.html:33
#, python-format #, python-format
msgid "" msgid ""
"Warning: are you sure you want to delete this action %(objet_name)s " "Warning: are you sure you want to delete this action %(objet_name)s "
...@@ -132,18 +132,18 @@ msgstr "" ...@@ -132,18 +132,18 @@ msgstr ""
"Attention: voulez-vous vraiment supprimer cette action %(objet_name)s " "Attention: voulez-vous vraiment supprimer cette action %(objet_name)s "
"( %(objet)s ) ?" "( %(objet)s ) ?"
#: logs/templates/logs/delete.html:36 #: logs/templates/logs/delete.html:35
msgid "Confirm" msgid "Confirm"
msgstr "Confirmer" msgstr "Confirmer"
#: logs/templates/logs/index.html:29 logs/templates/logs/stats_general.html:29 #: logs/templates/logs/index.html:28 logs/templates/logs/stats_general.html:28
#: logs/templates/logs/stats_logs.html:29 #: logs/templates/logs/stats_logs.html:28
#: logs/templates/logs/stats_models.html:29 #: logs/templates/logs/stats_models.html:28
#: logs/templates/logs/stats_users.html:29 #: logs/templates/logs/stats_users.html:28
msgid "Statistics" msgid "Statistics"
msgstr "Statistiques" 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 #: logs/views.py:404
msgid "Actions performed" msgid "Actions performed"
msgstr "Actions effectuées" msgstr "Actions effectuées"
...@@ -172,15 +172,15 @@ msgstr "Actions de câblage" ...@@ -172,15 +172,15 @@ msgstr "Actions de câblage"
msgid "Users" msgid "Users"
msgstr "Utilisateurs" msgstr "Utilisateurs"
#: logs/templates/logs/stats_general.html:32 #: logs/templates/logs/stats_general.html:31
msgid "General statistics" msgid "General statistics"
msgstr "Statistiques générales" msgstr "Statistiques générales"
#: logs/templates/logs/stats_models.html:32 #: logs/templates/logs/stats_models.html:31
msgid "Database statistics" msgid "Database statistics"
msgstr "Statistiques sur la base de données" 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" msgid "Statistics about users"
msgstr "Statistiques sur les utilisateurs" msgstr "Statistiques sur les utilisateurs"
......
...@@ -80,7 +80,7 @@ class InterfaceAdmin(VersionAdmin): ...@@ -80,7 +80,7 @@ class InterfaceAdmin(VersionAdmin):
inlines = (DomainInline, Ipv6ListInline) inlines = (DomainInline, Ipv6ListInline)
filter_horizontal = ('port_lists',) filter_horizontal = ('port_lists',)
search_fields = ('domain__name', 'mac_address', 'ipv4__ipv4', search_fields = ('domain__name', 'mac_address', 'ipv4__ipv4',
'machine__name', 'machine__user__pseudo', 'machine__name', 'machine__user__username',
'machine__user__surname') 'machine__user__surname')
# TODO(erdnaxe): we need to split alias and domain # TODO(erdnaxe): we need to split alias and domain
...@@ -105,7 +105,7 @@ class MachineAdmin(VersionAdmin): ...@@ -105,7 +105,7 @@ class MachineAdmin(VersionAdmin):
list_filter = ('active',) list_filter = ('active',)
inlines = (InterfaceInline, SshFpInline) inlines = (InterfaceInline, SshFpInline)
empty_value_display = _('- no name -') empty_value_display = _('- no name -')
search_fields = ('name', 'user__pseudo', 'user__surname') search_fields = ('name', 'user__username', 'user__surname')
@admin.register(MachineType) @admin.register(MachineType)
...@@ -158,7 +158,7 @@ class OuverturePortListAdmin(VersionAdmin): ...@@ -158,7 +158,7 @@ class OuverturePortListAdmin(VersionAdmin):
@admin.register(Role) @admin.register(Role)
class RoleAdmin(VersionAdmin): class RoleAdmin(VersionAdmin):
"""Admin view of a Role object""" """Admin view of a Role object"""
list_display = ('role_type', 'specific_role', 'servers') list_display = ('role_type', 'specific_role')
filter_horizontal = ('servers',) filter_horizontal = ('servers',)
# TODO(erdnaxe): investigate why it was buggy before switching to admin # TODO(erdnaxe): investigate why it was buggy before switching to admin
# TODO(erdnaxe): print machines on change list like in edit mode # TODO(erdnaxe): print machines on change list like in edit mode
...@@ -180,8 +180,7 @@ class ServiceLinkInline(admin.TabularInline): ...@@ -180,8 +180,7 @@ class ServiceLinkInline(admin.TabularInline):
@admin.register(Service) @admin.register(Service)
class ServiceAdmin(VersionAdmin): class ServiceAdmin(VersionAdmin):
"""Admin view of a Service object""" """Admin view of a Service object"""
list_display = ('service_type', 'min_time_regen', 'regular_time_regen', list_display = ('service_type', 'min_time_regen', 'regular_time_regen')
'servers')
inlines = (ServiceLinkInline,) inlines = (ServiceLinkInline,)
# TODO(erdnaxe): print machines on change list like in edit mode # TODO(erdnaxe): print machines on change list like in edit mode
......
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.5\n" "Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2018-06-23 16:35+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n" "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n" "Language-Team: \n"
...@@ -19,7 +19,7 @@ msgstr "" ...@@ -19,7 +19,7 @@ msgstr ""
msgid "You don't have the right to view this application." msgid "You don't have the right to view this application."
msgstr "Vous n'avez pas le droit de voir cette application." msgstr "Vous n'avez pas le droit de voir cette application."
#: machines/admin.py:104 #: machines/admin.py:107
msgid "- no name -" msgid "- no name -"
msgstr "- sans nom -" msgstr "- sans nom -"
...@@ -1032,11 +1032,11 @@ msgstr "Algorithme utilisé" ...@@ -1032,11 +1032,11 @@ msgstr "Algorithme utilisé"
msgid "Comment" msgid "Comment"
msgstr "Commentaire" msgstr "Commentaire"
#: machines/templates/machines/delete.html:29 #: machines/templates/machines/delete.html:28
msgid "Deletion of machines" msgid "Deletion of machines"
msgstr "Suppression de machines" msgstr "Suppression de machines"
#: machines/templates/machines/delete.html:35 #: machines/templates/machines/delete.html:33
#, python-format #, python-format
msgid "" msgid ""
"Warning: are you sure you want to delete this object %(objet_name)s " "Warning: are you sure you want to delete this object %(objet_name)s "
...@@ -1045,43 +1045,43 @@ msgstr "" ...@@ -1045,43 +1045,43 @@ msgstr ""
"Attention : voulez-vous vraiment supprimer cet objet %(objet_name)s " "Attention : voulez-vous vraiment supprimer cet objet %(objet_name)s "
"( %(objet)s ) ?" "( %(objet)s ) ?"
#: machines/templates/machines/delete.html:36 #: machines/templates/machines/delete.html:35
msgid "Confirm" msgid "Confirm"
msgstr "Confirmer" msgstr "Confirmer"
#: machines/templates/machines/index.html:29 #: machines/templates/machines/index.html:28
#: machines/templates/machines/index.html:32 #: machines/templates/machines/index.html:31
#: machines/templates/machines/index_alias.html:29 #: machines/templates/machines/index_alias.html:28
#: machines/templates/machines/index_iptype.html:30 #: machines/templates/machines/index_iptype.html:28
#: machines/templates/machines/index_ipv6.html:30 #: machines/templates/machines/index_ipv6.html:29
#: machines/templates/machines/index_service.html:28 #: 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/machine.html:31
#: machines/templates/machines/sidebar.html:33 #: machines/templates/machines/sidebar.html:33
msgid "Machines" msgid "Machines"
msgstr "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" msgid "List of the aliases of the interface"
msgstr "Liste des alias de l'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" msgid " Add an alias"
msgstr " Ajouter un 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" msgid " Delete one or several aliases"
msgstr " Supprimer un ou plusieurs alias" 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"