From 8bcfa49fde9f481ef329fb718d3c8cd153274829 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 5 Jun 2012 01:54:09 +0200 Subject: [PATCH] fix titles & trans --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 4469 -> 4535 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 24 +++++++++--------- teleforma/models.py | 2 +- .../teleforma/inc/conference_list.html | 2 +- .../templates/teleforma/inc/media_list.html | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 0da4f16bed4fc9c8d974fc1fc7822986f6742e92..72e50c32077a837d7648637df3571ae89be1cda3 100644 GIT binary patch delta 2122 zcmXw)TTIkP6o-e^?y`c5fEQG%3ksOV8&WS+R8T>*EePH!ifCZhqJSv0Vtx2GC5nkL zUKU?e5?&;3`()O}mNYR&A4u9JKA0G7v}zL@<;fV+HjUBmCx^-W=9@E@GiT2H7hdOH zpXEKu7<=AP8c;TxIL0{-ruu0p$;r-r0E5OfI1YOf91FuR1?Is3EHoC|d>PdG3OF9t zK&@{WnfKg&Iza~7A=Q0DLkzCl>>ikgeFo})ezUI_e}Zy21QpO-sQvdL)jhQFXHWqQ z+xUObudDhvoxTe~1(HFdh_h|H0P28+W|x>AC>a zd`1fS*Mb>X=`aVT!XhX~rBD%9LT#*uT+-Fqe3RKNPzQW%<455H>~6Drp)z_2Dnma& zUEpd8`Parl2E-e1BD@Wolei&N0BcBxxB<#h4V0tZPyt7w_IE%9*k$&2Hs1r~w-@5l z#i9KD=+RN6zd)+{okpqr18U))P?;HqiujG$exlH?A`3F)=0Ig^3Do|TPzS6wu7_H; z5oW<%Q0u+JbmZ8Biu?rB!gFT#Lml+JjSoVq8=}$rdvFqb0u}H-P){|6O=1Wtkf~4^ z3q$={@*x3uuGkioK{>31N@*>W!v?60`)&Rpl;fkuY`at8PA~!>i56MCQ6_VE{A%nTC?{;Ip~B`_pRAyp;FifmGa9_7l=cuOW62r;}BHf zzd`xC2Yvee|3ya!K7$J2f2c^4d3Z4$YQr=r2l-GpErbeS8B~T!&8~p*R|OSNBc!@k z8m;qe{1}|46rHA{1A5_P*bn*m-4-TZKMDi({_?EwO#cFVgpPbVQoMjR)GIkwcNT#z;r3Hn=6Usq;`|Piu4A-f-uU z_DEtN81?xU7bQZe$C46#;|r29+oHGPBkRNMxVRN(4@4q; zv80J5L@XiE*y5q#rG054LSjjXBKZBsY2xPo@9&(uoO{0Webe5^`a0Ze?;Cs4(Q45U z6zJic2YPp!QFJJ>hJq{h@#Bo~yy2 zyE+Cx44dBw$;It4zX|rnKMZxz8S~E@uR#UA50%(6sPnHN-L=_#2UH@R(Rm*A3r0K> zKcf@Q`N%?vBr_=UG{}-026aJ>`32?|n_q5z6{NfM#xPXEjZlg0hP_~u=2hzB7%K5; zNO$Lqmu&tTR020_{vK2!t#B1=gE~K+Y?W|6gDxsDzYOXDLr~{dLM5~TdNQ_R&|L$A zO0(DeqfiG<+582lM6N8% z^n+(%IEE*LN?;J>5Q9*GMneTEgi5#w>U=p=f+6$Q*m^Bg+-;DMt_dpMF{u3!4?`KB zgLHS9K_$Hdb>JRUg`PrX-fsR|s9!@Dq&q*^MJoq&J`?JqEMqRzzC1VpmO$gry0xOdi)U71y>+3-F2u}@dzqTE7XIvK~=Z|>Yh(F{{sf}r>+O9 zdPgZx?{p+ofJu<u}WnKeS;*C%Nw?MkvW%K)u2cZ%_0u}Eh)K`BV>b{FGpx^&3 z3}yP*_yX#{Yp4L7P*3_1DuHiM75Z&{EFXvh2A~oOLVYu17__g*=1ZX}Q~?#g5@z(r zsKwx;kGAQIbIo2G3C5>-Rd`cTAyT-dNNomMheD_ZDYTkWtU!ufiN+%RXIYK9o9dU_ z?Lei!;6GpH3N%V#hGSHt$!I=GLwS)W@q@zyv6i7CREnmd!ARBYZnMnDHU{BrGzBe0 zy)QNid}sP|Qd)KbxMv{(*JzdJs< zXv<*K-){Zeoq!6^NVEiHBDHeFD|U0xJVzNOVW?&OgBuF\n" "Language-Team: LANGUAGE \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 %}
-

{% trans "Live"%}

+

{% trans "Live conferences"%}

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 %}
-

{% trans "Differed"%}

+

{% trans "Passed conferences"%}

-- 2.39.5