fix trans

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index e7ad8d6fa8121df5f54fc81a49ebdb4832aeb036..821c24d4bff62767e0a9fc4dd9fec29b1634a2f2 100644 (file)
Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index bd9c99a29c611a7fc872fdd4f9d57c9dc6353ce6..ff6e769716bcf398b9875239b201c2f631072ca9 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/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-07-03 18:54+0200\n"
+"POT-Creation-Date: 2012-07-08 15:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -265,7 +265,7 @@ msgid "Expiration_date"
 msgstr "Date d'expiration"
 
 #: models.py:526
-msgid "Password initialization"
+msgid "Password initialized"
 msgstr ""
 
 #: models.py:530
@@ -315,7 +315,7 @@ msgstr ""
 msgid "Sent Messages"
 msgstr "Messages"
 
-#: templates/postman/base.html:17 templates/telemeta/base.html:86
+#: templates/postman/base.html:17 templates/telemeta/base.html:88
 msgid "Archives"
 msgstr ""
 
@@ -396,7 +396,7 @@ msgstr "à un professeur"
 msgid "Send"
 msgstr ""
 
-#: templates/postman/email_user.txt:1
+#: templates/postman/email_user.txt:1 templates/postman/email_user_init.txt:1
 msgid "Hello"
 msgstr "Bonjour"
 
@@ -444,7 +444,9 @@ msgstr ""
 msgid "Thank you again for your interest in our services."
 msgstr ""
 
-#: templates/postman/email_user.txt:20 templates/postman/email_visitor.txt:16
+#: templates/postman/email_user.txt:20
+#: templates/postman/email_user_init.txt:16
+#: templates/postman/email_visitor.txt:16
 msgid "The site administrator"
 msgstr ""
 
@@ -452,18 +454,33 @@ msgstr ""
 msgid "of"
 msgstr "de"
 
-#: templates/postman/email_user.txt:22 templates/postman/email_visitor.txt:18
+#: templates/postman/email_user.txt:22
+#: templates/postman/email_user_init.txt:18
+#: templates/postman/email_visitor.txt:18
 msgid ""
 "Note: This message is issued by an automated system.\n"
 "Do not reply, this would not be taken into account."
 msgstr ""
 
+#: templates/postman/email_user_init.txt:15
+msgid "Best regards"
+msgstr ""
+
+#: templates/postman/email_user_init.txt:16
+msgid "of the"
+msgstr "du"
+
 #: templates/postman/email_user_subject.txt:1
 #: templates/postman/email_visitor_subject.txt:1
 #, python-format
 msgid "Message \"%(subject)s\" on the site %(sitename)s"
 msgstr ""
 
+#: templates/postman/email_user_subject_init.txt:1
+#, python-format
+msgid "Initialization of your e-learning account at %(organization)s"
+msgstr "Initialisation de votre compte e-learning du %(organization)s"
+
 #: templates/postman/email_visitor.txt:1
 msgid "Dear visitor,"
 msgstr ""
@@ -628,12 +645,12 @@ msgstr "Conférences en direct"
 msgid "View"
 msgstr ""
 
-#: templates/teleforma/inc/document_list.html:24
+#: templates/teleforma/inc/document_list.html:19
 #: templates/teleforma/inc/media_list.html:17
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/teleforma/inc/document_list.html:35
+#: templates/teleforma/inc/document_list.html:30
 msgid "No document"
 msgstr "Aucun document"
 
@@ -653,48 +670,48 @@ msgstr "Accueil"
 msgid "Messaging"
 msgstr "Messagerie"
 
-#: templates/telemeta/base.html:81 templates/telemeta/users.html:6
+#: templates/telemeta/base.html:82 templates/telemeta/users.html:6
 #: templates/telemeta/users.html.py:70
 msgid "Users"
 msgstr ""
 
-#: templates/telemeta/base.html:83 templates/telemeta/search_criteria.html:69
+#: templates/telemeta/base.html:90 templates/telemeta/search_criteria.html:69
 msgid "Search"
 msgstr ""
 
-#: templates/telemeta/base.html:88
+#: templates/telemeta/base.html:91
 msgid "Collections"
 msgstr ""
 
-#: templates/telemeta/base.html:89
+#: templates/telemeta/base.html:92
 msgid "Items"
 msgstr ""
 
-#: templates/telemeta/base.html:94 templates/telemeta/base.html.py:112
-msgid "Help"
+#: templates/telemeta/base.html:95
+msgid "Admin"
 msgstr ""
 
-#: templates/telemeta/base.html:99
-msgid "Admin"
+#: templates/telemeta/base.html:97 templates/telemeta/base.html.py:110
+msgid "Help"
 msgstr ""
 
-#: templates/telemeta/base.html:109
+#: templates/telemeta/base.html:107
 msgid "Profile"
 msgstr "Profil"
 
-#: templates/telemeta/base.html:111
+#: templates/telemeta/base.html:109
 msgid "Lists"
 msgstr ""
 
-#: templates/telemeta/base.html:114
+#: templates/telemeta/base.html:112
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta/base.html:156
+#: templates/telemeta/base.html:154
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta/base.html:166
+#: templates/telemeta/base.html:164
 msgid "Legal notices"
 msgstr ""
 

diff --git a/teleforma/templates/postman/email_user_init.txt b/teleforma/templates/postman/email_user_init.txt
index cbfd4f57dd30a07682dda7be0c2383d5bb72edd0..6889e7a8e96b16488767ee91c0e1e0643f176f89 100644 (file)
--- a/teleforma/templates/postman/email_user_init.txt
+++ b/teleforma/templates/postman/email_user_init.txt
@@ -13,7 +13,7 @@ Ainsi, vous composerez sur la première note de synthèse dès le samedi 21 juil
 Votre emploi du temps vous sera communiqué vers le 16 juillet.
 
 {% trans "Best regards" %},
-{% trans "The site administrator" %} {% trans "of" %} {% organization %}
+{% trans "The site administrator" %} {% trans "of the" %} {% organization %}
 
 {% blocktrans %}Note: This message is issued by an automated system.
 Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %}

diff --git a/teleforma/templates/postman/email_user_subject_init.txt b/teleforma/templates/postman/email_user_subject_init.txt
index 152eb26299347d055a1cab20f7728125c188c6b6..928d5edebf7b4bea0335ee9ecf0915c98ca8a395 100644 (file)
--- a/teleforma/templates/postman/email_user_subject_init.txt
+++ b/teleforma/templates/postman/email_user_subject_init.txt
@@ -1 +1 @@
-{% load i18n %}{% autoescape off %}{% blocktrans with site.name as sitename %}Initialization of your account for {{ organization }} on the site {{ sitename }}{% endblocktrans %}{% endautoescape %}
\ No newline at end of file
+{% load i18n %}{% autoescape off %}{% blocktrans %}Initialization of your e-learning account at {{ organization }}{% endblocktrans %}{% endautoescape %}
\ No newline at end of file