From: yomguy Date: Thu, 12 Apr 2012 09:25:15 +0000 (+0200) Subject: fix trans X-Git-Tag: 0.2~62 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9815036b4d0f904ba879ee85101ddf90ac3f87a0;p=teleforma.git fix trans --- diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css index 2cb119c6..fa9cb622 100644 --- a/teleforma/htdocs/css/teleforma_black.css +++ b/teleforma/htdocs/css/teleforma_black.css @@ -1152,7 +1152,7 @@ a.image-link { #action_red { - background-color: #dd4b39; + background-color: #d24836; color: #FFF; padding:0.8em 0.8em 0.8em 0.8em; } diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 7be6279c..2764dc28 100644 --- 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-04-11 10:01+0200\n" +"POT-Creation-Date: 2012-04-12 11:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -246,7 +246,7 @@ msgstr "" msgid "Trash" msgstr "" -#: templates/postman/base.html:23 +#: templates/postman/base.html:23 templates/telemeta/users.html:29 msgid "New message" msgstr "Nouveau message" @@ -344,20 +344,28 @@ msgstr "" msgid "You have received a message from the user '%(sender)s'." msgstr "" -#: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:14 +#: templates/postman/email_user.txt:15 +msgid "" +"You can read and respond to this message from your e-learning desk following " +"this link:" +msgstr "" +"Vous pouvez lire et répondre à ce message depuis votre bureau e-learning en " +"suivant ce lien :" + +#: templates/postman/email_user.txt:18 templates/postman/email_visitor.txt:14 msgid "Thank you again for your interest in our services." msgstr "" -#: templates/postman/email_user.txt:18 templates/postman/email_visitor.txt:16 +#: templates/postman/email_user.txt:19 templates/postman/email_visitor.txt:16 msgid "The site administrator" msgstr "" -#: templates/postman/email_user.txt:18 +#: templates/postman/email_user.txt:19 #: templates/telemeta/inc/user_list.html:10 msgid "of" msgstr "de" -#: templates/postman/email_user.txt:20 templates/postman/email_visitor.txt:18 +#: templates/postman/email_user.txt:21 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." @@ -525,8 +533,8 @@ msgstr "" msgid "Messages" msgstr "Messages" -#: templates/telemeta/base.html:74 templates/telemeta/users.html:5 -#: templates/telemeta/users.html.py:35 +#: templates/telemeta/base.html:74 templates/telemeta/users.html:6 +#: templates/telemeta/users.html.py:43 msgid "Users" msgstr "" @@ -593,15 +601,15 @@ msgstr "" msgid "Legal notices" msgstr "" -#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:42 -msgid "Musical selection" +#: templates/telemeta/home.html:26 +msgid "Connexion" msgstr "" -#: templates/telemeta/users.html:14 +#: templates/telemeta/users.html:15 msgid "Trainings" msgstr "Formations" -#: templates/telemeta/users.html:39 +#: templates/telemeta/users.html:48 #, fuzzy msgid "No users" msgstr "Pas d'utilisateurs" diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html index aea8d356..93d06e4d 100644 --- a/teleforma/templates/postman/base.html +++ b/teleforma/templates/postman/base.html @@ -20,7 +20,7 @@
-{% trans "New message" %} +{% trans "New message" %}
diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt index c9da23b0..46bb1cae 100644 --- a/teleforma/templates/postman/email_user.txt +++ b/teleforma/templates/postman/email_user.txt @@ -11,9 +11,10 @@ {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from the user '{{ sender }}'.{% endblocktrans %} {% endif %} {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender }}'.{% endblocktrans %} -{% endif %}{% endif %}{# 'acceptance' #}{% trans "You can read and respond to this message from your online desk" %}: +{% endif %}{% endif %} +{% trans "You can read and respond to this message from your e-learning desk following this link:" %} http://{{ site.name }}/messages/inbox/ - +{# 'acceptance' #} {% trans "Thank you again for your interest in our services." %} {% trans "The site administrator" %} {% trans "of" %} {% organization %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index 5909bd14..076ff5eb 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -60,23 +60,23 @@ alt="Telemeta Powered"/>--> {% if user.is_authenticated %} -
  • {% trans "Desk" %} +
  • {% trans "Desk" %}
    • {% else %} -
  • {% trans "Home" %}
    • -
  • {% trans "Sign in" %}
    • +
  • {% trans "Home" %}
    • +
  • {% trans "Sign in" %}
    • {% endif %} {% if user.is_authenticated %} -
  • {% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}
    • +
  • {% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}
    • -
  • {% trans "Users" %}
    • +
  • {% trans "Users" %}
    • -
  • {% trans "Search" %}
    • +
  • {% trans "Search" %}
    • {% if user.is_staff %} -
  • {% trans "Archives" %} +
  • {% trans "Archives" %}