From 228e2429e063e29da511e40620c7a32fde9c82e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Sat, 20 Aug 2016 19:20:54 +0200
Subject: [PATCH] add "Format:" in talk details template + i18n

---
 locale/fr/LC_MESSAGES/django.mo               | Bin 5855 -> 6000 bytes
 locale/fr/LC_MESSAGES/django.po               |  65 ++++++++----------
 .../templates/proposals/talk_detail.html      |   2 +
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 5a818edb6fc31a69fcd94d070422db1e1038032c..7b35a9752663771db9d8a45eade7bd3b46192ea0 100644
GIT binary patch
delta 2147
zcmYk+S!`5Q7{Kw<g_f2IrGO}vGA_kJZEZ`T*lM9dTNW7<K`pi>6EjM&+GVCjBV-bc
z!50Nn1s6=L5hEDm!$hMo!3UT4Kp-ZB2pD~+iAh}|af`+T|NrT&@npXF-Fxo6XZg;#
z_uIN(>NDR|6uuBBy~I_-KlveK@aq};QNAh;VKbh?1z0^Z1b(57zY<)JvoMZDxD)4K
zBDy{t)jxrkQNJ&`eh@3{>NO5*Ad9o{<LLYpmT`U_3-Nno4B<!IgukI3u3;3`ccJHT
ztim10Eg_9QzZY$9U*rL-a;ir-n8$^Wun|wAlg}%inqhI|T;vxj`J0bR(T3a5nXN@<
z9!E2EA6|iJq{;9MI)KCIz}~=8Q~eGHcK880gA-VepP>(&MH`+#GxRI2#(dJoVQ9l#
z2GHwqw1YnM`3KMmrqF@xM+g2KW_;if2iM?H^uaIC8^1&wzJLyF0<XkLw1Gleuf&qb
zYIGtUXokAcjP^$L&qh9vw)b)w`L}~{Ds1Q&=4Otj^eoQB@6e9_h%D!#9W6&w+<*>z
zBX;37Y{r+c6;Gi{Qo?M#ZwWeqn%U%kcU}l}RNP9%i{#lGFQ7MGL{t1XI*=KR&XF%f
zXIO<^Ux7}f9of~P3m0M!F2-RbY2g5x@mHer;~5SZTzDUC;M2&H*u(i5w8MIOcR(xA
zrD?|++<-Pbj6S~?ZSN^`fMZyTZ=o4HgWdQulFX1<#c-X$y2v=%U=KR-Bo^S4xCr;-
zGJG8`$CK#NO`r{4LT6aUj&mTD==m~q$yQ@7Q&{c$-^Bsh4FhNgd+=&Jj4k*f+R#Px
z!Ar<56f-?LtV9P~gG;bEs^5;@pFqYG`tds4gJyCZOMU;3M-}g(51c^1gr7&}6KKOf
zM9yM^*g!411kKoledr7iqDyuNZSPfd$&RA!yo*lsG`j!7BnPJQFZ9N8PFVJ^2yLhq
zmtzw;(>}Zz`|);s6Sv@>$S-uV^SrMY9l$PRkB6Ov88w?0_gBUltR&q1cM&nd*|R@#
zX<LdGXKaZRcJ3$E;vTWwK{%LR!e!Y?n2no==|Tc?ujei3_omhLcjVU-7H7MPV8FT8
z5W+@c6VXYSzW*1~*cMf6#udapgjw(lxq-+hI*4t=bZMVH2!m5!D9=stz0rjmBgLh#
zn9^oqEwP>GCVX>zJN%ef{1~yTbLH+x@r~I*+%`5`G_P+RN413Sg~jdf!Z#2uSRG-h
zC)~2v5^j0lvpb3DvYvw*qLVe~Ytxh+FMc$yXmI4=M7nisLCLxKTON-MB}UTy_xBI=
zKk{HKofvp1HTF}<k+QAnUCEKuR7Ljb((!_sO%1Weme$6WY~$>=^NVwB#9FiG%WLu$
vcRn^WnEK>cDwY@>9!(CUV!M<7HJcpEtC*bAF`6DpreewH#_VLp?*;z?{Vm4?

delta 2006
zcmYk-U1*n89Ki9jO*h@v=3dlhIbZVKX4~2_=iG}mr~7A{Q(J}?LnA^#GQvWn2ieu!
zMZu8aj8MFpFW|*L@+Pm+3sKTAQVFzB5t+R}7TwwR`*;Q({=esQp11Ry^E>Bx{(r5w
zQ<K~-pL94-wh=E9_i{r>@XTa3l(B*kGI$cF<3BhBi`Y!XN-V-^%*SO|igodPdpw@O
z=Q!RQ&-Y`wkNSv;4Gdrjei8S-#$xtQ;UqkVJUe`cU3dX~U@5)O8CZ?8kyD`=y{`jp
zrz_frUiUs$IMe|ubsQK$2Ym_og{#q9Sjhfew81~nk^GI0G>4OBrVO9Q#mK49hUtUR
z4)r0w(9g!_?8baky_d=~{0wby5Y5C9d>zM-U-*rU8F+-Ae~dPqNBVqFF;-v|+JPFh
z!z<D2n{hs7(EIja;)S15vEhSgDhII&zeF22g)iXQ=w);S53mw{M>Cj9FFf85Z9>~?
zL)-5}+v!FJyt|nEo5}+mD8obOgTIP?i#B)-P3_NU&;P`A_#ZZ4D~&YaC+Jk1MX$Sv
z4&Vpel@r2sT+4n7Y4*B<rR3iWM>t@LkD(nojrROJI>HO_{4I1O_mI^a9^p)Ug0pcZ
z!y*}>5lwk}-0wl29k!$Q?}~n$Q1R8<k3R4xbV`1~C3qigu!LTD<1DnH`Dn*#aXEIN
zncIt<ID{l8Tt^4?YjhlK?_bQrB$r{#qLPnGaURaV3_4dk(1t!oM>K?XU^MQJp;L4Y
z?cjM_h!@dz$8jF!vocrW67>Fl<oYD+p~5fhW8;Gkp*<YIId~!-{~mq7HKfgO6Bpn(
zI)&3nha;^*_ZOho*PtJ^#<<^$w)<Wx^S_^pH;kewKY{gl1s&NFbZREEVr;M&ouW##
zp=xxbEog?ep&9%Ty)Hp!F$|*ZjN&ppjzv5_T%pp8H?aq&bN5F40Bz_SHfH29+JPI$
zVh(*o17SKX?+}X!JKsudChVZo$aJS!Gh-G9Y)LX~RuQgVi>b1_P1p$+r_*9F8?U9c
zryCLz-XMJSoMY#=i<l^m_Em!ZrmvgF*AbnBuOXk|;hhC#i61%3dZL!tO1Op^i4KCl
zq|ici6BA|iL<Qf9b!YG0Sg(nS*|(U)I${m6iFlJ>$t3BU;CI5}>-<t$3t>xC78AY1
z26vt*ewW$^UmmC5!q*_3`W5JmEhj85KPCMNvux94)056oJkgG>4U0=+F7ZnC$AW!1
v!`)MF46iOcn!Q_iEN@Efs=4*`P4#uzp_0?N+19c}Il}|x53>g<9_RfJFm#=m

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index a2f4448..cf537da 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/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: 2016-08-09 22:21+0000\n"
+"POT-Creation-Date: 2016-08-20 17:17+0000\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"
@@ -25,7 +25,7 @@ msgstr ""
 "Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de "
 "viande, etc."
 
-#: accounts/models.py:17 proposals/templates/proposals/user_details.html:12
+#: accounts/models.py:17 proposals/templates/proposals/user_details.html:16
 msgid "Biography"
 msgstr "Biographie"
 
@@ -66,7 +66,7 @@ msgid "Video licence"
 msgstr "Licence vidéo"
 
 #: accounts/models.py:68 proposals/models.py:60
-#: proposals/templates/proposals/user_details.html:19
+#: proposals/templates/proposals/user_details.html:23
 msgid "Notes"
 msgstr "Notes"
 
@@ -234,7 +234,7 @@ msgid "Home"
 msgstr "Accueil"
 
 #: ponyconf/templates/base.html:47 proposals/templates/proposals/talks.html:9
-#: proposals/templates/proposals/user_details.html:15
+#: proposals/templates/proposals/user_details.html:19
 msgid "Talks"
 msgstr "Exposés"
 
@@ -304,64 +304,73 @@ msgid "talk"
 msgstr "exposé"
 
 #: proposals/templates/proposals/speaker_list.html:18
-#: proposals/templates/proposals/talk_detail.html:32
+#: proposals/templates/proposals/talk_detail.html:34
 msgid "No speakers."
 msgstr "Aucun orateur."
 
-#: proposals/templates/proposals/talk_detail.html:17
+#: proposals/templates/proposals/talk_detail.html:12
+#: proposals/templates/proposals/user_details.html:11
+msgid "Edit"
+msgstr "Éditer"
+
+#: proposals/templates/proposals/talk_detail.html:15
+msgid "Format:"
+msgstr "Format :"
+
+#: proposals/templates/proposals/talk_detail.html:19
 msgid "Abstract:"
 msgstr "Résumé :"
 
-#: proposals/templates/proposals/talk_detail.html:19
+#: proposals/templates/proposals/talk_detail.html:21
 msgid "No abstract provided."
 msgstr "Aucun résumé fourni."
 
-#: proposals/templates/proposals/talk_detail.html:21
+#: proposals/templates/proposals/talk_detail.html:23
 msgid "Description:"
 msgstr "Description :"
 
-#: proposals/templates/proposals/talk_detail.html:23
+#: proposals/templates/proposals/talk_detail.html:25
 msgid "No description provided."
 msgstr "Aucune description fournie."
 
-#: proposals/templates/proposals/talk_detail.html:25
+#: proposals/templates/proposals/talk_detail.html:27
 msgid "Speakers:"
 msgstr "Orateurs :"
 
-#: proposals/templates/proposals/talk_detail.html:35
+#: proposals/templates/proposals/talk_detail.html:37
 msgid "Topics:"
 msgstr "Thèmes :"
 
-#: proposals/templates/proposals/talk_detail.html:42
+#: proposals/templates/proposals/talk_detail.html:44
 #: proposals/templates/proposals/topic_list.html:33
 msgid "No topics."
 msgstr "Aucun thèmes."
 
-#: proposals/templates/proposals/talk_detail.html:47
+#: proposals/templates/proposals/talk_detail.html:49
 msgid "Notes:"
 msgstr "Notes :"
 
-#: proposals/templates/proposals/talk_detail.html:49
+#: proposals/templates/proposals/talk_detail.html:51
 msgid "No notes."
 msgstr "Aucune note."
 
-#: proposals/templates/proposals/talk_detail.html:51
+#: proposals/templates/proposals/talk_detail.html:53
 msgid "Moderation"
 msgstr "Modération"
 
-#: proposals/templates/proposals/talk_detail.html:53
+#: proposals/templates/proposals/talk_detail.html:55
 msgid "Vote:"
 msgstr "Vote :"
 
-#: proposals/templates/proposals/talk_detail.html:62
+#: proposals/templates/proposals/talk_detail.html:64
 msgid "Sum:"
 msgstr "Somme :"
 
-#: proposals/templates/proposals/talk_detail.html:64
+#: proposals/templates/proposals/talk_detail.html:66
 msgid "Status:"
 msgstr "Status :"
 
-#: proposals/templates/proposals/talk_detail.html:67
+#: proposals/templates/proposals/talk_detail.html:69
 msgid "Messages:"
 msgstr "Messages :"
 
@@ -371,16 +380,12 @@ msgid "Propose a talk"
 msgstr "Proposer un exposé"
 
 #: proposals/templates/proposals/talks.html:14
-#, fuzzy
-#| msgid "My participing talks:"
 msgid "My participing talks"
-msgstr "Exposés auquels je participe :"
+msgstr "Exposés auquels je participe"
 
 #: proposals/templates/proposals/talks.html:19
-#, fuzzy
-#| msgid "Others talks:"
 msgid "Others talks"
-msgstr "Autres exposés :"
+msgstr "Autres exposés"
 
 #: proposals/templates/proposals/topic_form.html:14
 msgid "Topic"
@@ -394,10 +399,6 @@ msgstr "Ajouter un thème"
 msgid "reviewer"
 msgstr "Responsable"
 
-#: proposals/templates/proposals/user_details.html:21
-msgid "Edit"
-msgstr "Éditer"
-
 #: proposals/views.py:38
 #, python-format
 msgid "Talks related to %s:"
@@ -418,9 +419,3 @@ msgstr "A voté !"
 #: proposals/views.py:131
 msgid "Vote successfully updated"
 msgstr "Vote mis à jour"
-
-#~ msgid "see details"
-#~ msgstr "voir en détail"
-
-#~ msgid "and"
-#~ msgstr "et"
diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html
index 417f372..614e39e 100644
--- a/proposals/templates/proposals/talk_detail.html
+++ b/proposals/templates/proposals/talk_detail.html
@@ -12,6 +12,8 @@
 <a class="btn btn-success" href="{% url 'edit-talk' talk.slug %}">{% trans "Edit" %}</a><br />
 {% endif %}
 
+<h3>{% trans "Format:" %}</h3>
+
 <p>{{ talk.get_event_display }}</p>
 
 <h3>{% trans "Abstract:" %}</h3>