Changeset 8d83c067

Timestamp:

07/09/12 01:17:33 (11 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, lam, nlivemulti, storage

Children:

ce34009

Parents:

f642e59

git-author:

yomguy <yomguy@…> (07/09/12 01:17:33)

git-committer:

yomguy <yomguy@…> (07/09/12 01:17:33)

Message:

fix some translations for registration process

Location:

telemeta

Files:

• locale/de/LC_MESSAGES/django.mo (modified) (previous)
• locale/de/LC_MESSAGES/django.po (modified) (3 diffs)
• locale/de/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/de/LC_MESSAGES/djangojs.po (modified) (1 diff)
• locale/fr/LC_MESSAGES/django.mo (modified) (previous)
• locale/fr/LC_MESSAGES/django.po (modified) (5 diffs)
• locale/fr/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/fr/LC_MESSAGES/djangojs.po (modified) (1 diff)
• templates/telemeta/registration/password_reset_done.html (modified) (1 diff)
• templates/telemeta/registration/password_reset_email.html (modified) (2 diffs)

telemeta/locale/de/LC_MESSAGES/django.po

@@ -9 +9 @@
 "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 <EMAIL@ADDRESS>\n"
@@ -865 +865 @@
 
 #: 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 ""
@@ -1824 +1825 @@
 msgstr ""
 
-#: templates/telemeta/registration/password_reset_email.html:2
+#: 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:3
+#: 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 ""
 

telemeta/locale/de/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "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 <EMAIL@ADDRESS>\n"

telemeta/locale/fr/LC_MESSAGES/django.po

@@ -9 +9 @@
 "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 <olivier samalyse com>\n"
@@ -868 +868 @@
 
 #: 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"
@@ -1784 +1785 @@
 
 #: 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
@@ -1828 +1828 @@
 #: 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
@@ -1836 +1836 @@
 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 ""
-
-#: templates/telemeta/registration/password_reset_email.html:3
+"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:4
 #, python-format
 msgid "for your user account at %(site_name)s"
-msgstr ""
-
-#: templates/telemeta/registration/password_reset_email.html:5
+msgstr "pour votre compte utilisateur du site %(site_name)s"
+
+#: 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 ""
 

telemeta/locale/fr/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "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 <yomguy@parisson.com>\n"

telemeta/templates/telemeta/registration/password_reset_done.html

@@ -2 +2 @@
 {% load i18n %}
 
-{% block title %}<br />{% trans 'Password reset successful' %}{% endblock %}
+{% block title %}<br />{% trans "Password reset successful" %}{% endblock %}
 
 {% block content %}

telemeta/templates/telemeta/registration/password_reset_email.html

@@ -1 @@
-{% 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 %}.
@@ -9 +10 @@
 {% 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 %}