# HG changeset patch # User souliane # Date 1431794705 -7200 # Node ID 64977f537e9b69e9c46b7e9f9351a75751b7e2b0 # Parent 26353615cc2ea4ddf8788c52e14ba1e02ca1c4b5 fixes typo diff -r 26353615cc2e -r 64977f537e9b locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Sat May 16 17:28:19 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Sat May 16 18:45:05 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-16 09:49+0200\n" -"PO-Revision-Date: 2015-05-16 09:54+0100\n" +"POT-Creation-Date: 2015-05-16 18:25+0200\n" +"PO-Revision-Date: 2015-05-16 18:27+0100\n" "Last-Translator: Salut à Toi \n" "Language-Team: français \n" "Language: fr\n" @@ -18,51 +18,51 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.4\n" -#: sat_website/forms.py:87 +#: sat_website/forms.py:85 msgid "Identity" msgstr "Identité" -#: sat_website/forms.py:88 +#: sat_website/forms.py:86 msgid "Given name" msgstr "Prénom" -#: sat_website/forms.py:89 +#: sat_website/forms.py:87 msgid "Family name" msgstr "Nom de famille" -#: sat_website/forms.py:90 +#: sat_website/forms.py:88 msgid "Address, postal code, municipality" msgstr "Adresse, code postal, municipalité" -#: sat_website/forms.py:92 +#: sat_website/forms.py:90 msgid "Contacts" msgstr "Contacts" -#: sat_website/forms.py:93 +#: sat_website/forms.py:91 msgid "Email address" msgstr "Adresse courriel" -#: sat_website/forms.py:94 +#: sat_website/forms.py:92 msgid "Email address confirmation" msgstr "Adresse courriel (confirmation)" -#: sat_website/forms.py:95 +#: sat_website/forms.py:93 msgid "Jabber ID (for example your SàT login)" msgstr "Jabber ID (par exemple votre identifiant SàT)" -#: sat_website/forms.py:97 +#: sat_website/forms.py:95 msgid "Subscription" msgstr "Adhésion" -#: sat_website/forms.py:101 +#: sat_website/forms.py:99 msgid "Bank transfer" msgstr "Virement bancaire" -#: sat_website/forms.py:101 +#: sat_website/forms.py:99 msgid "Credit or debit card" msgstr "Carte de crédit ou de débit" -#: sat_website/forms.py:102 +#: sat_website/forms.py:100 msgid "" "Choose \"Bank transfer\" to proceed manually with the association's IBAN/BIC " "numbers. Choose \"Credit or debit card\" to pay via CB, Visa or Mastercard " @@ -74,74 +74,80 @@ "payer par CB, Visa ou Mastercard en utilisant un service bancaire sécurisé. " "Dans tous les cas, nous vous enverrons d'abord un courriel avec les détails." -#: sat_website/forms.py:104 sat_website/forms.py:105 +#: sat_website/forms.py:102 sat_website/forms.py:103 msgid "Reference" msgstr "Référence" -#: sat_website/forms.py:105 +#: sat_website/forms.py:103 msgid "Adherent number in case of a renewal" msgstr "Numéro d'adhérent en cas de renouvellement" -#: sat_website/forms.py:107 sat_website/forms.py:108 +#: sat_website/forms.py:105 sat_website/forms.py:106 msgid "Comment" msgstr "Commentaire" -#: sat_website/forms.py:110 +#: sat_website/forms.py:108 msgid "I would like to receive the newsletter." msgstr "Je souhaite recevoir la lettre d'information." -#: sat_website/forms.py:115 +#: sat_website/forms.py:113 msgid "I read the " msgstr "J'ai lu les " -#: sat_website/forms.py:116 +#: sat_website/forms.py:114 msgid "Statutes" msgstr "Statuts" -#: sat_website/forms.py:117 +#: sat_website/forms.py:115 msgid " and " msgstr " et " -#: sat_website/forms.py:118 +#: sat_website/forms.py:116 msgid "Rules" msgstr " Règlement intérieur" -#: sat_website/forms.py:119 +#: sat_website/forms.py:117 msgid " of the association, and agree to both of them." msgstr " de l'association, et les accepte tous deux." -#: sat_website/forms.py:143 +#: sat_website/forms.py:141 msgid "Passwords don't match." msgstr "Les mots de passe ne correspondent pas." -#: sat_website/forms.py:168 +#: sat_website/forms.py:166 msgid "yes" msgstr "oui" -#: sat_website/forms.py:168 +#: sat_website/forms.py:166 msgid "no" msgstr "non" -#: sat_website/forms.py:180 +#: sat_website/forms.py:178 msgid "Language" msgstr "Langue" -#: sat_website/forms.py:216 +#: sat_website/forms.py:214 #, python-brace-format +#| msgid "" +#| "Tank you, {name}!\n" +#| " \n" +#| "We received your submission and we are happy to count you in the members " +#| "of the association.\n" +#| "\n" msgid "" -"Tank you, {name}!\n" -" \n" +"Thank you, {name}!\n" +"\n" "We received your submission and we are happy to count you in the members of " "the association.\n" "\n" msgstr "" "Merci, {name}!\n" -" \n" +"\n" "Nous avons reçu votre demande et nous sommes heureux de vous compter parmi " "les membres de l'association.\n" "\n" -#: sat_website/forms.py:221 +#: sat_website/forms.py:219 #, python-brace-format msgid "" "You chose to support Salut à Toi with a subscription of {amount} euros. " @@ -171,7 +177,7 @@ "https://www.apayer.fr/salut-a-toi\n" "\n" -#: sat_website/forms.py:233 +#: sat_website/forms.py:231 #, python-brace-format msgid "" "Below a copy of the information we received:\n" @@ -192,7 +198,7 @@ "Association Salut à Toi\n" "http://salut-a-toi.org" -#: sat_website/forms.py:253 +#: sat_website/forms.py:251 #, python-brace-format msgid "" "New subscription received!\n" @@ -209,7 +215,7 @@ "Un courriel a été automatiquement envoyé à {name}, aucune action n'est " "requise de votre part." -#: sat_website/forms.py:272 sat_website/forms.py:274 +#: sat_website/forms.py:270 sat_website/forms.py:272 msgid "Subscription to Salut à Toi" msgstr "Adhésion à Salut à Toi" @@ -1934,7 +1940,6 @@ "Salut-%%C3%%A0-Toi-%%21\" target=\"#\">Serveur IMAP" #: templates/sat_website/specifications_exp.html:54 -#| msgid "Create an Imap server that you can use to read your \\" msgid "" "Create an Imap server that you can use to read your \"normal\" type messages" msgstr "" @@ -2006,7 +2011,6 @@ msgstr "Serveur SMTP" #: templates/sat_website/specifications_exp.html:78 -#| msgid "Create a SMTP server that you can use to send your \\" msgid "" "Create a SMTP server that you can use to send your \"normal\" type messages" msgstr "" diff -r 26353615cc2e -r 64977f537e9b sat_website/forms.py --- a/sat_website/forms.py Sat May 16 17:28:19 2015 +0200 +++ b/sat_website/forms.py Sat May 16 18:45:05 2015 +0200 @@ -211,7 +211,7 @@ 'result': self.result_as_string(True) } - HEADER = ugettext(u"""Tank you, {name}! + HEADER = ugettext(u"""Thank you, {name}! We received your submission and we are happy to count you in the members of the association. diff -r 26353615cc2e -r 64977f537e9b sat_website/local_settings.py --- a/sat_website/local_settings.py Sat May 16 17:28:19 2015 +0200 +++ b/sat_website/local_settings.py Sat May 16 18:45:05 2015 +0200 @@ -33,7 +33,7 @@ # EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' FORM_FROM_EMAIL = 'no-reply@example.net' -FORM_TO_EMAIL = ['email@example.net'] +FORM_TO_EMAILS = ['email@example.net'] # Application definition