From 9df62a1247804aad3cb9f80e96805e9aa2e19936 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Wed, 24 Jan 2018 19:09:51 +0200
Subject: [PATCH] Fix translations

---
 locale/en/LC_MESSAGES/django.mo | Bin 14081 -> 14154 bytes
 locale/en/LC_MESSAGES/django.po | 159 +++++++++++++++++--------------
 locale/fi/LC_MESSAGES/django.mo | Bin 17157 -> 17249 bytes
 locale/fi/LC_MESSAGES/django.po | 161 ++++++++++++++++++--------------
 webapp/models.py                |   2 +-
 5 files changed, 182 insertions(+), 140 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 8d0d8523ea77a5bbb3b0b6901bcf7b5a55b1949c..5de156c701407582b70c9410c311fa308917ee99 100644
GIT binary patch
delta 4359
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
Hur}j=gRGge

delta 4308
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
Mh21PXlCaeKKRNJ^Pyhe`

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 5836595..a4607ef 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-24 17:21+0200\n"
+"POT-Creation-Date: 2018-01-24 19:03+0200\n"
 "PO-Revision-Date: 2017-11-02 23:09+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -162,7 +162,8 @@ msgid "id"
 msgstr "id"
 
 #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110
-#: webapp/models.py:143 webapp/templates/kaehmy_list.html:36
+#: webapp/models.py:143 webapp/templates/form_listAll.html:36
+#: webapp/templates/kaehmy/kaehmy_list.html:36
 msgid "Name"
 msgstr "Name"
 
@@ -191,7 +192,8 @@ msgid "Last name"
 msgstr "Last name"
 
 #: members/models.py:16 webapp/models.py:144
-#: webapp/templates/kaehmy_list.html:40
+#: webapp/templates/form_listAll.html:40
+#: webapp/templates/kaehmy/kaehmy_list.html:40
 msgid "Email"
 msgstr "Email"
 
@@ -283,7 +285,8 @@ msgstr "Don't forget to pay your membership fee!"
 #: members/templates/member_add_many.html:55
 #: members/templates/member_add_many_confirm.html:22
 #: templates/password_reset/recovery_form.html:10
-#: webapp/templates/kaehmy_list.html:48
+#: webapp/templates/form_listAll.html:48
+#: webapp/templates/kaehmy/kaehmy_list.html:48
 msgid "Send"
 msgstr "Send"
 
@@ -480,7 +483,7 @@ msgstr "Finnish"
 msgid "English"
 msgstr "English"
 
-#: members/templates/settings.html:23 webapp/templates/kaehmy.html:77
+#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77
 msgid "Submit"
 msgstr "Submit"
 
@@ -573,15 +576,17 @@ msgid "Go"
 msgstr "Go"
 
 #: templates/base.html:14 templates/footer.html:10
-#: webapp/templates/kaehmy_base.html:14 webapp/templates/main_index.html:9
+#: webapp/templates/form_base.html:14
+#: webapp/templates/kaehmy/kaehmy_base.html:14
+#: webapp/templates/main_index.html:9
 msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
 
-#: templates/error.html:8 webapp/templates/kaehmy_error.html:8
+#: templates/error.html:8 webapp/templates/kaehmy/kaehmy_error.html:8
 msgid "Error"
 msgstr "Error"
 
-#: templates/error.html:15 webapp/templates/kaehmy_error.html:15
+#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15
 msgid "Back"
 msgstr "Back"
 
@@ -660,7 +665,7 @@ msgstr "Phone number (not public)"
 msgid "Custom roles"
 msgstr "Custom roles"
 
-#: webapp/forms.py:52 webapp/templates/kaehmy.html:41
+#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41
 msgid "Preset roles"
 msgstr "Preset roles"
 
@@ -826,7 +831,7 @@ msgstr "Kaehmy comments"
 msgid "Message"
 msgstr ""
 
-#: webapp/models.py:181 webapp/templates/kaehmy.html:12
+#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12
 msgid "Kaehmylomake"
 msgstr "Kaehmy application"
 
@@ -899,7 +904,7 @@ msgid "Team"
 msgstr ""
 
 #: webapp/models.py:282
-msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)"
+msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)"
 msgstr ""
 
 #: webapp/models.py:285
@@ -942,6 +947,43 @@ msgstr "Contact"
 msgid "Event calendar"
 msgstr "Event calendar"
 
+#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59
+#: webapp/templates/kaehmy/kaehmy_list.html:24
+#: webapp/templates/kaehmy/kaehmy_list.html:59
+msgid "All kaehmys"
+msgstr "All applications"
+
+#: webapp/templates/form_listAll.html:32
+#: webapp/templates/kaehmy/kaehmy_list.html:32
+msgid "Commenting on post by "
+msgstr ""
+
+#: webapp/templates/form_listAll.html:44
+#: webapp/templates/kaehmy/kaehmy_list.html:44
+msgid "Comment"
+msgstr ""
+
+#: webapp/templates/form_listAll.html:57
+#: webapp/templates/kaehmy/kaehmy_list.html:57
+msgid "Filter kaehmys"
+msgstr "Filter kaehmys"
+
+#: webapp/templates/form_listAll.html:70
+#: webapp/templates/kaehmy/kaehmy_list.html:70
+#: webapp/templates/kaehmy/kaehmy_statistics.html:18
+msgid "Total kaehmys:"
+msgstr "Total applications:"
+
+#: webapp/templates/form_listAll.html:88
+#: webapp/templates/kaehmy/kaehmy_list.html:88
+msgid "Show comments"
+msgstr ""
+
+#: webapp/templates/form_listAll.html:94
+#: webapp/templates/kaehmy/kaehmy_list.html:94
+msgid "Add comment"
+msgstr ""
+
 #: webapp/templates/guild.html:10
 msgid "Kilta"
 msgstr "Guild"
@@ -950,7 +992,7 @@ msgstr "Guild"
 msgid "Jobs"
 msgstr "Jobs"
 
-#: webapp/templates/kaehmy.html:16
+#: webapp/templates/kaehmy/kaehmy.html:16
 msgid ""
 "Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
 "            Listassa on vastuualueittain sekä hallitus- että "
@@ -970,7 +1012,7 @@ msgstr ""
 "Best positions to consider for English speaking people are in the "
 "International category."
 
-#: webapp/templates/kaehmy.html:23
+#: webapp/templates/kaehmy/kaehmy.html:23
 msgid ""
 "Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
 "            eikä siis missään nimessä sitova ilmoittautumien mihinkään "
@@ -979,97 +1021,68 @@ msgstr ""
 "Note, that sending an application is not binding and should be considered as "
 "a gesture of interest."
 
-#: webapp/templates/kaehmy.html:26
+#: webapp/templates/kaehmy/kaehmy.html:26
 msgid "Päivämääriä & deadlineja"
 msgstr "Dates and deadlines"
 
-#: webapp/templates/kaehmy.html:28
+#: webapp/templates/kaehmy/kaehmy.html:28
 msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
 msgstr "Board panel discussion (applications to the board before this date!)"
 
-#: webapp/templates/kaehmy.html:29
+#: webapp/templates/kaehmy/kaehmy.html:29
 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
 msgstr "Election meeting, part 1 (chairman election)"
 
-#: webapp/templates/kaehmy.html:30
+#: webapp/templates/kaehmy/kaehmy.html:30
 msgid "Vaalikokous, osa 2 (hallituksen valinta)"
 msgstr "Election meeting, part 2 (board election)"
 
-#: webapp/templates/kaehmy.html:31
+#: webapp/templates/kaehmy/kaehmy.html:31
 msgid "Kiltailta"
 msgstr "Guild night"
 
-#: webapp/templates/kaehmy.html:32
+#: webapp/templates/kaehmy/kaehmy.html:32
 msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!"
 msgstr "Deadline to apply as a non-board official!"
 
-#: webapp/templates/kaehmy.html:33
+#: webapp/templates/kaehmy/kaehmy.html:33
 msgid "Vaalikokous, osa 3 (toimarien valinta)"
 msgstr "Election meeting, part 3 (non-board election)"
 
-#: webapp/templates/kaehmy_export.html:9
+#: webapp/templates/kaehmy/kaehmy_export.html:9
 msgid "All applications"
 msgstr "All applications"
 
-#: webapp/templates/kaehmy_export.html:13
+#: webapp/templates/kaehmy/kaehmy_export.html:13
 msgid "Board applications"
 msgstr "Board applications"
 
-#: webapp/templates/kaehmy_export.html:18
+#: webapp/templates/kaehmy/kaehmy_export.html:18
 msgid "Non-board applications"
 msgstr "Non-board applications"
 
-#: webapp/templates/kaehmy_export.html:23
+#: webapp/templates/kaehmy/kaehmy_export.html:23
 msgid "Front page"
 msgstr ""
 
-#: webapp/templates/kaehmy_footer.html:23
+#: webapp/templates/kaehmy/kaehmy_footer.html:23
 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 
-#: webapp/templates/kaehmy_list.html:24 webapp/templates/kaehmy_list.html:59
-msgid "All kaehmys"
-msgstr "All applications"
-
-#: webapp/templates/kaehmy_list.html:32
-msgid "Commenting on post by "
-msgstr ""
-
-#: webapp/templates/kaehmy_list.html:44
-msgid "Comment"
-msgstr ""
-
-#: webapp/templates/kaehmy_list.html:57
-msgid "Filter kaehmys"
-msgstr "Filter kaehmys"
-
-#: webapp/templates/kaehmy_list.html:70
-#: webapp/templates/kaehmy_statistics.html:18
-msgid "Total kaehmys:"
-msgstr "Total applications:"
-
-#: webapp/templates/kaehmy_list.html:88
-msgid "Show comments"
-msgstr ""
-
-#: webapp/templates/kaehmy_list.html:94
-msgid "Add comment"
-msgstr ""
-
-#: webapp/templates/kaehmy_message.html:11
+#: webapp/templates/kaehmy/kaehmy_message.html:11
 msgid "Reply"
 msgstr ""
 
-#: webapp/templates/kaehmy_navigation.html:6
+#: webapp/templates/kaehmy/kaehmy_navigation.html:6
 msgid "List kaehmys"
 msgstr "List applications"
 
-#: webapp/templates/kaehmy_navigation.html:7
+#: webapp/templates/kaehmy/kaehmy_navigation.html:7
 msgid "New kaehmy"
 msgstr "New application"
 
-#: webapp/templates/kaehmy_navigation.html:8
-#: webapp/templates/kaehmy_statistics.html:13
+#: webapp/templates/kaehmy/kaehmy_navigation.html:8
+#: webapp/templates/kaehmy/kaehmy_statistics.html:13
 msgid "Statistics"
 msgstr ""
 
@@ -1105,22 +1118,30 @@ msgstr "Sössö"
 msgid "Corporate"
 msgstr "Corporate"
 
-#: webapp/templates/ohlhafv.html:8
-msgid "Ohlhafv"
-msgstr "Ohlhafv"
-
-#: webapp/templates/ohlhafv.html:15
-msgid "Challenge"
-msgstr "Challenge"
-
-#: webapp/templates/ohlhafv_list.html:11
+#: webapp/templates/ohlhafv/list.html:8
 msgid "All challenges"
 msgstr "All challenges"
 
-#: webapp/templates/ohlhafv_list.html:15
+#: webapp/templates/ohlhafv/list.html:12
 msgid "Total challenges:"
 msgstr "Total challenges:"
 
+#: webapp/templates/ohlhafv/navigation.html:6
+msgid "New challenge"
+msgstr ""
+
+#: webapp/templates/ohlhafv/navigation.html:7
+msgid "List challenges"
+msgstr "All challenges"
+
+#: webapp/templates/ohlhafv/new.html:12
+msgid "Ohlhafv"
+msgstr "Øhlhäfv"
+
+#: webapp/templates/ohlhafv/new.html:19
+msgid "Challenge"
+msgstr "Challenge"
+
 #~ msgid "Infoscreen"
 #~ msgstr "Infoscreen"
 
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index b0f6dd0014cb09951b53a673c904293d625a0d2c..f889a09684e77e6424ecebd3ccfab84fb19bfed3 100644
GIT binary patch
delta 5230
zcmZA333yId0><(4Ws!x*W}Od-L<wm~hG>M6N~^WaFtyW2#)PP4sG*olFGZ@I+WM7J
zQnW*>s1i|Ow3e|{LXBM+Ypc<8Ce=_KnfB@b%{}IMX71D1@0|19d+s^so_o`I1)ggK
z9_MmYz*56eO`4E9LB{m=7*iImR%0US8*>FCF&J-K@1s9;{|3e+Vi4BC_NexBtc_hU
z0()U74#zq;+Wp-zQz+<O4(h~3SQpp0Czvg^eK(G#z0B6zH#8=O`s1h$e}^eJ+4>GX
zO#KWdp<g3o0x%iFFcqVWV@xImbub7+aFjh^0_uW4+TUlPR$u{YCd*LgueJ4!s0r-A
zp?DZsOw+uvF^t)?#-^BoYR|${?r%m@P)DmU64zrq?!;zz2{qGdtM?biP&A!U0~v@~
z!EDsbCZTTdg0%pns4v85T#FiLF*<E29HO8VxQm*xpV#dm2=z?EQO~jg>e0lZRw4y;
zembhdZm9G6q52zv8pv1-#L1|EJdaP}D_+)L9i6l%UbH9Pu--!5uoAUGKcNN`%udw}
z!%@G-+Il-=)lCL!U_(*;XQ2i#26g@f)WGtau>M-YxiqN5MHq)`P!}FR{a%KCcn;Ok
z=ctaZVlq}@FO1~@XW}^2=G%e~;U(14`|&(=eFId#O&ki%DYQb~DAN;l<B^zvd8lW)
z1nc2y)XcV{R-^>=x*f3Xhf$lY47De2SgY_WUTc3gk{(S(toyt31BDJW1TzYa>`_$5
znW%yEwe>;PY}6)w7IlMsREMuxSD*&G9`&fUqn3I%YK0Hj-%lg=bIf%LI<XwJM3u-s
zH2ypX-Jlt2x3@)g^b~3(`q_Fes^baBf93`LS&nP5W^?i?X+YgjOWqfC{t(puGh-=e
z$>t&73bV@Ax1&~|6g9)ssFk^f8b}3dC8|)nI<SR1kw&QNVo<*)p!!co?V0}8Yz*f9
z=Jyoz?5Cq{v=BApm8g!3tw&HRbP;u4C2Ao5LH3skV5g})4mHDesF`PAApQyiaDc53
zMMonYNkKEqvp$D9F(0+mvr&&|8ES<J?eE35eHZG+`%pJNj_UUcY5?V^fq#$VFtnxH
z-?Wyjzn;mTXpr+!GxFIJR-y*>HnJ_uCe+FtNBT157>jjV=~*&k<V`faZ9UJ{=VB1;
zYf%H-VBOV<_4lWt)SmDeYUby#Enc$q+6nF-mk88AyQ4bli+aXcsOu)-(>N71(@#+Y
zOKt5=q(AEX;aKw_awya+HS&s@*{DzG8Vtrwn25zlU*;MzX%pJUUBVR9(x=(_6Bt6h
z531ims7Ejy2jN)M`Fqh1onsVwdyF}O`)O$MusgFWs0+VEt<X=Xf%ql418a*x)E`0J
zup4SdJ*`8mV=#>NX{gOS*S5cbyxxvkZyR=C7$+RWId}@SX$JEgv@+vROa2OKFRa9l
zxCiwCyMvvvbvt)}xfn`)B61@$12uq`u@0`nP`&>fC};-T?GGQ@dMVbW{S4N^FHn!9
z0=3ER;Ao6YcCVj~dPFax2EGw>qfamu%TWFJrMMFf!C1Zj4JpK68nWNa5M;H@EZe>r
zb>m~G4$q<ncEh%Rhnhe&YQ}-TbT?T9svd`Y3{4VhZ}r1)9Dz0O|9A=-*;H#j>clx1
zh>K9qdMQR?p>+#tAp7j^Cr|@CkNSjviQUn(cfTW<sEG_g^_$b4_1DP9&=7@_QF~x6
zYUHn>22yC-H()gNk5FH{Qq;h1q0YN)>p!Aq7|6!Zjq0P$^P;}A@feGpI<Wql`7j!E
z!yHt7JnF(Js2R>c9-o<yy|4tkU;qzRkLodOgA-9Jv;y_|ZM1%f8gMb{QJ+G+RaFiJ
zeNykCW**L#*3vaaosfoFp)R)G12xcI)`6&*W?Ltr{?5-rJ&L?E_xGvDn9V%Y#CD<j
zb@tkZqo`+d0yTpRsF_!wZgAh$Lp!+xZH&4>E7bWNY<mx^PkjLDx@S>0oQYc5Sr~yY
zA#agmmQ&D)#rP;5L=D70-JNM2)P)UE9XCVm<_@?V2cwqyTht!7YxVFkXh1y-we&5}
zi``MzXJK8v|FbD*=@+9qc&p|IW8OzCQHiY|K#lw)>V`K^11(2w-rE?D0c;FSC;@eS
znyq(7UH==@{YIge`<uxWbmIlq71njut*B?d2Q`x;sE%%0?^%OcKCM(^)RM>AdP~$m
zlTZWdh|!pVHShlb3i_lzgW7ZsdT|cw!qun_-$M=b15^jQP#qpe?Sb>y1i!}TF{rCM
zAP04R0cuaZiFzG3bY=Zj*h+(LRDxQ<{ixUECh`q2wYs?j?1Zt@hhqZfqn_nD)a!Qy
z)n66rhSjJ?6Q1GrABWnsiKrD#%W&Mk^O-d0!sjp<XQEEnh<cVgP)mLYwZ!MJA6~|6
zZ1<S^>0XRlk)2o%_gl}QuKNa?VHIj6q8z@Dx<PYH#1z!bp23z_fZA-Eu@P=V4XhOP
zD9)lD&2`jF%kkG(ZR@==-M{l$=%M{RvW~n<#uMiMzsGT^bI3R{iJT-l){?R009ipa
zINntA7czpx6CGQ~Kyp(Rj#L*@f%nKJ@|0~mtv9qMl`QfV`5SqhobnBfh<6rIT1IY>
zUStB%an!|pg88=mXY2QPhP-O)gYh5a2-!$36Fv|%Um7r*Nj5n~bi72CkayhY#s6;j
zevF7|`Z7%~l7EqZlJ&$#J|$ayog%$Wt0?J-A0ijYM53cU+3%Yi8Qu6AC4G=|d_cY=
z3&?lA!pIos1f`ke4YG^mkO3r-G$lIzN`lF2WHjkPb`TwRUCdN0B5TOgL`NxUM;;+@
z<TiP5^rjHQWI9KM_56ZzG)X4!6CGh>drgTi7Y-x(?2fW+({V1TCW}d9a^ANj%A52y
zrIAF(9+F2=$cIG74Kj~>P0D;1qGIYVrNkRwb8O>ZeNzg2VbR{O)s)J~eDaMiH9E$*
zPbrlAmdql>L`Ms9otz_e$tu!@d`6~`KIFl1kU|96Z5#fLtw{*UC1=S#qGL9xBtMW2
zdT(k|Xig3j9iO}W_us3O29YbIA=ycEEF>#yO8m{jH%S-L&$eB{DP)7K2jbsJA?ZtA
zCwu|<R)Lo^A|H`E<o}PiXy|AgGti%WZ0jY~C-Dg~!`3hOHrGq^>@B)bZ+@MSQF%Gz
z$LCHQlUp>bd5I_ZLA59>zAC^IyDj08UqGky<n~2Z+guOxO-yQ3bTsXnr&eB0&Xhmo
R7OhKvH_#JX)F-3F?`Q9-Fiije

delta 5174
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
Xu7os%4g1Wmq5bep?HXRseaHX*&WR6h

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index bb061b2..7004a5c 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-24 17:21+0200\n"
+"POT-Creation-Date: 2018-01-24 19:03+0200\n"
 "PO-Revision-Date: 2017-11-02 23:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -163,7 +163,8 @@ msgid "id"
 msgstr "id"
 
 #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110
-#: webapp/models.py:143 webapp/templates/kaehmy_list.html:36
+#: webapp/models.py:143 webapp/templates/form_listAll.html:36
+#: webapp/templates/kaehmy/kaehmy_list.html:36
 msgid "Name"
 msgstr "Nimi"
 
@@ -192,7 +193,8 @@ msgid "Last name"
 msgstr "Sukunimi"
 
 #: members/models.py:16 webapp/models.py:144
-#: webapp/templates/kaehmy_list.html:40
+#: webapp/templates/form_listAll.html:40
+#: webapp/templates/kaehmy/kaehmy_list.html:40
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -284,7 +286,8 @@ msgstr "Muista myös maksaa jäsenmaksusi!"
 #: members/templates/member_add_many.html:55
 #: members/templates/member_add_many_confirm.html:22
 #: templates/password_reset/recovery_form.html:10
-#: webapp/templates/kaehmy_list.html:48
+#: webapp/templates/form_listAll.html:48
+#: webapp/templates/kaehmy/kaehmy_list.html:48
 msgid "Send"
 msgstr "Lähetä"
 
@@ -479,7 +482,7 @@ msgstr "suomi"
 msgid "English"
 msgstr "englanti"
 
-#: members/templates/settings.html:23 webapp/templates/kaehmy.html:77
+#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77
 msgid "Submit"
 msgstr "Lisää"
 
@@ -571,15 +574,17 @@ msgid "Go"
 msgstr "Vaihda"
 
 #: templates/base.html:14 templates/footer.html:10
-#: webapp/templates/kaehmy_base.html:14 webapp/templates/main_index.html:9
+#: webapp/templates/form_base.html:14
+#: webapp/templates/kaehmy/kaehmy_base.html:14
+#: webapp/templates/main_index.html:9
 msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
 
-#: templates/error.html:8 webapp/templates/kaehmy_error.html:8
+#: templates/error.html:8 webapp/templates/kaehmy/kaehmy_error.html:8
 msgid "Error"
 msgstr "Virhe"
 
-#: templates/error.html:15 webapp/templates/kaehmy_error.html:15
+#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15
 msgid "Back"
 msgstr "Takaisin"
 
@@ -657,7 +662,7 @@ msgstr "Puhelinnumero (ei julkinen)"
 msgid "Custom roles"
 msgstr "Uudet virat"
 
-#: webapp/forms.py:52 webapp/templates/kaehmy.html:41
+#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41
 msgid "Preset roles"
 msgstr "Kaehmyvirat"
 
@@ -823,7 +828,7 @@ msgstr "Kaehmykommentit"
 msgid "Message"
 msgstr "Viesti"
 
-#: webapp/models.py:181 webapp/templates/kaehmy.html:12
+#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12
 msgid "Kaehmylomake"
 msgstr "Kaehmylomake"
 
@@ -896,8 +901,8 @@ msgid "Team"
 msgstr "Joukkue"
 
 #: webapp/models.py:282
-msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)"
-msgstr "Joukkuehaaste (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)"
+msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)"
+msgstr "Joukkuehaaste (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)"
 
 #: webapp/models.py:285
 msgid "Challenger"
@@ -939,6 +944,43 @@ msgstr "Yhteystiedot"
 msgid "Event calendar"
 msgstr "Tapahtumakalenteri"
 
+#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59
+#: webapp/templates/kaehmy/kaehmy_list.html:24
+#: webapp/templates/kaehmy/kaehmy_list.html:59
+msgid "All kaehmys"
+msgstr "Kaikki kaehmyt"
+
+#: webapp/templates/form_listAll.html:32
+#: webapp/templates/kaehmy/kaehmy_list.html:32
+msgid "Commenting on post by "
+msgstr "Kommentoidaan viestiin lähettäjältä "
+
+#: webapp/templates/form_listAll.html:44
+#: webapp/templates/kaehmy/kaehmy_list.html:44
+msgid "Comment"
+msgstr "Kommentti"
+
+#: webapp/templates/form_listAll.html:57
+#: webapp/templates/kaehmy/kaehmy_list.html:57
+msgid "Filter kaehmys"
+msgstr "Rajaa kaehmyjä"
+
+#: webapp/templates/form_listAll.html:70
+#: webapp/templates/kaehmy/kaehmy_list.html:70
+#: webapp/templates/kaehmy/kaehmy_statistics.html:18
+msgid "Total kaehmys:"
+msgstr "Kaehmyjä yhteensä:"
+
+#: webapp/templates/form_listAll.html:88
+#: webapp/templates/kaehmy/kaehmy_list.html:88
+msgid "Show comments"
+msgstr "Näytä kommentit"
+
+#: webapp/templates/form_listAll.html:94
+#: webapp/templates/kaehmy/kaehmy_list.html:94
+msgid "Add comment"
+msgstr "Kommentoi"
+
 #: webapp/templates/guild.html:10
 msgid "Kilta"
 msgstr "Kilta"
@@ -947,7 +989,7 @@ msgstr "Kilta"
 msgid "Jobs"
 msgstr "Työpaikat"
 
-#: webapp/templates/kaehmy.html:16
+#: webapp/templates/kaehmy/kaehmy.html:16
 msgid ""
 "Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
 "            Listassa on vastuualueittain sekä hallitus- että "
@@ -969,7 +1011,7 @@ msgstr ""
 "            tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
 "henkilöön."
 
-#: webapp/templates/kaehmy.html:23
+#: webapp/templates/kaehmy/kaehmy.html:23
 msgid ""
 "Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
 "            eikä siis missään nimessä sitova ilmoittautumien mihinkään "
@@ -979,97 +1021,68 @@ msgstr ""
 "            eikä siis missään nimessä sitova ilmoittautumien mihinkään "
 "tehtävään!"
 
-#: webapp/templates/kaehmy.html:26
+#: webapp/templates/kaehmy/kaehmy.html:26
 msgid "Päivämääriä & deadlineja"
 msgstr "Päivämääriä & deadlineja"
 
-#: webapp/templates/kaehmy.html:28
+#: webapp/templates/kaehmy/kaehmy.html:28
 msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
 msgstr "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
 
-#: webapp/templates/kaehmy.html:29
+#: webapp/templates/kaehmy/kaehmy.html:29
 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
 msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)"
 
-#: webapp/templates/kaehmy.html:30
+#: webapp/templates/kaehmy/kaehmy.html:30
 msgid "Vaalikokous, osa 2 (hallituksen valinta)"
 msgstr "Vaalikokous, osa 2 (hallituksen valinta)"
 
-#: webapp/templates/kaehmy.html:31
+#: webapp/templates/kaehmy/kaehmy.html:31
 msgid "Kiltailta"
 msgstr "Kiltailta"
 
-#: webapp/templates/kaehmy.html:32
+#: webapp/templates/kaehmy/kaehmy.html:32
 msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!"
 msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!"
 
-#: webapp/templates/kaehmy.html:33
+#: webapp/templates/kaehmy/kaehmy.html:33
 msgid "Vaalikokous, osa 3 (toimarien valinta)"
 msgstr "Vaalikokous, osa 3 (toimarien valinta)"
 
-#: webapp/templates/kaehmy_export.html:9
+#: webapp/templates/kaehmy/kaehmy_export.html:9
 msgid "All applications"
 msgstr "Kaikki kaehmyt"
 
-#: webapp/templates/kaehmy_export.html:13
+#: webapp/templates/kaehmy/kaehmy_export.html:13
 msgid "Board applications"
 msgstr "Hallituskaehmyt"
 
-#: webapp/templates/kaehmy_export.html:18
+#: webapp/templates/kaehmy/kaehmy_export.html:18
 msgid "Non-board applications"
 msgstr "Toimarikaehmyt"
 
-#: webapp/templates/kaehmy_export.html:23
+#: webapp/templates/kaehmy/kaehmy_export.html:23
 msgid "Front page"
 msgstr "Etusivulle"
 
-#: webapp/templates/kaehmy_footer.html:23
+#: webapp/templates/kaehmy/kaehmy_footer.html:23
 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 
-#: webapp/templates/kaehmy_list.html:24 webapp/templates/kaehmy_list.html:59
-msgid "All kaehmys"
-msgstr "Kaikki kaehmyt"
-
-#: webapp/templates/kaehmy_list.html:32
-msgid "Commenting on post by "
-msgstr "Kommentoidaan viestiin lähettäjältä "
-
-#: webapp/templates/kaehmy_list.html:44
-msgid "Comment"
-msgstr "Kommentti"
-
-#: webapp/templates/kaehmy_list.html:57
-msgid "Filter kaehmys"
-msgstr "Rajaa kaehmyjä"
-
-#: webapp/templates/kaehmy_list.html:70
-#: webapp/templates/kaehmy_statistics.html:18
-msgid "Total kaehmys:"
-msgstr "Kaehmyjä yhteensä:"
-
-#: webapp/templates/kaehmy_list.html:88
-msgid "Show comments"
-msgstr "Näytä kommentit"
-
-#: webapp/templates/kaehmy_list.html:94
-msgid "Add comment"
-msgstr "Kommentoi"
-
-#: webapp/templates/kaehmy_message.html:11
+#: webapp/templates/kaehmy/kaehmy_message.html:11
 msgid "Reply"
 msgstr "Vastaa"
 
-#: webapp/templates/kaehmy_navigation.html:6
+#: webapp/templates/kaehmy/kaehmy_navigation.html:6
 msgid "List kaehmys"
 msgstr "Kaikki kaehmyt"
 
-#: webapp/templates/kaehmy_navigation.html:7
+#: webapp/templates/kaehmy/kaehmy_navigation.html:7
 msgid "New kaehmy"
 msgstr "Uusi kaehmy"
 
-#: webapp/templates/kaehmy_navigation.html:8
-#: webapp/templates/kaehmy_statistics.html:13
+#: webapp/templates/kaehmy/kaehmy_navigation.html:8
+#: webapp/templates/kaehmy/kaehmy_statistics.html:13
 msgid "Statistics"
 msgstr "Kaehmytilastot"
 
@@ -1105,22 +1118,30 @@ msgstr "Sössö"
 msgid "Corporate"
 msgstr "Yritys"
 
-#: webapp/templates/ohlhafv.html:8
-msgid "Ohlhafv"
-msgstr "Øhlhäfv"
-
-#: webapp/templates/ohlhafv.html:15
-msgid "Challenge"
-msgstr "Haasta"
-
-#: webapp/templates/ohlhafv_list.html:11
+#: webapp/templates/ohlhafv/list.html:8
 msgid "All challenges"
 msgstr "Kaikki haasteet"
 
-#: webapp/templates/ohlhafv_list.html:15
+#: webapp/templates/ohlhafv/list.html:12
 msgid "Total challenges:"
 msgstr "Haasteita yhteensä:"
 
+#: webapp/templates/ohlhafv/navigation.html:6
+msgid "New challenge"
+msgstr "Uusi haaste"
+
+#: webapp/templates/ohlhafv/navigation.html:7
+msgid "List challenges"
+msgstr "Kaikki haasteet"
+
+#: webapp/templates/ohlhafv/new.html:12
+msgid "Ohlhafv"
+msgstr "Øhlhäfv"
+
+#: webapp/templates/ohlhafv/new.html:19
+msgid "Challenge"
+msgstr "Haasta"
+
 #~ msgid "Infoscreen"
 #~ msgstr "Infonäyttö"
 
diff --git a/webapp/models.py b/webapp/models.py
index d40531f..b2fa897 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -279,7 +279,7 @@ class OhlhafvChallenge(models.Model):
         ('0.33 L', '0.33 L'),
         ('0.5 L', '0.5 L'),
         ('1.0 L', '1.0 L'),
-        (_('Team'), _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)'))
+        (_('Team'), _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)'))
     )
 
     challenger = models.CharField(_('Challenger'), max_length=255)