From: yomguy Date: Sun, 8 Jul 2012 23:17:33 +0000 (+0200) Subject: fix some translations for registration process X-Git-Tag: registration^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8d83c06762c4208f822c1b5ed9482aea3f75f137;p=telemeta.git fix some translations for registration process --- diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 32da2ab7..9fc60343 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index 45b659fe..e4f57c6e 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-30 13:14+0200\n" +"POT-Creation-Date: 2012-07-09 01:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -864,6 +864,7 @@ msgid "Thank you again for your interest in our services." msgstr "" #: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:16 +#: templates/telemeta/registration/password_reset_email.html:13 msgid "The site administrator" msgstr "" @@ -1823,30 +1824,33 @@ msgid "" "address you submitted. You should be receiving it shortly." msgstr "" -#: templates/telemeta/registration/password_reset_email.html:2 -msgid "You're receiving this e-mail because you requested a password reset" +#: templates/telemeta/registration/password_reset_email.html:1 +msgid "Hello" msgstr "" #: templates/telemeta/registration/password_reset_email.html:3 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "" + +#: templates/telemeta/registration/password_reset_email.html:4 #, python-format msgid "for your user account at %(site_name)s" msgstr "" -#: templates/telemeta/registration/password_reset_email.html:5 +#: templates/telemeta/registration/password_reset_email.html:6 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/telemeta/registration/password_reset_email.html:9 +#: templates/telemeta/registration/password_reset_email.html:10 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/telemeta/registration/password_reset_email.html:11 -msgid "Thanks for using our site!" +#: templates/telemeta/registration/password_reset_email.html:12 +msgid "Best regards" msgstr "" #: templates/telemeta/registration/password_reset_email.html:13 -#, python-format -msgid "The %(site_name)s team" +msgid "of the" msgstr "" #: templates/telemeta/registration/password_reset_form.html:7 diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo index 32da2ab7..9fc60343 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po index dafcf43b..aec26575 100644 --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-30 13:14+0200\n" +"POT-Creation-Date: 2012-07-09 01:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index f160bb36..93481cc7 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index c0669f4f..22fec71c 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-30 13:14+0200\n" +"POT-Creation-Date: 2012-07-09 01:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -867,6 +867,7 @@ msgid "Thank you again for your interest in our services." msgstr "" #: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:16 +#: templates/telemeta/registration/password_reset_email.html:13 msgid "The site administrator" msgstr "L'administrateur du site" @@ -1783,9 +1784,8 @@ msgid "Change my password" msgstr "" #: templates/telemeta/registration/password_reset_complete.html:4 -#, fuzzy msgid "Password reset complete" -msgstr "Mise à jour du mot de passe effectuée" +msgstr "Demande de mise à jour du mot de passe envoyée" #: templates/telemeta/registration/password_reset_complete.html:7 msgid "Your password has been set. You may go ahead and log in now." @@ -1827,7 +1827,7 @@ msgstr "" #: templates/telemeta/registration/password_reset_done.html:4 msgid "Password reset successful" -msgstr "" +msgstr "Demande de réinitialisation de mot de passe envoyée" #: templates/telemeta/registration/password_reset_done.html:7 msgid "" @@ -1835,30 +1835,35 @@ msgid "" "address you submitted. You should be receiving it shortly." msgstr "" -#: templates/telemeta/registration/password_reset_email.html:2 +#: templates/telemeta/registration/password_reset_email.html:1 +msgid "Hello" +msgstr "Bonjour" + +#: templates/telemeta/registration/password_reset_email.html:3 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" +"Vous recevez cet e-mail car vous avez demandé une demande de " +"réinitialisation de mot de passe" -#: templates/telemeta/registration/password_reset_email.html:3 +#: templates/telemeta/registration/password_reset_email.html:4 #, python-format msgid "for your user account at %(site_name)s" -msgstr "" +msgstr "pour votre compte utilisateur du site %(site_name)s" -#: templates/telemeta/registration/password_reset_email.html:5 +#: templates/telemeta/registration/password_reset_email.html:6 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/telemeta/registration/password_reset_email.html:9 +#: templates/telemeta/registration/password_reset_email.html:10 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/telemeta/registration/password_reset_email.html:11 -msgid "Thanks for using our site!" +#: templates/telemeta/registration/password_reset_email.html:12 +msgid "Best regards" msgstr "" #: templates/telemeta/registration/password_reset_email.html:13 -#, python-format -msgid "The %(site_name)s team" +msgid "of the" msgstr "" #: templates/telemeta/registration/password_reset_form.html:7 diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index bf658256..f443c3bc 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po index 9bd2b368..8119964f 100644 --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-30 13:14+0200\n" +"POT-Creation-Date: 2012-07-09 01:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/templates/telemeta/registration/password_reset_done.html b/telemeta/templates/telemeta/registration/password_reset_done.html index 88a57c46..91ea6a9a 100644 --- a/telemeta/templates/telemeta/registration/password_reset_done.html +++ b/telemeta/templates/telemeta/registration/password_reset_done.html @@ -1,7 +1,7 @@ {% extends "telemeta/base.html" %} {% load i18n %} -{% block title %}
{% trans 'Password reset successful' %}{% endblock %} +{% block title %}
{% trans "Password reset successful" %}{% endblock %} {% block content %}

{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}

diff --git a/telemeta/templates/telemeta/registration/password_reset_email.html b/telemeta/templates/telemeta/registration/password_reset_email.html index 3b786ac4..f97d2768 100644 --- a/telemeta/templates/telemeta/registration/password_reset_email.html +++ b/telemeta/templates/telemeta/registration/password_reset_email.html @@ -1,4 +1,5 @@ -{% load i18n %}{% autoescape off %} +{% load telemeta_utils %}{% load i18n %}{% autoescape off %}{% trans "Hello" %}, + {% trans "You're receiving this e-mail because you requested a password reset" %} {% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. @@ -8,8 +9,7 @@ {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.username }} -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} +{% trans "Best regards" %}, +{% trans "The site administrator" %} {% trans "of the" %} {% organization %} {% endautoescape %}