From: yomguy <yomguy@parisson.com>
Date: Mon, 4 Jun 2012 23:54:09 +0000 (+0200)
Subject: fix titles & trans
X-Git-Tag: 0.4^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8bcfa49fde9f481ef329fb718d3c8cd153274829;p=teleforma.git

fix titles & trans
---

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 0da4f16b..72e50c32 100644
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 aa1c02bb..c19dbf41 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-06-05 01:45+0200\n"
+"POT-Creation-Date: 2012-06-05 01:53+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"
@@ -132,17 +132,13 @@ msgstr ""
 msgid "admin password"
 msgstr ""
 
-#: models.py:228
+#: models.py:228 models.py:238
 msgid "streaming server"
 msgstr "serveur de diffusion"
 
-#: models.py:238
-msgid "streaming_server"
-msgstr ""
-
 #: models.py:239
 msgid "Streaming type"
-msgstr ""
+msgstr "Type de flux"
 
 #: models.py:258
 msgid "live stream"
@@ -558,7 +554,6 @@ msgid "End"
 msgstr "Fin"
 
 #: templates/teleforma/course_conference.html:38
-#: templates/teleforma/inc/conference_list.html:6
 msgid "Live"
 msgstr "Direct"
 
@@ -593,6 +588,11 @@ msgstr "Mes notes"
 msgid "New note"
 msgstr "Nouvelle note"
 
+#: templates/teleforma/inc/conference_list.html:6
+#, fuzzy
+msgid "Live conferences"
+msgstr "Conférence en direct"
+
 #: templates/teleforma/inc/conference_list.html:11
 #: templates/telemeta/lists.html:70
 #: templates/telemeta/inc/module_revisions.html:18
@@ -621,8 +621,8 @@ msgid "Download"
 msgstr "Télécharger"
 
 #: templates/teleforma/inc/media_list.html:6
-msgid "Differed"
-msgstr "Différé"
+msgid "Passed conferences"
+msgstr "Conférences passées"
 
 #: templates/telemeta/base.html:68
 msgid "Desk"
@@ -876,8 +876,8 @@ msgstr "Tweeter local"
 msgid "me"
 msgstr "moi"
 
-#~ msgid "Live conferences"
-#~ msgstr "Conférences en direct"
+#~ msgid "Differed"
+#~ msgstr "Différé"
 
 #~ msgid "category"
 #~ msgstr "catégorie"
diff --git a/teleforma/models.py b/teleforma/models.py
index 2dc73208..60f75d75 100755
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -235,7 +235,7 @@ class LiveStream(Model):
     conference = ForeignKey('Conference', related_name='livestream',
                                 verbose_name=_('conference'))
     server     = ForeignKey('StreamingServer', related_name='livestream',
-                                verbose_name=_('streaming_server'))
+                                verbose_name=_('streaming server'))
     stream_type = CharField(_('Streaming type'), choices=streaming_choices, max_length=32)
 
     @property
diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index cdf71157..661b062a 100644
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -3,7 +3,7 @@
 {% if course.conference.all %}
 <div class="course_content">
 <div class="course_subtitle">
-    <h3><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> {% trans "Live"%}</h3>
+    <h3><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> {% trans "Live conferences"%}</h3>
 </div>
     <table class="listing" width="100%">
     <thead>
diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index b8ca6f32..37fade82 100644
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -3,7 +3,7 @@
 {% if course.media.all %}
 <div class="course_content">
 <div class="course_subtitle">
-    <h3><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> {% trans "Differed"%}</h3>
+    <h3><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> {% trans "Passed conferences"%}</h3>
 </div>
     <table class="listing" width="100%">
     <thead>