From 097a7e32adf43be06f0fc8c05e220c3c11b77413 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 24 Aug 2016 17:20:57 +0200 Subject: [PATCH] Fix some english typos and update french translation --- cas_server/locale/fr/LC_MESSAGES/django.mo | Bin 9460 -> 10143 bytes cas_server/locale/fr/LC_MESSAGES/django.po | 169 +++++++++--------- .../management/commands/cas_clean_tickets.py | 2 +- cas_server/models.py | 2 +- cas_server/views.py | 8 +- 5 files changed, 93 insertions(+), 88 deletions(-) diff --git a/cas_server/locale/fr/LC_MESSAGES/django.mo b/cas_server/locale/fr/LC_MESSAGES/django.mo index d0f80edbb5787b491eb6c002ad9d48a14579dcbb..603a6db75044837325395944d89391c04108e251 100644 GIT binary patch delta 2486 zcmZA1TWl0n7{Kwfg>sQwEiEm#a%h24C@nVup_W?_K?o7T%}Bzqd%6q`Gt0~@w`kTV z52!?lBl;jp35i+~<+30c6E$oI4?^Mtkq6@~5+O^gU%trSWD@4z#_!l$wOE<25{shw)Hvr4C?QAEn;J%Qytr z_f_g`%-|{P@t9IG@pEj)TO}v;Q)-4%IpuIt#ScfZ4$q-XbQOon1Nb=h>0i7)3>z6w z!C|-_<+%{$1tOIDPvAs6j~nn7K84E$C^ZV-z;f1C$2j4o)Cp|Ev-l+5DUDkOD%HyP zMdXrtA17fq%EDJs7QTnF@xgOX?tUtNH->Q^z^TI_ELBh?9$) zY{UVB2{XDV5AG<9b0`b%EnR;Lr!#&RW#VsQ8LaU96F1J5vCRio5L*teFj;|Y{dKTm-i$8C5EM^g|TSTS6w z=WsPHz>jeb{((HI#*wdjoI8T}kLF|(7n*SoN>QCe)>M~Jisl-Q#Ci^GI1golmr?HP z!i9JaZTt(@VJ8JL4!=f8&F@J1)opwlRgO}W2^V7$_n_qT2FgaNbg@`kQ6@4d)xQsA z}R(Ui7R*rYZ{c|!&14^oXCRT;99(i8au|21~j-C zeVmRzplqySY%!M;aW>=WrLl(+k)0@??*Z(A$M9MF442}4Wd595#A}svVI@j&tSgNz zlntbDE`~@@)M?~PQ&&)m^f#0Z{8<{0BRo=+EhXone9kLTBD4<)j4Gqc`theQlhb*0 znW%$4pDv3rr+S7?-NgBloy)f`)htmX&2gJnQi@F8_Cb@JH__#LpHjN`6v~UmjrG-3 z`T)A7&!9__oi2&biU-mbhhIi~RdGb*d>LInB|e;oZ5C(pb&RKz&A8yCMkFnh>GHop zYHk5N*Umwjd=?|3^<&3xx16kL3hK2TXx9t1rMY6Kv~SW`$MUt=nej~!*q)o; z*lR<1{;Pg>%Z75B<9Itvszt3b{&qWQ^w{|E=+eN~q9eWPayso>ZW!oYURGPlBs1vH z(_6hD)Ly6dvcBG7HU)NQ0=;RMwzA=7U2G2=Ikl6qAv#PhlBjDg9jyQ{u?p3(eOGME6~~KWbLs2 zao~(<+dQp(VRU53xT>V*x+WPGy2qO)-ZA4BJ_({%Y8uPiHum$FcU1PGg zmrP8n(>(8at3mP^pLdv<)6Z$gVzm_GE4w&SdH+A_NdbET_WsV}A= zVu8`g&DOSTaYZdB@%Fjsrg<0cl0};JmTa&s+sG~`vEp4a{r~eyIsH4sBLTI|?iLl@ t9kow__^Mu8O$5?~Znx0wTaM0#wqpl{?))!$ri3|P+wds?jxLO8{Rf&3wvhk; delta 1869 zcmYk+Z%kEn9LMqRfeV^f!^=fLKsbto8S%$|2nvcAiNyLtW{Wk&>m6Q4m*RphR^5p` zDJosZGUpbn2W6WY{?)U5`V!-Ji5@V7<2D1dmYPg z1}|VU?q6iqj&B8ihnrXzhs}!2($>qQk_`t?Cpw19bpRIPOtAe+tY!T@mSJdd_P8q4 zjkjY2`|%!p3ZKL?*oL>U3O6n>%fmgG&-JaJ$yPQTz!sbe*4MCsb@82MOsxy=#Ya&$ zJb}9KJE$AKj0HG{x{;r;4{zf}>|y5)Jcfty3k-36YglUL;s)%%JxFToH0n;zV=vC2 zo=j)g{yHSf)`9idgH*-Fkw2T@M;SbYs^Fah!|y!KCH!fb z*?V|~e13r2OR}l`4KK2GO3iNIH15PH8s%ZUj!Nw&8eet5nO@OsGhirIzgC1>;LMp6T2{hFXQ7lk9T1&2dgBbs9tyhyYMyK zigOslLK;XnawN@!hqiZ7P4Y47L^n{~zN{*H=WR&&Z6A_ldm5j?-UHG37G z$1sL@Y+a}X_hKiq%g&-ok^Y3qAtqN)HD1T#k|i5N)oub?aWYtch04S?sMqvY%tfc# zY&YfwK7_i!SyV5bL!Iwpu>L5!KW(2f*~X5qk%zEFtIc?0Y%QuOTTnO95v-p>HQ|ea zZ{lXw=TMpX5gp7Wnh1>$v6IjZDcdTEMy=j|4W(Se&HQG6)IiF}8bVK?r&CJxEucD? zr-4jo%SJ*sprJ3^7J_oyc0%6`y`t?z8=)TQBpQP2GtCaYpH#wlLo(UOZlx^2L_Kgn zLBAQjnQ1bWLnYfmXzU`IGc&#s*g@z6rJ+nJdn7y4kZGkZpXet3KU7=2<0^p~=x(Bi zXd!Y4m8gc$Amf=qE7#t&L6IT#@_V!vDLd!11O_tG&9?2`^Mq=?wU*OXhQ&0k5p=PiM@Jl)vrx(-o(4 zIODFW*=TQkB$jXw#@$rhjSVN0@z|(e=XN;W$yJjaw4!?Ng0a!WP$CugU#f2AJpSi3 S7aZ?IWyHHy5%ylGjs63$n9-jA diff --git a/cas_server/locale/fr/LC_MESSAGES/django.po b/cas_server/locale/fr/LC_MESSAGES/django.po index bdcc3a7..644f814 100644 --- a/cas_server/locale/fr/LC_MESSAGES/django.po +++ b/cas_server/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: cas_server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-01 12:01+0200\n" -"PO-Revision-Date: 2016-08-01 12:01+0200\n" +"POT-Creation-Date: 2016-08-24 17:18+0200\n" +"PO-Revision-Date: 2016-08-24 17:18+0200\n" "Last-Translator: Valentin Samir \n" "Language-Team: django \n" "Language: fr\n" @@ -18,8 +18,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.8\n" -#: apps.py:25 templates/cas_server/base.html:9 -#: templates/cas_server/base.html:27 +#: apps.py:25 templates/cas_server/base.html:7 +#: templates/cas_server/base.html:26 msgid "Central Authentication Service" msgstr "Service Central d'Authentification" @@ -27,61 +27,61 @@ msgstr "Service Central d'Authentification" msgid "Identity provider" msgstr "fournisseur d'identité" -#: forms.py:92 forms.py:111 +#: forms.py:88 forms.py:107 msgid "Warn me before logging me into other sites." msgstr "Prévenez-moi avant d'accéder à d'autres services." -#: forms.py:96 +#: forms.py:92 msgid "Remember the identity provider" msgstr "Se souvenir du fournisseur d'identité" -#: forms.py:106 models.py:600 +#: forms.py:102 models.py:594 msgid "username" msgstr "nom d'utilisateur" -#: forms.py:108 +#: forms.py:104 msgid "password" msgstr "mot de passe" -#: forms.py:130 +#: forms.py:126 msgid "The credentials you provided cannot be determined to be authentic." msgstr "Les informations transmises n'ont pas permis de vous authentifier." -#: forms.py:182 +#: forms.py:178 msgid "User not found in the temporary database, please try to reconnect" msgstr "" "Utilisateur non trouvé dans la base de donnée temporaire, essayez de vous " "reconnecter" -#: forms.py:196 +#: forms.py:192 msgid "service" msgstr "service" #: management/commands/cas_clean_federate.py:20 msgid "Clean old federated users" -msgstr "Nettoyer les anciens utilisateurs fédéré" +msgstr "Nettoyer les anciens utilisateurs fédérés" #: management/commands/cas_clean_sessions.py:22 msgid "Clean deleted sessions" msgstr "Nettoyer les sessions supprimées" #: management/commands/cas_clean_tickets.py:22 -msgid "Clean old trickets" +msgid "Clean old tickets" msgstr "Nettoyer les vieux tickets" -#: models.py:46 +#: models.py:71 msgid "identity provider" msgstr "fournisseur d'identité" -#: models.py:47 +#: models.py:72 msgid "identity providers" msgstr "fournisseurs d'identités" -#: models.py:53 +#: models.py:78 msgid "suffix" msgstr "suffixe" -#: models.py:55 +#: models.py:80 msgid "" "Suffix append to backend CAS returned username: ``returned_username`` @ " "``suffix``." @@ -89,46 +89,46 @@ msgstr "" "Suffixe ajouté au nom d'utilisateur retourné par le CAS du fournisseur " "d'identité : `nom retourné`@`suffixe`." -#: models.py:62 +#: models.py:87 msgid "server url" msgstr "url du serveur" -#: models.py:72 +#: models.py:97 msgid "CAS protocol version" msgstr "Version du protocole CAS" -#: models.py:74 +#: models.py:99 msgid "" "Version of the CAS protocol to use when sending requests the the backend CAS." msgstr "" "Version du protocole CAS à utiliser lorsque l'on envoie des requête au CAS " "du fournisseur d'identité." -#: models.py:81 +#: models.py:106 msgid "verbose name" msgstr "Nom du fournisseur" -#: models.py:82 +#: models.py:107 msgid "Name for this identity provider displayed on the login page." msgstr "Nom affiché pour ce fournisseur d'identité sur la page de connexion." -#: models.py:88 models.py:446 +#: models.py:113 models.py:446 msgid "position" msgstr "position" -#: models.py:102 +#: models.py:127 msgid "display" msgstr "afficher" -#: models.py:103 +#: models.py:128 msgid "Display the provider on the login page." msgstr "Afficher le fournisseur d'identité sur la page de connexion." -#: models.py:233 +#: models.py:245 msgid "User" msgstr "Utilisateur" -#: models.py:234 +#: models.py:246 msgid "Users" msgstr "Utilisateurs" @@ -149,7 +149,7 @@ msgstr "Motifs de services" msgid "service patterns are sorted using the position attribute" msgstr "Les motifs de service sont trié selon l'attribut position" -#: models.py:455 models.py:626 +#: models.py:455 models.py:620 msgid "name" msgstr "nom" @@ -157,7 +157,7 @@ msgstr "nom" msgid "A name for the service" msgstr "Un nom pour le service" -#: models.py:464 models.py:669 models.py:698 +#: models.py:464 models.py:663 models.py:693 msgid "pattern" msgstr "motif" @@ -172,108 +172,108 @@ msgstr "" "expression rationnelle, les caractères spéciaux doivent être échappés avec " "un '\\'." -#: models.py:476 +#: models.py:477 msgid "user field" msgstr "champ utilisateur" -#: models.py:477 +#: models.py:478 msgid "Name of the attribute to transmit as username, empty = login" msgstr "" "Nom de l'attribut devant être transmis comme nom d'utilisateur au service. " "vide = nom de connexion" -#: models.py:482 +#: models.py:483 msgid "restrict username" msgstr "limiter les noms d'utilisateurs" -#: models.py:483 +#: models.py:484 msgid "Limit username allowed to connect to the list provided bellow" msgstr "" "Limiter les noms d'utilisateurs autorisé à se connecter à la liste fournie " "ci-dessous" -#: models.py:488 +#: models.py:489 msgid "proxy" msgstr "proxy" -#: models.py:489 +#: models.py:490 msgid "Proxy tickets can be delivered to the service" msgstr "des proxy tickets peuvent être délivrés au service" -#: models.py:495 +#: models.py:496 msgid "proxy callback" msgstr "" -#: models.py:496 +#: models.py:497 msgid "can be used as a proxy callback to deliver PGT" msgstr "peut être utilisé comme un callback pour recevoir un PGT" -#: models.py:503 +#: models.py:504 msgid "single log out" msgstr "" -#: models.py:504 +#: models.py:505 msgid "Enable SLO for the service" msgstr "Active le SLO pour le service" -#: models.py:512 +#: models.py:513 msgid "single log out callback" msgstr "" -#: models.py:513 +#: models.py:514 msgid "" "URL where the SLO request will be POST. empty = service url\n" "This is usefull for non HTTP proxied services." msgstr "" -"URL a laquelle la requête de déconnexion sera postée. vide = l'url du " +"URL à laquelle la requête de déconnexion sera postée. vide = l'url du " "service\n" -"Ceci n'est utilise que pour des services non HTTP proxifiés" +"Ceci n'est en général utilisé que pour des services non HTTP proxifiés" -#: models.py:601 +#: models.py:595 msgid "username allowed to connect to the service" -msgstr "noms d'utilisateurs autorisé à se connecter au service" +msgstr "noms d'utilisateurs autorisés à se connecter au service" -#: models.py:627 +#: models.py:621 msgid "name of an attribute to send to the service, use * for all attributes" msgstr "" -"nom d'un attribut a envoyer au service, utiliser * pour tous les attributs" +"nom d'un attribut à envoyer au service, utiliser * pour tous les attributs" -#: models.py:634 models.py:705 +#: models.py:628 models.py:701 msgid "replace" msgstr "remplacement" -#: models.py:635 +#: models.py:629 msgid "" -"name under which the attribute will be showto the service. empty = default " +"name under which the attribute will be show to the service. empty = default " "name of the attribut" msgstr "" "nom sous lequel l'attribut sera rendu visible au service. vide = inchangé" -#: models.py:662 models.py:692 +#: models.py:656 models.py:687 msgid "attribute" msgstr "attribut" -#: models.py:663 +#: models.py:657 msgid "Name of the attribute which must verify pattern" msgstr "Nom de l'attribut devant vérifier un motif" -#: models.py:670 +#: models.py:664 msgid "a regular expression" msgstr "une expression régulière" -#: models.py:693 +#: models.py:688 msgid "Name of the attribute for which the value must be replace" -msgstr "nom de l'attribut pour lequel la valeur doit être remplacé" +msgstr "Nom de l'attribut pour lequel la valeur doit être remplacé" -#: models.py:699 +#: models.py:694 msgid "An regular expression maching whats need to be replaced" -msgstr "une expression régulière reconnaissant ce qui doit être remplacé" +msgstr "Une expression régulière reconnaissant ce qui doit être remplacé" -#: models.py:706 +#: models.py:702 msgid "replace expression, groups are capture by \\1, \\2 …" msgstr "expression de remplacement, les groupe sont capturé par \\1, \\2" -#: templates/cas_server/base.html:38 +#: templates/cas_server/base.html:43 #, python-format msgid "" "A new version of the application is available. This instance runs " @@ -282,7 +282,7 @@ msgid "" msgstr "" "Une nouvelle version de l'application est disponible. Cette instance utilise " "la version %(VERSION)s et la dernière version est %(LAST_VERSION)s. Merci de " -"vous mettre a jour." +"vous mettre à jour." #: templates/cas_server/logged.html:4 msgid "" @@ -291,10 +291,10 @@ msgid "" "your web browser when you are done accessing services that require " "authentication!" msgstr "" -"

Déconnexion réussie

Vous vous êtes déconnecté(e) du Service Central " -"d'Authentification. Pour des raisons de sécurité, veuillez fermer votre " -"navigateur après avoir fini d'accéder a des services demandant une " -"authentification !" +"

Connexion réussie

Vous vous êtes connecté(e) auprès du Service " +"Central d'Authentification.
Pour des raisons de sécurité, veuillez vous " +"déconnecter et fermer votre navigateur après avoir fini d'accéder à des " +"services demandant une authentification !" #: templates/cas_server/logged.html:8 msgid "Log me out from all my sessions" @@ -310,7 +310,7 @@ msgstr "Se déconnecter" #: templates/cas_server/login.html:6 msgid "Please log in" -msgstr "Merci de se connecter" +msgstr "Veuillez vous authentifier" #: templates/cas_server/login.html:14 msgid "Login" @@ -320,7 +320,12 @@ msgstr "Connexion" msgid "Connect to the service" msgstr "Se connecter au service" -#: views.py:168 +#: utils.py:736 +#, python-format +msgid "\"%(value)s\" is not a valid regular expression" +msgstr "\"%(value)s\" n'est pas une expression rationnelle valide" + +#: views.py:185 msgid "" "

Logout successful

You have successfully logged out from the Central " "Authentication Service. For security reasons, exit your web browser." @@ -329,7 +334,7 @@ msgstr "" "d'Authentification. Pour des raisons de sécurité, veuillez fermer votre " "navigateur." -#: views.py:174 +#: views.py:191 #, python-format msgid "" "

Logout successful

You have successfully logged out from %s sessions " @@ -340,7 +345,7 @@ msgstr "" "Service Central d'Authentification. Pour des raisons de sécurité, veuillez " "fermer votre navigateur." -#: views.py:181 +#: views.py:198 msgid "" "

Logout successful

You were already logged out from the Central " "Authentication Service. For security reasons, exit your web browser." @@ -349,7 +354,7 @@ msgstr "" "d'Authentification. Pour des raisons de sécurité, veuillez fermer votre " "navigateur." -#: views.py:361 +#: views.py:378 #, python-format msgid "" "Invalid response from your identity provider CAS upon ticket %(ticket)s " @@ -358,48 +363,48 @@ msgstr "" "Réponse invalide du CAS du fournisseur d'identité lors de la validation du " "ticket %(ticket)s: %(error)r" -#: views.py:483 +#: views.py:500 msgid "Invalid login ticket, please retry to login" msgstr "Ticket de connexion invalide, merci de réessayé de vous connecter" -#: views.py:675 +#: views.py:692 #, python-format msgid "Authentication has been required by service %(name)s (%(url)s)" msgstr "" "Une demande d'authentification a été émise pour le service %(name)s " "(%(url)s)." -#: views.py:713 +#: views.py:730 #, python-format -msgid "Service %(url)s non allowed." +msgid "Service %(url)s not allowed." msgstr "le service %(url)s n'est pas autorisé." -#: views.py:720 -msgid "Username non allowed" +#: views.py:737 +msgid "Username not allowed" msgstr "Nom d'utilisateur non authorisé" -#: views.py:727 -msgid "User characteristics non allowed" +#: views.py:744 +msgid "User characteristics not allowed" msgstr "Caractéristique utilisateur non autorisée" -#: views.py:734 +#: views.py:751 #, python-format msgid "The attribute %(field)s is needed to use that service" msgstr "L'attribut %(field)s est nécessaire pour se connecter à ce service" -#: views.py:824 +#: views.py:841 #, python-format msgid "Authentication renewal required by service %(name)s (%(url)s)." msgstr "Demande de réauthentification pour le service %(name)s (%(url)s)." -#: views.py:831 +#: views.py:848 #, python-format msgid "Authentication required by service %(name)s (%(url)s)." msgstr "Authentification requise par le service %(name)s (%(url)s)." -#: views.py:838 +#: views.py:855 #, python-format -msgid "Service %s non allowed" +msgid "Service %s not allowed" msgstr "Le service %s n'est pas autorisé" #~ msgid "Logged" diff --git a/cas_server/management/commands/cas_clean_tickets.py b/cas_server/management/commands/cas_clean_tickets.py index 87d802e..3111016 100644 --- a/cas_server/management/commands/cas_clean_tickets.py +++ b/cas_server/management/commands/cas_clean_tickets.py @@ -19,7 +19,7 @@ from ... import models class Command(BaseCommand): """Clean old trickets""" args = '' - help = _(u"Clean old trickets") + help = _(u"Clean old tickets") def handle(self, *args, **options): models.User.clean_old_entries() diff --git a/cas_server/models.py b/cas_server/models.py index 02b705e..d13f553 100644 --- a/cas_server/models.py +++ b/cas_server/models.py @@ -626,7 +626,7 @@ class ReplaceAttributName(models.Model): max_length=255, blank=True, verbose_name=_(u"replace"), - help_text=_(u"name under which the attribute will be show" + help_text=_(u"name under which the attribute will be show " u"to the service. empty = default name of the attribut") ) #: ForeignKey to a :class:`ServicePattern`. :class:`ReplaceAttributName` instances for a diff --git a/cas_server/views.py b/cas_server/views.py index f9be770..c2b18b4 100644 --- a/cas_server/views.py +++ b/cas_server/views.py @@ -727,21 +727,21 @@ class LoginView(View, LogoutMixin): messages.add_message( self.request, messages.ERROR, - _(u'Service %(url)s non allowed.') % {'url': self.service} + _(u'Service %(url)s not allowed.') % {'url': self.service} ) except models.BadUsername: error = 2 messages.add_message( self.request, messages.ERROR, - _(u"Username non allowed") + _(u"Username not allowed") ) except models.BadFilter: error = 3 messages.add_message( self.request, messages.ERROR, - _(u"User characteristics non allowed") + _(u"User characteristics not allowed") ) except models.UserFieldNotDefined: error = 4 @@ -852,7 +852,7 @@ class LoginView(View, LogoutMixin): messages.add_message( self.request, messages.ERROR, - _(u'Service %s non allowed') % self.service + _(u'Service %s not allowed') % self.service ) if self.ajax: data = {