Merge branch 'feature-ohlhafv' into develop
This commit is contained in:
Aarni Halinen
Binary file not shown.
+128
-76
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-01-24 16:31+0200\n"
|
||||
"POT-Creation-Date: 2018-01-25 20:18+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"
|
||||
|
||||
@@ -822,11 +827,11 @@ msgstr "Kaehmy comment"
|
||||
msgid "Kaehmykommentit"
|
||||
msgstr "Kaehmy comments"
|
||||
|
||||
#: webapp/models.py:162
|
||||
#: webapp/models.py:162 webapp/models.py:290
|
||||
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"
|
||||
|
||||
@@ -886,11 +891,43 @@ msgstr ""
|
||||
msgid "Officials"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:293
|
||||
#: webapp/models.py:275
|
||||
msgid "Ohlhafv challenge"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:276
|
||||
msgid "Ohlhafv challenges"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:282
|
||||
msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:285
|
||||
msgid "Challenger"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:286
|
||||
msgid "Victim"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:287
|
||||
msgid "Challenger email"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:288
|
||||
msgid "Victim email"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:289
|
||||
msgid "Series"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:298
|
||||
msgid "Telegram channel"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/models.py:294
|
||||
#: webapp/models.py:299
|
||||
msgid "Telegram channels"
|
||||
msgstr ""
|
||||
|
||||
@@ -906,6 +943,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"
|
||||
@@ -914,7 +988,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ä "
|
||||
@@ -934,7 +1008,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 "
|
||||
@@ -943,97 +1017,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 ""
|
||||
|
||||
@@ -1046,16 +1091,12 @@ msgid "Are you perhaps looking for one of the following?"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/templates/main_index.html:24
|
||||
#, fuzzy
|
||||
#| msgid "Infoscreen Admin Pane"
|
||||
msgid "Infoscreen admin pane"
|
||||
msgstr "Infoscreen Admin Pane"
|
||||
|
||||
#: webapp/templates/main_index.html:26
|
||||
#, fuzzy
|
||||
#| msgid "Kaehmy application: {}"
|
||||
msgid "Kaehmy application"
|
||||
msgstr "Kaehmy application: {}"
|
||||
msgstr "Kaehmy application"
|
||||
|
||||
#: webapp/templates/navigation.html:6
|
||||
msgid "Guild"
|
||||
@@ -1069,22 +1110,33 @@ 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 "Challenge your foe(s) to combat!"
|
||||
msgstr ""
|
||||
|
||||
#: webapp/templates/ohlhafv/new.html:19
|
||||
msgid "Challenge"
|
||||
msgstr "Challenge"
|
||||
|
||||
#~ msgid "Ohlhafv"
|
||||
#~ msgstr "Øhlhäfv"
|
||||
|
||||
#~ msgid "Infoscreen"
|
||||
#~ msgstr "Infoscreen"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user