diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index c7d77af..73b0712 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 41369e5..6129540 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-25 21:32+0200\n"
+"POT-Creation-Date: 2018-01-30 15:54+0200\n"
"PO-Revision-Date: 2017-11-02 23:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -49,128 +49,391 @@ msgstr "HSL timetables"
msgid "External image"
msgstr "External image"
-#: infoscreen/templates/infoscreen_admin.html:24
-#: members/templates/members_base.html:79
+#: infoscreen/templates/infoscreen_admin.html:10
+msgid "Infoscreen admin"
+msgstr "Infoscreen admin"
+
+#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:79
msgid "Log out"
msgstr "Log out"
-#: infoscreen/templates/infoscreen_admin.html:31
+#: infoscreen/templates/infoscreen_admin.html:33
msgid "Infoscreen Admin Pane"
msgstr "Infoscreen Admin Pane"
-#: infoscreen/templates/infoscreen_admin.html:35
+#: infoscreen/templates/infoscreen_index.html:8
+msgid "Infoscreen"
+msgstr "Infoscreen"
+
+#: infoscreen/templates/nav.html:5
msgid "Manage Slides"
msgstr "Manage Slides"
-#: infoscreen/templates/infoscreen_admin.html:37
+#: infoscreen/templates/nav.html:9
msgid "Manage Rotations"
msgstr "Manage Rotations"
-#: infoscreen/templates/infoscreen_admin.html:41
+#: infoscreen/templates/nav.html:14
msgid "Create/Delete"
msgstr "Create/Delete"
-#: infoscreen/templates/infoscreen_admin.html:48
-msgid "Create new item"
-msgstr "Create new item"
+#: infoscreen/templates/tabs/add_remove.html:5
+msgid "Rotations"
+msgstr "Rotations"
-#: infoscreen/templates/infoscreen_admin.html:49
-msgid "Create a new item by type"
-msgstr "Create a new item by type"
+#: infoscreen/templates/tabs/add_remove.html:7
+msgid "Select rotation to edit"
+msgstr "Select rotation to edit"
-#: infoscreen/templates/infoscreen_admin.html:52
-msgid "Item type"
-msgstr "Item type"
+#: infoscreen/templates/tabs/add_remove.html:11
+#: infoscreen/templates/tabs/rotations.html:28
+msgid "Rotation"
+msgstr "Rotation"
-#: infoscreen/templates/infoscreen_admin.html:63
-#: infoscreen/templates/infoscreen_admin.html:83
-msgid "Info items"
-msgstr "Info items"
+#: infoscreen/templates/tabs/add_remove.html:12
+msgid "id"
+msgstr "id"
-#: infoscreen/templates/infoscreen_admin.html:64
-#: infoscreen/templates/infoscreen_admin.html:84
-msgid "Infoitems available for rotations"
-msgstr "Infoitems available for rotations"
+#: infoscreen/templates/tabs/add_remove.html:13
+#: infoscreen/templates/tabs/add_remove.html:19
+#: infoscreen/templates/tabs/rotations.html:29
+msgid "Preview"
+msgstr "Preview"
-#: infoscreen/templates/infoscreen_admin.html:67
-#: infoscreen/templates/infoscreen_admin.html:87
-msgid "Item"
-msgstr "Item"
-
-#: infoscreen/templates/infoscreen_admin.html:68
-#: infoscreen/templates/infoscreen_admin.html:88
-msgid "Type"
-msgstr "Type"
-
-#: infoscreen/templates/infoscreen_admin.html:69
-#: infoscreen/templates/infoscreen_admin.html:74
-#: infoscreen/templates/infoscreen_admin.html:91
-#: infoscreen/templates/infoscreen_admin.html:98
-#: infoscreen/templates/infoscreen_admin.html:111
-#: infoscreen/templates/infoscreen_admin.html:115
-#: infoscreen/templates/infoscreen_admin.html:131
-#: infoscreen/templates/infoscreen_admin.html:137
+#: infoscreen/templates/tabs/add_remove.html:14
+#: infoscreen/templates/tabs/add_remove.html:20
+#: infoscreen/templates/tabs/rotations.html:13
+#: infoscreen/templates/tabs/rotations.html:20
+#: infoscreen/templates/tabs/rotations.html:36
+#: infoscreen/templates/tabs/rotations.html:40
+#: infoscreen/templates/tabs/slides.html:27
+#: infoscreen/templates/tabs/slides.html:32
#: members/templates/member_edit.html:20 members/templates/payment_edit.html:20
msgid "Delete"
msgstr "Delete"
-#: infoscreen/templates/infoscreen_admin.html:89
-msgid "Set duration"
-msgstr "Set duration"
-
-#: infoscreen/templates/infoscreen_admin.html:90
-msgid "Add to rotation"
-msgstr "Add to rotation"
-
-#: infoscreen/templates/infoscreen_admin.html:97
-msgid "Add"
-msgstr "Add"
-
-#: infoscreen/templates/infoscreen_admin.html:105
-#: infoscreen/templates/infoscreen_admin.html:128
-msgid "Rotation"
-msgstr "Rotation"
-
-#: infoscreen/templates/infoscreen_admin.html:105
-#: infoscreen/templates/infoscreen_admin.html:130
-#: infoscreen/templates/infoscreen_admin.html:136
-msgid "Preview"
-msgstr "Preview"
-
-#: infoscreen/templates/infoscreen_admin.html:106
-msgid "Instances in currently selected rotation"
-msgstr "Instances in currently selected rotation"
-
-#: infoscreen/templates/infoscreen_admin.html:109
-msgid "Instance"
-msgstr "Instance"
-
-#: infoscreen/templates/infoscreen_admin.html:110
-msgid "Duration"
-msgstr "Duration"
-
-#: infoscreen/templates/infoscreen_admin.html:122
-msgid "Rotations"
-msgstr "Rotations"
-
-#: infoscreen/templates/infoscreen_admin.html:124
-msgid "Select rotation to edit"
-msgstr "Select rotation to edit"
-
-#: infoscreen/templates/infoscreen_admin.html:129
-msgid "id"
-msgstr "id"
-
-#: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110
-#: webapp/models.py:143 webapp/templates/form_listAll.html:36
-#: webapp/templates/kaehmy/kaehmy_list.html:36
+#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:39
+#: kaehmy/templates/list.html:36 webapp/models.py:110
msgid "Name"
msgstr "Name"
-#: infoscreen/templates/infoscreen_admin.html:141
+#: infoscreen/templates/tabs/add_remove.html:24
msgid "Create new"
msgstr "Create new"
+#: infoscreen/templates/tabs/rotations.html:5
+#: infoscreen/templates/tabs/slides.html:21
+msgid "Info items"
+msgstr "Info items"
+
+#: infoscreen/templates/tabs/rotations.html:6
+#: infoscreen/templates/tabs/slides.html:22
+msgid "Infoitems available for rotations"
+msgstr "Infoitems available for rotations"
+
+#: infoscreen/templates/tabs/rotations.html:9
+#: infoscreen/templates/tabs/slides.html:25
+msgid "Item"
+msgstr "Item"
+
+#: infoscreen/templates/tabs/rotations.html:10
+#: infoscreen/templates/tabs/slides.html:26
+msgid "Type"
+msgstr "Type"
+
+#: infoscreen/templates/tabs/rotations.html:11
+msgid "Set duration"
+msgstr "Set duration"
+
+#: infoscreen/templates/tabs/rotations.html:12
+msgid "Add to rotation"
+msgstr "Add to rotation"
+
+#: infoscreen/templates/tabs/rotations.html:19
+msgid "Add"
+msgstr "Add"
+
+#: infoscreen/templates/tabs/rotations.html:31
+msgid "Instances in currently selected rotation"
+msgstr "Instances in currently selected rotation"
+
+#: infoscreen/templates/tabs/rotations.html:34
+msgid "Instance"
+msgstr "Instance"
+
+#: infoscreen/templates/tabs/rotations.html:35
+msgid "Duration"
+msgstr "Duration"
+
+#: infoscreen/templates/tabs/slides.html:6
+msgid "Create new item"
+msgstr "Create new item"
+
+#: infoscreen/templates/tabs/slides.html:7
+msgid "Create a new item by type"
+msgstr "Create a new item by type"
+
+#: infoscreen/templates/tabs/slides.html:10
+msgid "Item type"
+msgstr "Item type"
+
+#: kaehmy/forms.py:36
+msgid "Email (not public)"
+msgstr "Email (not public)"
+
+#: kaehmy/forms.py:37
+msgid "Phone number (not public)"
+msgstr "Phone number (not public)"
+
+#: kaehmy/forms.py:42
+msgid "Custom roles"
+msgstr "Custom roles"
+
+#: kaehmy/forms.py:50 kaehmy/templates/kaehmy.html:41
+msgid "Preset roles"
+msgstr "Preset roles"
+
+#: kaehmy/forms.py:72
+msgid "Invalid phone number"
+msgstr "Invalid phone number"
+
+#: kaehmy/forms.py:80
+msgid "Custom role with the same name already exists."
+msgstr "Custom role with the same name already exists."
+
+#: kaehmy/models.py:18
+msgid "Kaehmy"
+msgstr "Kaehmy"
+
+#: kaehmy/models.py:25
+msgid "Preset kaehmy role"
+msgstr "Preset kaehmy role"
+
+#: kaehmy/models.py:26
+msgid "Preset kaehmy roles"
+msgstr "Preset kaehmy roles"
+
+#: kaehmy/models.py:33
+msgid "Custom kaehmy role"
+msgstr "Custom kaehmy role"
+
+#: kaehmy/models.py:34
+msgid "Custom kaehmy roles"
+msgstr "Custom kaehmy roles"
+
+#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:16
+msgid "Email"
+msgstr "Email"
+
+#: kaehmy/models.py:41
+msgid "Timestamp"
+msgstr ""
+
+#: kaehmy/models.py:55
+msgid "Kaehmykommentti"
+msgstr "Kaehmy comment"
+
+#: kaehmy/models.py:56
+msgid "Kaehmykommentit"
+msgstr "Kaehmy comments"
+
+#: kaehmy/models.py:58 ohlhafv/models.py:38
+msgid "Message"
+msgstr ""
+
+#: kaehmy/models.py:77 kaehmy/templates/kaehmy.html:12
+msgid "Kaehmylomake"
+msgstr "Kaehmy application"
+
+#: kaehmy/models.py:78
+msgid "Kaehmylomakkeet"
+msgstr "Kaehmy applications"
+
+#: kaehmy/models.py:81 webapp/models.py:153
+msgid "Phone number"
+msgstr ""
+
+#: kaehmy/models.py:82
+msgid "Year"
+msgstr ""
+
+#: kaehmy/models.py:83
+msgid "Text"
+msgstr ""
+
+#: kaehmy/models.py:85
+msgid "Custom role name"
+msgstr ""
+
+#: kaehmy/models.py:87 webapp/models.py:111
+msgid "Board member"
+msgstr "Board member"
+
+#: kaehmy/models.py:95
+msgid "Kaehmy application: {}"
+msgstr "Kaehmy application: {}"
+
+#: kaehmy/models.py:117
+msgid "Board: {}"
+msgstr ""
+
+#: kaehmy/models.py:123
+msgid "Official: {}"
+msgstr ""
+
+#: kaehmy/models.py:140
+msgid "Telegram channel"
+msgstr ""
+
+#: kaehmy/models.py:141
+msgid "Telegram channels"
+msgstr ""
+
+#: kaehmy/tables.py:13 webapp/models.py:137
+msgid "Roles"
+msgstr ""
+
+#: kaehmy/templates/error.html:8 templates/error.html:8
+msgid "Error"
+msgstr "Error"
+
+#: kaehmy/templates/error.html:15 templates/error.html:15
+msgid "Back"
+msgstr "Back"
+
+#: kaehmy/templates/export.html:9
+msgid "All applications"
+msgstr "All applications"
+
+#: kaehmy/templates/export.html:13
+msgid "Board applications"
+msgstr "Board applications"
+
+#: kaehmy/templates/export.html:18
+msgid "Non-board applications"
+msgstr "Non-board applications"
+
+#: kaehmy/templates/export.html:23
+msgid "Front page"
+msgstr ""
+
+#: kaehmy/templates/footer.html:23 ohlhafv/templates/footer.html:23
+#: webapp/templates/footer.html:23
+msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
+msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
+
+#: kaehmy/templates/kaehmy.html:16
+msgid ""
+"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
+" Listassa on vastuualueittain sekä hallitus- että "
+"toimihenkilövirkoja.\n"
+" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan "
+"uutta toimenkuvaa.\n"
+" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa "
+"konsultoida kaehmyopasta \n"
+" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
+"henkilöön."
+msgstr ""
+"Express your interest in the guild for the next year.\n"
+"This list contains both board and non-board positions, categorized by area "
+"of responsibility.\n"
+"If you have anything to ask about the positions, seek out people who have "
+"held that position before or contact the board.\n"
+"Best positions to consider for English speaking people are in the "
+"International category."
+
+#: kaehmy/templates/kaehmy.html:23
+msgid ""
+"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
+" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
+"tehtävään!"
+msgstr ""
+"Note, that sending an application is not binding and should be considered as "
+"a gesture of interest."
+
+#: kaehmy/templates/kaehmy.html:26
+msgid "Päivämääriä & deadlineja"
+msgstr "Dates and deadlines"
+
+#: kaehmy/templates/kaehmy.html:28
+msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
+msgstr "Board panel discussion (applications to the board before this date!)"
+
+#: kaehmy/templates/kaehmy.html:29
+msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
+msgstr "Election meeting, part 1 (chairman election)"
+
+#: kaehmy/templates/kaehmy.html:30
+msgid "Vaalikokous, osa 2 (hallituksen valinta)"
+msgstr "Election meeting, part 2 (board election)"
+
+#: kaehmy/templates/kaehmy.html:31
+msgid "Kiltailta"
+msgstr "Guild night"
+
+#: kaehmy/templates/kaehmy.html:32
+msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!"
+msgstr "Deadline to apply as a non-board official!"
+
+#: kaehmy/templates/kaehmy.html:33
+msgid "Vaalikokous, osa 3 (toimarien valinta)"
+msgstr "Election meeting, part 3 (non-board election)"
+
+#: kaehmy/templates/kaehmy.html:77 members/templates/settings.html:23
+msgid "Submit"
+msgstr "Submit"
+
+#: kaehmy/templates/list.html:24 kaehmy/templates/list.html:59
+msgid "All kaehmys"
+msgstr "All applications"
+
+#: kaehmy/templates/list.html:32
+msgid "Commenting on post by "
+msgstr ""
+
+#: kaehmy/templates/list.html:44
+msgid "Comment"
+msgstr ""
+
+#: kaehmy/templates/list.html:48 members/templates/application_index.html:15
+#: members/templates/member_add_many.html:55
+#: members/templates/member_add_many_confirm.html:22
+#: templates/password_reset/recovery_form.html:10
+msgid "Send"
+msgstr "Send"
+
+#: kaehmy/templates/list.html:57
+msgid "Filter kaehmys"
+msgstr "Filter kaehmys"
+
+#: kaehmy/templates/list.html:70 kaehmy/templates/statistics.html:18
+msgid "Total kaehmys:"
+msgstr "Total applications:"
+
+#: kaehmy/templates/list.html:88
+msgid "Show comments"
+msgstr ""
+
+#: kaehmy/templates/list.html:94
+msgid "Add comment"
+msgstr ""
+
+#: kaehmy/templates/message.html:11
+msgid "Reply"
+msgstr ""
+
+#: kaehmy/templates/navigation.html:7
+msgid "List kaehmys"
+msgstr "List applications"
+
+#: kaehmy/templates/navigation.html:8
+msgid "New kaehmy"
+msgstr "New application"
+
+#: kaehmy/templates/navigation.html:9 kaehmy/templates/statistics.html:13
+msgid "Statistics"
+msgstr ""
+
#: members/forms.py:107 members/models.py:103 members/tables.py:32
msgid "Member"
msgstr "Member"
@@ -191,12 +454,6 @@ msgstr "First name"
msgid "Last name"
msgstr "Last name"
-#: members/models.py:16 webapp/models.py:144
-#: webapp/templates/form_listAll.html:40
-#: webapp/templates/kaehmy/kaehmy_list.html:40
-msgid "Email"
-msgstr "Email"
-
#: members/models.py:17
msgid "Place of residence"
msgstr "Place of residence"
@@ -234,8 +491,8 @@ msgstr "Bank transfer"
msgid "Created"
msgstr "Created"
-#: members/models.py:104 members/templates/member_add_many_confirm.html:12
-#: members/templates/members_base.html:52
+#: members/models.py:104 members/templates/base.html:52
+#: members/templates/member_add_many_confirm.html:12
msgid "Members"
msgstr "Members"
@@ -269,27 +526,18 @@ msgstr "Accept"
msgid "Decline"
msgstr "Decline"
-#: members/templates/application_index.html:8
+#: members/templates/application_index.html:7
msgid "Killan jäseneksi liittyminen on helppoa ja hauskaa!"
msgstr "Joining the guild is fun and games!"
-#: members/templates/application_index.html:9
+#: members/templates/application_index.html:8
msgid "Täytä vain alla oleva lomake"
msgstr "Just fill the form below."
-#: members/templates/application_index.html:10
+#: members/templates/application_index.html:9
msgid "Muista myös maksaa jäsenmaksusi!"
msgstr "Don't forget to pay your membership fee!"
-#: members/templates/application_index.html:16
-#: members/templates/member_add_many.html:55
-#: members/templates/member_add_many_confirm.html:22
-#: templates/password_reset/recovery_form.html:10
-#: webapp/templates/form_listAll.html:48
-#: webapp/templates/kaehmy/kaehmy_list.html:48
-msgid "Send"
-msgstr "Send"
-
#: members/templates/application_list.html:8
msgid "Member applications"
msgstr "Member applications"
@@ -307,10 +555,56 @@ msgstr "Amazing! Your membership application has been sent."
msgid "Takaisin Sähköinsinöörikillan web-sivuille"
msgstr "Back to the front page"
-#: members/templates/member_add.html:8 members/templates/members_base.html:55
+#: members/templates/base.html:15 members/templates/member_list.html:11
+#: webapp/templates/index.html:25
+msgid "Member register"
+msgstr "Member register"
+
+#: members/templates/base.html:33 members/templates/base.html:42
+msgid "Member register of SIK ry"
+msgstr "Member register of SIK ry"
+
+#: members/templates/base.html:54
+msgid "List members"
+msgstr "List members"
+
+#: members/templates/base.html:55 members/templates/member_add.html:8
msgid "Add member"
msgstr "Add member"
+#: members/templates/base.html:56
+msgid "Add multiple"
+msgstr "Add multiple"
+
+#: members/templates/base.html:60
+#: members/templates/member_add_many_confirm.html:16
+msgid "Payments"
+msgstr "Payments"
+
+#: members/templates/base.html:62
+msgid "List payments"
+msgstr "List payments"
+
+#: members/templates/base.html:63 members/templates/payment_add.html:13
+msgid "Add payment"
+msgstr "Add payment"
+
+#: members/templates/base.html:67
+msgid "Applications"
+msgstr "Applications"
+
+#: members/templates/base.html:69
+msgid "List applications"
+msgstr "List applications"
+
+#: members/templates/base.html:70
+msgid "Application form"
+msgstr "Application form"
+
+#: members/templates/base.html:75 members/templates/settings.html:11
+msgid "Settings"
+msgstr "Settings"
+
#: members/templates/member_add.html:15 members/templates/member_edit.html:18
#: members/templates/payment_add.html:20 members/templates/payment_edit.html:18
msgid "Save"
@@ -388,11 +682,6 @@ msgstr ""
msgid "Confirm adding these entries?"
msgstr "Confirm adding these entries?"
-#: members/templates/member_add_many_confirm.html:16
-#: members/templates/members_base.html:60
-msgid "Payments"
-msgstr "Payments"
-
#: members/templates/member_delete_confirm.html:9
msgid "Are you sure you want to delete this member?"
msgstr "Are you sure you want to delete this member?"
@@ -401,11 +690,6 @@ msgstr "Are you sure you want to delete this member?"
msgid "Edit member"
msgstr "Edit member"
-#: members/templates/member_list.html:11 members/templates/members_base.html:15
-#: webapp/templates/main_index.html:25
-msgid "Member register"
-msgstr "Member register"
-
#: members/templates/member_list.html:21
msgid "Members in register:"
msgstr "Members in register:"
@@ -418,43 +702,6 @@ msgstr "Search"
msgid "Showing results for"
msgstr "Showing results for"
-#: members/templates/members_base.html:33
-#: members/templates/members_base.html:42
-msgid "Member register of SIK ry"
-msgstr "Member register of SIK ry"
-
-#: members/templates/members_base.html:54
-msgid "List members"
-msgstr "List members"
-
-#: members/templates/members_base.html:56
-msgid "Add multiple"
-msgstr "Add multiple"
-
-#: members/templates/members_base.html:62
-msgid "List payments"
-msgstr "List payments"
-
-#: members/templates/members_base.html:63 members/templates/payment_add.html:13
-msgid "Add payment"
-msgstr "Add payment"
-
-#: members/templates/members_base.html:67
-msgid "Applications"
-msgstr "Applications"
-
-#: members/templates/members_base.html:69
-msgid "List applications"
-msgstr "List applications"
-
-#: members/templates/members_base.html:70
-msgid "Application form"
-msgstr "Application form"
-
-#: members/templates/members_base.html:75 members/templates/settings.html:11
-msgid "Settings"
-msgstr "Settings"
-
#: members/templates/payment_delete_confirm.html:9
msgid "Are you sure you want to delete this payment?"
msgstr "Are you sure you want to delete this payment?"
@@ -475,18 +722,14 @@ msgstr "Payments in register:"
msgid "Language"
msgstr "Language"
-#: members/templates/settings.html:20 sikweb/base.py:226
+#: members/templates/settings.html:20 sikweb/base.py:232
msgid "Finnish"
msgstr "Finnish"
-#: members/templates/settings.html:21 sikweb/base.py:227
+#: members/templates/settings.html:21 sikweb/base.py:233
msgid "English"
msgstr "English"
-#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77
-msgid "Submit"
-msgstr "Submit"
-
#: members/views/applications.py:51 members/views/applications.py:112
#: members/views/applications.py:137
msgid "No application id specified"
@@ -571,38 +814,116 @@ msgstr "Could not update payment object"
msgid "Missing CSV file"
msgstr "Missing CSV file"
+#: ohlhafv/models.py:16
+msgid "Ohlhafv"
+msgstr "Øhlhäfv"
+
+#: ohlhafv/models.py:23
+msgid "Ohlhafv challenge"
+msgstr ""
+
+#: ohlhafv/models.py:24
+msgid "Ohlhafv challenges"
+msgstr ""
+
+#: ohlhafv/models.py:30
+msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)"
+msgstr ""
+
+#: ohlhafv/models.py:33
+msgid "Challenger"
+msgstr ""
+
+#: ohlhafv/models.py:34
+msgid "Victim"
+msgstr ""
+
+#: ohlhafv/models.py:35
+msgid "Challenger email"
+msgstr ""
+
+#: ohlhafv/models.py:36
+msgid "Victim email"
+msgstr ""
+
+#: ohlhafv/models.py:37
+msgid "Series"
+msgstr ""
+
+#: ohlhafv/models.py:42
+msgid "Ohlhafv challenge: {} vs. {}"
+msgstr ""
+
+#: ohlhafv/templates/email.html:2
+msgid "Moikka"
+msgstr "Hi"
+
+#: ohlhafv/templates/email.html:4
+msgid "on haastanut sinut oluenjuontimittelöön"
+msgstr "has challenged you to a beer drinking contest"
+
+#: ohlhafv/templates/email.html:4
+msgid "-sarjassa"
+msgstr "series"
+
+#: ohlhafv/templates/email.html:6
+msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3"
+msgstr "Remeber to confirm the challenge at Smökki on Thursday 15.3. at the event"
+
+#: ohlhafv/templates/email.html:8
+msgid "Käy kurkkaamassa muutkin haasteet osoitteessa"
+msgstr "Also go and check other challenges at"
+
+#: ohlhafv/templates/list.html:8
+msgid "All challenges"
+msgstr "All challenges"
+
+#: ohlhafv/templates/list.html:12
+msgid "Total challenges:"
+msgstr "Total challenges:"
+
+#: ohlhafv/templates/navigation.html:5
+msgid "New challenge"
+msgstr ""
+
+#: ohlhafv/templates/navigation.html:6
+msgid "List challenges"
+msgstr "All challenges"
+
+#: ohlhafv/templates/new.html:12
+msgid "Challenge your foe(s) to combat!"
+msgstr ""
+
+#: ohlhafv/templates/new.html:19
+msgid "Challenge"
+msgstr "Challenge"
+
+#: ohlhafv/views.py:43
+msgid "Sinut on haastettu Øhlhäfviin!"
+msgstr "You have been challenged at Ohlhafv!"
+
#: templates/admin/base_site.html:43
msgid "Go"
msgstr "Go"
-#: templates/base.html:14 templates/footer.html:10
-#: webapp/templates/form_base.html:14
-#: webapp/templates/kaehmy/kaehmy_base.html:14
-#: webapp/templates/main_index.html:9
+#: templates/footer.html:10 templates/project.html:15
+#: webapp/templates/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/kaehmy_error.html:8
-msgid "Error"
-msgstr "Error"
-
-#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15
-msgid "Back"
-msgstr "Back"
-
-#: templates/login.html:8 templates/login.html:9
+#: templates/login.html:12 templates/login.html:13
msgid "Username"
msgstr "Username"
-#: templates/login.html:12 templates/login.html:13
+#: templates/login.html:16 templates/login.html:17
msgid "Password"
msgstr "Password"
-#: templates/login.html:16
+#: templates/login.html:20
msgid "Forgot password?"
msgstr "Forgot password?"
-#: templates/login.html:22
+#: templates/login.html:26
msgid "Log in"
msgstr "Log in"
@@ -653,30 +974,6 @@ msgstr ""
"An email was sent to %(email)s %(ago)s ago. Use the link in "
"it to set a new password."
-#: webapp/forms.py:38
-msgid "Email (not public)"
-msgstr "Email (not public)"
-
-#: webapp/forms.py:39
-msgid "Phone number (not public)"
-msgstr "Phone number (not public)"
-
-#: webapp/forms.py:44
-msgid "Custom roles"
-msgstr "Custom roles"
-
-#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41
-msgid "Preset roles"
-msgstr "Preset roles"
-
-#: webapp/forms.py:76
-msgid "Invalid phone number"
-msgstr "Invalid phone number"
-
-#: webapp/forms.py:84
-msgid "Custom role with the same name already exists."
-msgstr "Custom role with the same name already exists."
-
#: webapp/models.py:17
msgid "Webapp"
msgstr "Webapp"
@@ -783,10 +1080,6 @@ msgstr "Alumni relations"
msgid "Others"
msgstr ""
-#: webapp/models.py:111 webapp/models.py:191
-msgid "Board member"
-msgstr "Board member"
-
#: webapp/models.py:112
msgid "Category"
msgstr ""
@@ -799,146 +1092,26 @@ msgstr "board member"
msgid "Description"
msgstr "Description"
-#: webapp/models.py:129
-msgid "Preset kaehmy role"
-msgstr "Preset kaehmy role"
-
-#: webapp/models.py:130
-msgid "Preset kaehmy roles"
-msgstr "Preset kaehmy roles"
-
-#: webapp/models.py:137
-msgid "Custom kaehmy role"
-msgstr "Custom kaehmy role"
-
-#: webapp/models.py:138
-msgid "Custom kaehmy roles"
-msgstr "Custom kaehmy roles"
-
-#: webapp/models.py:145
-msgid "Timestamp"
-msgstr ""
-
-#: webapp/models.py:159
-msgid "Kaehmykommentti"
-msgstr "Kaehmy comment"
-
-#: webapp/models.py:160
-msgid "Kaehmykommentit"
-msgstr "Kaehmy comments"
-
-#: webapp/models.py:162 webapp/models.py:290
-msgid "Message"
-msgstr ""
-
-#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12
-msgid "Kaehmylomake"
-msgstr "Kaehmy application"
-
-#: webapp/models.py:182
-msgid "Kaehmylomakkeet"
-msgstr "Kaehmy applications"
-
-#: webapp/models.py:185 webapp/models.py:267
-msgid "Phone number"
-msgstr ""
-
-#: webapp/models.py:186
-msgid "Year"
-msgstr ""
-
-#: webapp/models.py:187
-msgid "Text"
-msgstr ""
-
-#: webapp/models.py:189
-msgid "Custom role name"
-msgstr ""
-
-#: webapp/models.py:199
-msgid "Kaehmy application: {}"
-msgstr "Kaehmy application: {}"
-
-#: webapp/models.py:221
-msgid "Board: {}"
-msgstr ""
-
-#: webapp/models.py:227
-msgid "Official: {}"
-msgstr ""
-
-#: webapp/models.py:250
+#: webapp/models.py:136
msgid "Role"
msgstr ""
-#: webapp/models.py:251 webapp/tables.py:18
-msgid "Roles"
-msgstr ""
-
-#: webapp/models.py:253
+#: webapp/models.py:139
msgid "Start date"
msgstr ""
-#: webapp/models.py:254
+#: webapp/models.py:140
msgid "End date"
msgstr ""
-#: webapp/models.py:264
+#: webapp/models.py:150
msgid "Official"
msgstr ""
-#: webapp/models.py:265
+#: webapp/models.py:151
msgid "Officials"
msgstr ""
-#: 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:294
-msgid "Ohlhafv challenge: {} vs. {}"
-msgstr ""
-
-#: webapp/models.py:302
-msgid "Telegram channel"
-msgstr ""
-
-#: webapp/models.py:303
-msgid "Telegram channels"
-msgstr ""
-
-#: webapp/templates/admin_index.html:6
-msgid "SIK Admin"
-msgstr "SIK Admin"
-
#: webapp/templates/contact.html:10 webapp/templates/navigation.html:21
msgid "Contact"
msgstr "Contact"
@@ -947,161 +1120,30 @@ 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"
-#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28
-msgid "Jobs"
-msgstr "Jobs"
-
-#: webapp/templates/kaehmy/kaehmy.html:16
-msgid ""
-"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
-" Listassa on vastuualueittain sekä hallitus- että "
-"toimihenkilövirkoja.\n"
-" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan "
-"uutta toimenkuvaa.\n"
-" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa "
-"konsultoida kaehmyopasta \n"
-" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
-"henkilöön."
-msgstr ""
-"Express your interest in the guild for the next year.\n"
-"This list contains both board and non-board positions, categorized by area "
-"of responsibility.\n"
-"If you have anything to ask about the positions, seek out people who have "
-"held that position before or contact the board.\n"
-"Best positions to consider for English speaking people are in the "
-"International category."
-
-#: 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 "
-"tehtävään!"
-msgstr ""
-"Note, that sending an application is not binding and should be considered as "
-"a gesture of interest."
-
-#: webapp/templates/kaehmy/kaehmy.html:26
-msgid "Päivämääriä & deadlineja"
-msgstr "Dates and deadlines"
-
-#: 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/kaehmy.html:29
-msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
-msgstr "Election meeting, part 1 (chairman election)"
-
-#: webapp/templates/kaehmy/kaehmy.html:30
-msgid "Vaalikokous, osa 2 (hallituksen valinta)"
-msgstr "Election meeting, part 2 (board election)"
-
-#: webapp/templates/kaehmy/kaehmy.html:31
-msgid "Kiltailta"
-msgstr "Guild night"
-
-#: 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/kaehmy.html:33
-msgid "Vaalikokous, osa 3 (toimarien valinta)"
-msgstr "Election meeting, part 3 (non-board election)"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:9
-msgid "All applications"
-msgstr "All applications"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:13
-msgid "Board applications"
-msgstr "Board applications"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:18
-msgid "Non-board applications"
-msgstr "Non-board applications"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:23
-msgid "Front page"
-msgstr ""
-
-#: 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/kaehmy_message.html:11
-msgid "Reply"
-msgstr ""
-
-#: webapp/templates/kaehmy/kaehmy_navigation.html:6
-msgid "List kaehmys"
-msgstr "List applications"
-
-#: webapp/templates/kaehmy/kaehmy_navigation.html:7
-msgid "New kaehmy"
-msgstr "New application"
-
-#: webapp/templates/kaehmy/kaehmy_navigation.html:8
-#: webapp/templates/kaehmy/kaehmy_statistics.html:13
-msgid "Statistics"
-msgstr ""
-
-#: webapp/templates/main_index.html:14
+#: webapp/templates/index.html:14
msgid "This site is not yet ready."
msgstr ""
-#: webapp/templates/main_index.html:19
+#: webapp/templates/index.html:19
msgid "Are you perhaps looking for one of the following?"
msgstr ""
-#: webapp/templates/main_index.html:24
+#: webapp/templates/index.html:24
msgid "Infoscreen admin pane"
msgstr "Infoscreen Admin Pane"
-#: webapp/templates/main_index.html:26
+#: webapp/templates/index.html:26
msgid "Kaehmy application"
msgstr "Kaehmy application"
+#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28
+msgid "Jobs"
+msgstr "Jobs"
+
#: webapp/templates/navigation.html:6
msgid "Guild"
msgstr "Guild"
@@ -1114,35 +1156,8 @@ msgstr "Sössö"
msgid "Corporate"
msgstr "Corporate"
-#: webapp/templates/ohlhafv/list.html:8
-msgid "All challenges"
-msgstr "All challenges"
-
-#: 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"
+#~ msgid "SIK Admin"
+#~ msgstr "SIK Admin"
#~ msgid "Admin tools"
#~ msgstr "Admin tools"
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index a6cc859..4d7e2c0 100644
Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index a2c3441..25e2c60 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-25 21:32+0200\n"
+"POT-Creation-Date: 2018-01-30 15:54+0200\n"
"PO-Revision-Date: 2017-11-02 23:04+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -50,128 +50,398 @@ msgstr "HSL-aikataulut"
msgid "External image"
msgstr "Ulkoinen kuva"
-#: infoscreen/templates/infoscreen_admin.html:24
-#: members/templates/members_base.html:79
+#: infoscreen/templates/infoscreen_admin.html:10
+#, fuzzy
+#| msgid "Infoscreen admin pane"
+msgid "Infoscreen admin"
+msgstr "Infonäyttöjen hallintapaneeli"
+
+#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:79
msgid "Log out"
msgstr "Kirjaudu ulos"
-#: infoscreen/templates/infoscreen_admin.html:31
+#: infoscreen/templates/infoscreen_admin.html:33
msgid "Infoscreen Admin Pane"
msgstr "Infonäyttöjen hallintapaneeli"
-#: infoscreen/templates/infoscreen_admin.html:35
+#: infoscreen/templates/infoscreen_index.html:8
+msgid "Infoscreen"
+msgstr "Infonäyttö"
+
+#: infoscreen/templates/nav.html:5
msgid "Manage Slides"
msgstr "Hallinnoi dioja"
-#: infoscreen/templates/infoscreen_admin.html:37
+#: infoscreen/templates/nav.html:9
msgid "Manage Rotations"
msgstr "Hallinnoi Rotaatioita"
-#: infoscreen/templates/infoscreen_admin.html:41
+#: infoscreen/templates/nav.html:14
msgid "Create/Delete"
msgstr "Lisää/Poista"
-#: infoscreen/templates/infoscreen_admin.html:48
-msgid "Create new item"
-msgstr "Luo uusi dia"
+#: infoscreen/templates/tabs/add_remove.html:5
+msgid "Rotations"
+msgstr "Rotaatiot"
-#: infoscreen/templates/infoscreen_admin.html:49
-msgid "Create a new item by type"
-msgstr "Luo uusi dia tyypin perusteella"
+#: infoscreen/templates/tabs/add_remove.html:7
+msgid "Select rotation to edit"
+msgstr "Valitse muokattava rotaatio"
-#: infoscreen/templates/infoscreen_admin.html:52
-msgid "Item type"
-msgstr "Diatyyppi"
+#: infoscreen/templates/tabs/add_remove.html:11
+#: infoscreen/templates/tabs/rotations.html:28
+msgid "Rotation"
+msgstr "Rotaatio"
-#: infoscreen/templates/infoscreen_admin.html:63
-#: infoscreen/templates/infoscreen_admin.html:83
-msgid "Info items"
-msgstr "Diat"
+#: infoscreen/templates/tabs/add_remove.html:12
+msgid "id"
+msgstr "id"
-#: infoscreen/templates/infoscreen_admin.html:64
-#: infoscreen/templates/infoscreen_admin.html:84
-msgid "Infoitems available for rotations"
-msgstr "Rotaatioon lisättävät diat"
+#: infoscreen/templates/tabs/add_remove.html:13
+#: infoscreen/templates/tabs/add_remove.html:19
+#: infoscreen/templates/tabs/rotations.html:29
+msgid "Preview"
+msgstr "Esikatsele"
-#: infoscreen/templates/infoscreen_admin.html:67
-#: infoscreen/templates/infoscreen_admin.html:87
-msgid "Item"
-msgstr "Dia"
-
-#: infoscreen/templates/infoscreen_admin.html:68
-#: infoscreen/templates/infoscreen_admin.html:88
-msgid "Type"
-msgstr "Tyyppi"
-
-#: infoscreen/templates/infoscreen_admin.html:69
-#: infoscreen/templates/infoscreen_admin.html:74
-#: infoscreen/templates/infoscreen_admin.html:91
-#: infoscreen/templates/infoscreen_admin.html:98
-#: infoscreen/templates/infoscreen_admin.html:111
-#: infoscreen/templates/infoscreen_admin.html:115
-#: infoscreen/templates/infoscreen_admin.html:131
-#: infoscreen/templates/infoscreen_admin.html:137
+#: infoscreen/templates/tabs/add_remove.html:14
+#: infoscreen/templates/tabs/add_remove.html:20
+#: infoscreen/templates/tabs/rotations.html:13
+#: infoscreen/templates/tabs/rotations.html:20
+#: infoscreen/templates/tabs/rotations.html:36
+#: infoscreen/templates/tabs/rotations.html:40
+#: infoscreen/templates/tabs/slides.html:27
+#: infoscreen/templates/tabs/slides.html:32
#: members/templates/member_edit.html:20 members/templates/payment_edit.html:20
msgid "Delete"
msgstr "Poista"
-#: infoscreen/templates/infoscreen_admin.html:89
-msgid "Set duration"
-msgstr "Aseta kesto"
-
-#: infoscreen/templates/infoscreen_admin.html:90
-msgid "Add to rotation"
-msgstr "Lisää rotaatioon"
-
-#: infoscreen/templates/infoscreen_admin.html:97
-msgid "Add"
-msgstr "Lisää"
-
-#: infoscreen/templates/infoscreen_admin.html:105
-#: infoscreen/templates/infoscreen_admin.html:128
-msgid "Rotation"
-msgstr "Rotaatio"
-
-#: infoscreen/templates/infoscreen_admin.html:105
-#: infoscreen/templates/infoscreen_admin.html:130
-#: infoscreen/templates/infoscreen_admin.html:136
-msgid "Preview"
-msgstr "Esikatsele"
-
-#: infoscreen/templates/infoscreen_admin.html:106
-msgid "Instances in currently selected rotation"
-msgstr "Nykyisen rotaation diat"
-
-#: infoscreen/templates/infoscreen_admin.html:109
-msgid "Instance"
-msgstr "Dia"
-
-#: infoscreen/templates/infoscreen_admin.html:110
-msgid "Duration"
-msgstr "Kesto"
-
-#: infoscreen/templates/infoscreen_admin.html:122
-msgid "Rotations"
-msgstr "Rotaatiot"
-
-#: infoscreen/templates/infoscreen_admin.html:124
-msgid "Select rotation to edit"
-msgstr "Valitse muokattava rotaatio"
-
-#: infoscreen/templates/infoscreen_admin.html:129
-msgid "id"
-msgstr "id"
-
-#: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110
-#: webapp/models.py:143 webapp/templates/form_listAll.html:36
-#: webapp/templates/kaehmy/kaehmy_list.html:36
+#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:39
+#: kaehmy/templates/list.html:36 webapp/models.py:110
msgid "Name"
msgstr "Nimi"
-#: infoscreen/templates/infoscreen_admin.html:141
+#: infoscreen/templates/tabs/add_remove.html:24
msgid "Create new"
msgstr "Luo uusi"
+#: infoscreen/templates/tabs/rotations.html:5
+#: infoscreen/templates/tabs/slides.html:21
+msgid "Info items"
+msgstr "Diat"
+
+#: infoscreen/templates/tabs/rotations.html:6
+#: infoscreen/templates/tabs/slides.html:22
+msgid "Infoitems available for rotations"
+msgstr "Rotaatioon lisättävät diat"
+
+#: infoscreen/templates/tabs/rotations.html:9
+#: infoscreen/templates/tabs/slides.html:25
+msgid "Item"
+msgstr "Dia"
+
+#: infoscreen/templates/tabs/rotations.html:10
+#: infoscreen/templates/tabs/slides.html:26
+msgid "Type"
+msgstr "Tyyppi"
+
+#: infoscreen/templates/tabs/rotations.html:11
+msgid "Set duration"
+msgstr "Aseta kesto"
+
+#: infoscreen/templates/tabs/rotations.html:12
+msgid "Add to rotation"
+msgstr "Lisää rotaatioon"
+
+#: infoscreen/templates/tabs/rotations.html:19
+msgid "Add"
+msgstr "Lisää"
+
+#: infoscreen/templates/tabs/rotations.html:31
+msgid "Instances in currently selected rotation"
+msgstr "Nykyisen rotaation diat"
+
+#: infoscreen/templates/tabs/rotations.html:34
+msgid "Instance"
+msgstr "Dia"
+
+#: infoscreen/templates/tabs/rotations.html:35
+msgid "Duration"
+msgstr "Kesto"
+
+#: infoscreen/templates/tabs/slides.html:6
+msgid "Create new item"
+msgstr "Luo uusi dia"
+
+#: infoscreen/templates/tabs/slides.html:7
+msgid "Create a new item by type"
+msgstr "Luo uusi dia tyypin perusteella"
+
+#: infoscreen/templates/tabs/slides.html:10
+msgid "Item type"
+msgstr "Diatyyppi"
+
+#: kaehmy/forms.py:36
+msgid "Email (not public)"
+msgstr "Sähköposti (ei julkinen)"
+
+#: kaehmy/forms.py:37
+msgid "Phone number (not public)"
+msgstr "Puhelinnumero (ei julkinen)"
+
+#: kaehmy/forms.py:42
+msgid "Custom roles"
+msgstr "Uudet virat"
+
+#: kaehmy/forms.py:50 kaehmy/templates/kaehmy.html:41
+msgid "Preset roles"
+msgstr "Kaehmyvirat"
+
+#: kaehmy/forms.py:72
+msgid "Invalid phone number"
+msgstr "Virheellinen puhelinnumero"
+
+#: kaehmy/forms.py:80
+msgid "Custom role with the same name already exists."
+msgstr "Samanniminen virka on jo olemassa."
+
+#: kaehmy/models.py:18
+#, fuzzy
+#| msgid "Kaehmylomake"
+msgid "Kaehmy"
+msgstr "Kaehmylomake"
+
+#: kaehmy/models.py:25
+msgid "Preset kaehmy role"
+msgstr "Kaehmyvirka"
+
+#: kaehmy/models.py:26
+msgid "Preset kaehmy roles"
+msgstr "Kaehmyvirat"
+
+#: kaehmy/models.py:33
+msgid "Custom kaehmy role"
+msgstr "Uusi virka"
+
+#: kaehmy/models.py:34
+msgid "Custom kaehmy roles"
+msgstr "Uudet kaehmyvirat"
+
+#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:16
+msgid "Email"
+msgstr "Sähköposti"
+
+#: kaehmy/models.py:41
+msgid "Timestamp"
+msgstr "Aikaleima"
+
+#: kaehmy/models.py:55
+msgid "Kaehmykommentti"
+msgstr "Kaehmykommentti"
+
+#: kaehmy/models.py:56
+msgid "Kaehmykommentit"
+msgstr "Kaehmykommentit"
+
+#: kaehmy/models.py:58 ohlhafv/models.py:38
+msgid "Message"
+msgstr "Viesti"
+
+#: kaehmy/models.py:77 kaehmy/templates/kaehmy.html:12
+msgid "Kaehmylomake"
+msgstr "Kaehmylomake"
+
+#: kaehmy/models.py:78
+msgid "Kaehmylomakkeet"
+msgstr "Kaehmylomakkeet"
+
+#: kaehmy/models.py:81 webapp/models.py:153
+msgid "Phone number"
+msgstr "Puhelinnumero"
+
+#: kaehmy/models.py:82
+msgid "Year"
+msgstr "Vuosi"
+
+#: kaehmy/models.py:83
+msgid "Text"
+msgstr "Teksti"
+
+#: kaehmy/models.py:85
+msgid "Custom role name"
+msgstr "Uusi virka"
+
+#: kaehmy/models.py:87 webapp/models.py:111
+msgid "Board member"
+msgstr "Hallituksen jäsen"
+
+#: kaehmy/models.py:95
+msgid "Kaehmy application: {}"
+msgstr "Kaehmy: {}"
+
+#: kaehmy/models.py:117
+msgid "Board: {}"
+msgstr "Hallitus: {}"
+
+#: kaehmy/models.py:123
+msgid "Official: {}"
+msgstr "Toimari: {}"
+
+#: kaehmy/models.py:140
+msgid "Telegram channel"
+msgstr "Telegram-kanava"
+
+#: kaehmy/models.py:141
+msgid "Telegram channels"
+msgstr "Telegram-kanavat"
+
+#: kaehmy/tables.py:13 webapp/models.py:137
+msgid "Roles"
+msgstr "Roolit"
+
+#: kaehmy/templates/error.html:8 templates/error.html:8
+msgid "Error"
+msgstr "Virhe"
+
+#: kaehmy/templates/error.html:15 templates/error.html:15
+msgid "Back"
+msgstr "Takaisin"
+
+#: kaehmy/templates/export.html:9
+msgid "All applications"
+msgstr "Kaikki kaehmyt"
+
+#: kaehmy/templates/export.html:13
+msgid "Board applications"
+msgstr "Hallituskaehmyt"
+
+#: kaehmy/templates/export.html:18
+msgid "Non-board applications"
+msgstr "Toimarikaehmyt"
+
+#: kaehmy/templates/export.html:23
+msgid "Front page"
+msgstr "Etusivulle"
+
+#: kaehmy/templates/footer.html:23 ohlhafv/templates/footer.html:23
+#: webapp/templates/footer.html:23
+msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
+msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
+
+#: kaehmy/templates/kaehmy.html:16
+msgid ""
+"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
+" Listassa on vastuualueittain sekä hallitus- että "
+"toimihenkilövirkoja.\n"
+" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan "
+"uutta toimenkuvaa.\n"
+" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa "
+"konsultoida kaehmyopasta \n"
+" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
+"henkilöön."
+msgstr ""
+"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
+" Listassa on vastuualueittain sekä hallitus- että "
+"toimihenkilövirkoja.\n"
+" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan "
+"uutta toimenkuvaa.\n"
+" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa "
+"konsultoida kaehmyopasta \n"
+" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
+"henkilöön."
+
+#: kaehmy/templates/kaehmy.html:23
+msgid ""
+"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
+" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
+"tehtävään!"
+msgstr ""
+"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
+" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
+"tehtävään!"
+
+#: kaehmy/templates/kaehmy.html:26
+msgid "Päivämääriä & deadlineja"
+msgstr "Päivämääriä & deadlineja"
+
+#: kaehmy/templates/kaehmy.html:28
+msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
+msgstr "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
+
+#: kaehmy/templates/kaehmy.html:29
+msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
+msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)"
+
+#: kaehmy/templates/kaehmy.html:30
+msgid "Vaalikokous, osa 2 (hallituksen valinta)"
+msgstr "Vaalikokous, osa 2 (hallituksen valinta)"
+
+#: kaehmy/templates/kaehmy.html:31
+msgid "Kiltailta"
+msgstr "Kiltailta"
+
+#: kaehmy/templates/kaehmy.html:32
+msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!"
+msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!"
+
+#: kaehmy/templates/kaehmy.html:33
+msgid "Vaalikokous, osa 3 (toimarien valinta)"
+msgstr "Vaalikokous, osa 3 (toimarien valinta)"
+
+#: kaehmy/templates/kaehmy.html:77 members/templates/settings.html:23
+msgid "Submit"
+msgstr "Lisää"
+
+#: kaehmy/templates/list.html:24 kaehmy/templates/list.html:59
+msgid "All kaehmys"
+msgstr "Kaikki kaehmyt"
+
+#: kaehmy/templates/list.html:32
+msgid "Commenting on post by "
+msgstr "Kommentoidaan viestiin lähettäjältä "
+
+#: kaehmy/templates/list.html:44
+msgid "Comment"
+msgstr "Kommentti"
+
+#: kaehmy/templates/list.html:48 members/templates/application_index.html:15
+#: members/templates/member_add_many.html:55
+#: members/templates/member_add_many_confirm.html:22
+#: templates/password_reset/recovery_form.html:10
+msgid "Send"
+msgstr "Lähetä"
+
+#: kaehmy/templates/list.html:57
+msgid "Filter kaehmys"
+msgstr "Rajaa kaehmyjä"
+
+#: kaehmy/templates/list.html:70 kaehmy/templates/statistics.html:18
+msgid "Total kaehmys:"
+msgstr "Kaehmyjä yhteensä:"
+
+#: kaehmy/templates/list.html:88
+msgid "Show comments"
+msgstr "Näytä kommentit"
+
+#: kaehmy/templates/list.html:94
+msgid "Add comment"
+msgstr "Kommentoi"
+
+#: kaehmy/templates/message.html:11
+msgid "Reply"
+msgstr "Vastaa"
+
+#: kaehmy/templates/navigation.html:7
+msgid "List kaehmys"
+msgstr "Kaikki kaehmyt"
+
+#: kaehmy/templates/navigation.html:8
+msgid "New kaehmy"
+msgstr "Uusi kaehmy"
+
+#: kaehmy/templates/navigation.html:9 kaehmy/templates/statistics.html:13
+msgid "Statistics"
+msgstr "Kaehmytilastot"
+
#: members/forms.py:107 members/models.py:103 members/tables.py:32
msgid "Member"
msgstr "Jäsen"
@@ -192,12 +462,6 @@ msgstr "Etunimi"
msgid "Last name"
msgstr "Sukunimi"
-#: members/models.py:16 webapp/models.py:144
-#: webapp/templates/form_listAll.html:40
-#: webapp/templates/kaehmy/kaehmy_list.html:40
-msgid "Email"
-msgstr "Sähköposti"
-
#: members/models.py:17
msgid "Place of residence"
msgstr "Asuinpaikka"
@@ -235,8 +499,8 @@ msgstr "Tilisiirto"
msgid "Created"
msgstr "Lisätty"
-#: members/models.py:104 members/templates/member_add_many_confirm.html:12
-#: members/templates/members_base.html:52
+#: members/models.py:104 members/templates/base.html:52
+#: members/templates/member_add_many_confirm.html:12
msgid "Members"
msgstr "Jäsenet"
@@ -270,27 +534,18 @@ msgstr "Hyväksy"
msgid "Decline"
msgstr "Hylkää"
-#: members/templates/application_index.html:8
+#: members/templates/application_index.html:7
msgid "Killan jäseneksi liittyminen on helppoa ja hauskaa!"
msgstr "Killan jäseneksi liittyminen on helppoa ja hauskaa!"
-#: members/templates/application_index.html:9
+#: members/templates/application_index.html:8
msgid "Täytä vain alla oleva lomake"
msgstr "Täytä vain alla oleva lomake"
-#: members/templates/application_index.html:10
+#: members/templates/application_index.html:9
msgid "Muista myös maksaa jäsenmaksusi!"
msgstr "Muista myös maksaa jäsenmaksusi!"
-#: members/templates/application_index.html:16
-#: members/templates/member_add_many.html:55
-#: members/templates/member_add_many_confirm.html:22
-#: templates/password_reset/recovery_form.html:10
-#: webapp/templates/form_listAll.html:48
-#: webapp/templates/kaehmy/kaehmy_list.html:48
-msgid "Send"
-msgstr "Lähetä"
-
#: members/templates/application_list.html:8
msgid "Member applications"
msgstr "Jäsenhakemukset"
@@ -308,10 +563,56 @@ msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
msgid "Takaisin Sähköinsinöörikillan web-sivuille"
msgstr "Takaisin Sähköinsinöörikillan web-sivuille"
-#: members/templates/member_add.html:8 members/templates/members_base.html:55
+#: members/templates/base.html:15 members/templates/member_list.html:11
+#: webapp/templates/index.html:25
+msgid "Member register"
+msgstr "Jäsenrekisteri"
+
+#: members/templates/base.html:33 members/templates/base.html:42
+msgid "Member register of SIK ry"
+msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri"
+
+#: members/templates/base.html:54
+msgid "List members"
+msgstr "Jäsenlistaus"
+
+#: members/templates/base.html:55 members/templates/member_add.html:8
msgid "Add member"
msgstr "Lisää jäsen"
+#: members/templates/base.html:56
+msgid "Add multiple"
+msgstr "Lisää useita"
+
+#: members/templates/base.html:60
+#: members/templates/member_add_many_confirm.html:16
+msgid "Payments"
+msgstr "Maksutapahtumat"
+
+#: members/templates/base.html:62
+msgid "List payments"
+msgstr "Maksulistaus"
+
+#: members/templates/base.html:63 members/templates/payment_add.html:13
+msgid "Add payment"
+msgstr "Lisää maksu"
+
+#: members/templates/base.html:67
+msgid "Applications"
+msgstr "Jäsenhakemukset"
+
+#: members/templates/base.html:69
+msgid "List applications"
+msgstr "Hakemuslistaus"
+
+#: members/templates/base.html:70
+msgid "Application form"
+msgstr "Jäsenhakemuslomake"
+
+#: members/templates/base.html:75 members/templates/settings.html:11
+msgid "Settings"
+msgstr "Asetukset"
+
#: members/templates/member_add.html:15 members/templates/member_edit.html:18
#: members/templates/payment_add.html:20 members/templates/payment_edit.html:18
msgid "Save"
@@ -387,11 +688,6 @@ msgstr ""
msgid "Confirm adding these entries?"
msgstr "Vahvista muutokset?"
-#: members/templates/member_add_many_confirm.html:16
-#: members/templates/members_base.html:60
-msgid "Payments"
-msgstr "Maksutapahtumat"
-
#: members/templates/member_delete_confirm.html:9
msgid "Are you sure you want to delete this member?"
msgstr "Oletko varma, että haluat poistaa tämän jäsenen?"
@@ -400,11 +696,6 @@ msgstr "Oletko varma, että haluat poistaa tämän jäsenen?"
msgid "Edit member"
msgstr "Muokkaa jäsentä"
-#: members/templates/member_list.html:11 members/templates/members_base.html:15
-#: webapp/templates/main_index.html:25
-msgid "Member register"
-msgstr "Jäsenrekisteri"
-
#: members/templates/member_list.html:21
msgid "Members in register:"
msgstr "Jäseniä:"
@@ -417,43 +708,6 @@ msgstr "Hae"
msgid "Showing results for"
msgstr "Näytetään tulokset haulle"
-#: members/templates/members_base.html:33
-#: members/templates/members_base.html:42
-msgid "Member register of SIK ry"
-msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri"
-
-#: members/templates/members_base.html:54
-msgid "List members"
-msgstr "Jäsenlistaus"
-
-#: members/templates/members_base.html:56
-msgid "Add multiple"
-msgstr "Lisää useita"
-
-#: members/templates/members_base.html:62
-msgid "List payments"
-msgstr "Maksulistaus"
-
-#: members/templates/members_base.html:63 members/templates/payment_add.html:13
-msgid "Add payment"
-msgstr "Lisää maksu"
-
-#: members/templates/members_base.html:67
-msgid "Applications"
-msgstr "Jäsenhakemukset"
-
-#: members/templates/members_base.html:69
-msgid "List applications"
-msgstr "Hakemuslistaus"
-
-#: members/templates/members_base.html:70
-msgid "Application form"
-msgstr "Jäsenhakemuslomake"
-
-#: members/templates/members_base.html:75 members/templates/settings.html:11
-msgid "Settings"
-msgstr "Asetukset"
-
#: members/templates/payment_delete_confirm.html:9
msgid "Are you sure you want to delete this payment?"
msgstr "Oletko varma, että haluat poistaa tämän maksutapahtuman?"
@@ -474,18 +728,14 @@ msgstr "Maksutapahtumia:"
msgid "Language"
msgstr "Kieli"
-#: members/templates/settings.html:20 sikweb/base.py:226
+#: members/templates/settings.html:20 sikweb/base.py:232
msgid "Finnish"
msgstr "suomi"
-#: members/templates/settings.html:21 sikweb/base.py:227
+#: members/templates/settings.html:21 sikweb/base.py:233
msgid "English"
msgstr "englanti"
-#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77
-msgid "Submit"
-msgstr "Lisää"
-
#: members/views/applications.py:51 members/views/applications.py:112
#: members/views/applications.py:137
msgid "No application id specified"
@@ -569,38 +819,116 @@ msgstr "Maksutapahtumaobjektia ei voitu päivittää"
msgid "Missing CSV file"
msgstr "Puuttuva CSV-tiedosto"
+#: ohlhafv/models.py:16
+msgid "Ohlhafv"
+msgstr "Øhlhäfv"
+
+#: ohlhafv/models.py:23
+msgid "Ohlhafv challenge"
+msgstr "Ohlhafv haaste"
+
+#: ohlhafv/models.py:24
+msgid "Ohlhafv challenges"
+msgstr "Ohlhafv haasteet"
+
+#: ohlhafv/models.py:30
+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)"
+
+#: ohlhafv/models.py:33
+msgid "Challenger"
+msgstr "Haastaja"
+
+#: ohlhafv/models.py:34
+msgid "Victim"
+msgstr "Uhri"
+
+#: ohlhafv/models.py:35
+msgid "Challenger email"
+msgstr "Haastajan sähköpostiosoite"
+
+#: ohlhafv/models.py:36
+msgid "Victim email"
+msgstr "Uhrin sähköpostiosoite"
+
+#: ohlhafv/models.py:37
+msgid "Series"
+msgstr "Sarja"
+
+#: ohlhafv/models.py:42
+msgid "Ohlhafv challenge: {} vs. {}"
+msgstr "Ohlhafv-haaste: {} vs. {}"
+
+#: ohlhafv/templates/email.html:2
+msgid "Moikka"
+msgstr ""
+
+#: ohlhafv/templates/email.html:4
+msgid "on haastanut sinut oluenjuontimittelöön"
+msgstr ""
+
+#: ohlhafv/templates/email.html:4
+msgid "-sarjassa."
+msgstr ""
+
+#: ohlhafv/templates/email.html:6
+msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3."
+msgstr ""
+
+#: ohlhafv/templates/email.html:8
+msgid "Käy kurkkaamassa muutkin haasteet osoitteessa"
+msgstr ""
+
+#: ohlhafv/templates/list.html:8
+msgid "All challenges"
+msgstr "Kaikki haasteet"
+
+#: ohlhafv/templates/list.html:12
+msgid "Total challenges:"
+msgstr "Haasteita yhteensä:"
+
+#: ohlhafv/templates/navigation.html:5
+msgid "New challenge"
+msgstr "Uusi haaste"
+
+#: ohlhafv/templates/navigation.html:6
+msgid "List challenges"
+msgstr "Kaikki haasteet"
+
+#: ohlhafv/templates/new.html:12
+msgid "Challenge your foe(s) to combat!"
+msgstr "Haasta kaverisi mittelöön!"
+
+#: ohlhafv/templates/new.html:19
+msgid "Challenge"
+msgstr "Haasta"
+
+#: ohlhafv/views.py:43
+msgid "Sinut on haastettu Øhlhäfviin!"
+msgstr ""
+
#: templates/admin/base_site.html:43
msgid "Go"
msgstr "Vaihda"
-#: templates/base.html:14 templates/footer.html:10
-#: webapp/templates/form_base.html:14
-#: webapp/templates/kaehmy/kaehmy_base.html:14
-#: webapp/templates/main_index.html:9
+#: templates/footer.html:10 templates/project.html:15
+#: webapp/templates/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/kaehmy_error.html:8
-msgid "Error"
-msgstr "Virhe"
-
-#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15
-msgid "Back"
-msgstr "Takaisin"
-
-#: templates/login.html:8 templates/login.html:9
+#: templates/login.html:12 templates/login.html:13
msgid "Username"
msgstr "Käyttäjänimi"
-#: templates/login.html:12 templates/login.html:13
+#: templates/login.html:16 templates/login.html:17
msgid "Password"
msgstr "Salasana"
-#: templates/login.html:16
+#: templates/login.html:20
msgid "Forgot password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.html:22
+#: templates/login.html:26
msgid "Log in"
msgstr "Kirjaudu sisään"
@@ -650,30 +978,6 @@ msgstr ""
"Sähköposti on lähetetty osoitteeseen %(email)s %(ago)s:a "
"sitten. Käytä linkkiä asettaaksesi uuden salasanan."
-#: webapp/forms.py:38
-msgid "Email (not public)"
-msgstr "Sähköposti (ei julkinen)"
-
-#: webapp/forms.py:39
-msgid "Phone number (not public)"
-msgstr "Puhelinnumero (ei julkinen)"
-
-#: webapp/forms.py:44
-msgid "Custom roles"
-msgstr "Uudet virat"
-
-#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41
-msgid "Preset roles"
-msgstr "Kaehmyvirat"
-
-#: webapp/forms.py:76
-msgid "Invalid phone number"
-msgstr "Virheellinen puhelinnumero"
-
-#: webapp/forms.py:84
-msgid "Custom role with the same name already exists."
-msgstr "Samanniminen virka on jo olemassa."
-
#: webapp/models.py:17
msgid "Webapp"
msgstr "Nettisivut"
@@ -780,10 +1084,6 @@ msgstr "Alumnisuhteet"
msgid "Others"
msgstr "Muut"
-#: webapp/models.py:111 webapp/models.py:191
-msgid "Board member"
-msgstr "Hallituksen jäsen"
-
#: webapp/models.py:112
msgid "Category"
msgstr "Kategoria"
@@ -796,146 +1096,26 @@ msgstr "hallituksen jäsen"
msgid "Description"
msgstr "Kuvaus"
-#: webapp/models.py:129
-msgid "Preset kaehmy role"
-msgstr "Kaehmyvirka"
-
-#: webapp/models.py:130
-msgid "Preset kaehmy roles"
-msgstr "Kaehmyvirat"
-
-#: webapp/models.py:137
-msgid "Custom kaehmy role"
-msgstr "Uusi virka"
-
-#: webapp/models.py:138
-msgid "Custom kaehmy roles"
-msgstr "Uudet kaehmyvirat"
-
-#: webapp/models.py:145
-msgid "Timestamp"
-msgstr "Aikaleima"
-
-#: webapp/models.py:159
-msgid "Kaehmykommentti"
-msgstr "Kaehmykommentti"
-
-#: webapp/models.py:160
-msgid "Kaehmykommentit"
-msgstr "Kaehmykommentit"
-
-#: webapp/models.py:162 webapp/models.py:290
-msgid "Message"
-msgstr "Viesti"
-
-#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12
-msgid "Kaehmylomake"
-msgstr "Kaehmylomake"
-
-#: webapp/models.py:182
-msgid "Kaehmylomakkeet"
-msgstr "Kaehmylomakkeet"
-
-#: webapp/models.py:185 webapp/models.py:267
-msgid "Phone number"
-msgstr "Puhelinnumero"
-
-#: webapp/models.py:186
-msgid "Year"
-msgstr "Vuosi"
-
-#: webapp/models.py:187
-msgid "Text"
-msgstr "Teksti"
-
-#: webapp/models.py:189
-msgid "Custom role name"
-msgstr "Uusi virka"
-
-#: webapp/models.py:199
-msgid "Kaehmy application: {}"
-msgstr "Kaehmy: {}"
-
-#: webapp/models.py:221
-msgid "Board: {}"
-msgstr "Hallitus: {}"
-
-#: webapp/models.py:227
-msgid "Official: {}"
-msgstr "Toimari: {}"
-
-#: webapp/models.py:250
+#: webapp/models.py:136
msgid "Role"
msgstr "Rooli"
-#: webapp/models.py:251 webapp/tables.py:18
-msgid "Roles"
-msgstr "Roolit"
-
-#: webapp/models.py:253
+#: webapp/models.py:139
msgid "Start date"
msgstr "Alkupäivämäärä"
-#: webapp/models.py:254
+#: webapp/models.py:140
msgid "End date"
msgstr "Loppupäivämäärä"
-#: webapp/models.py:264
+#: webapp/models.py:150
msgid "Official"
msgstr "Toimihenkilö"
-#: webapp/models.py:265
+#: webapp/models.py:151
msgid "Officials"
msgstr "Toimihenkilöt"
-#: webapp/models.py:275
-msgid "Ohlhafv challenge"
-msgstr "Ohlhafv haaste"
-
-#: webapp/models.py:276
-msgid "Ohlhafv challenges"
-msgstr "Ohlhafv haasteet"
-
-#: webapp/models.py:282
-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"
-msgstr "Haastaja"
-
-#: webapp/models.py:286
-msgid "Victim"
-msgstr "Uhri"
-
-#: webapp/models.py:287
-msgid "Challenger email"
-msgstr "Haastajan sähköpostiosoite"
-
-#: webapp/models.py:288
-msgid "Victim email"
-msgstr "Uhrin sähköpostiosoite"
-
-#: webapp/models.py:289
-msgid "Series"
-msgstr "Sarja"
-
-#: webapp/models.py:294
-msgid "Ohlhafv challenge: {} vs. {}"
-msgstr "Ohlhafv-haaste: {} vs. {}"
-
-#: webapp/models.py:302
-msgid "Telegram channel"
-msgstr "Telegram-kanava"
-
-#: webapp/models.py:303
-msgid "Telegram channels"
-msgstr "Telegram-kanavat"
-
-#: webapp/templates/admin_index.html:6
-msgid "SIK Admin"
-msgstr "SIK Hallintapaneeli"
-
#: webapp/templates/contact.html:10 webapp/templates/navigation.html:21
msgid "Contact"
msgstr "Yhteystiedot"
@@ -944,164 +1124,30 @@ 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"
-#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28
-msgid "Jobs"
-msgstr "Työpaikat"
-
-#: webapp/templates/kaehmy/kaehmy.html:16
-msgid ""
-"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
-" Listassa on vastuualueittain sekä hallitus- että "
-"toimihenkilövirkoja.\n"
-" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan "
-"uutta toimenkuvaa.\n"
-" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa "
-"konsultoida kaehmyopasta \n"
-" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
-"henkilöön."
-msgstr ""
-"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n"
-" Listassa on vastuualueittain sekä hallitus- että "
-"toimihenkilövirkoja.\n"
-" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan "
-"uutta toimenkuvaa.\n"
-" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa "
-"konsultoida kaehmyopasta \n"
-" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan "
-"henkilöön."
-
-#: 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 "
-"tehtävään!"
-msgstr ""
-"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
-" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
-"tehtävään!"
-
-#: webapp/templates/kaehmy/kaehmy.html:26
-msgid "Päivämääriä & deadlineja"
-msgstr "Päivämääriä & deadlineja"
-
-#: 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/kaehmy.html:29
-msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
-msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)"
-
-#: webapp/templates/kaehmy/kaehmy.html:30
-msgid "Vaalikokous, osa 2 (hallituksen valinta)"
-msgstr "Vaalikokous, osa 2 (hallituksen valinta)"
-
-#: webapp/templates/kaehmy/kaehmy.html:31
-msgid "Kiltailta"
-msgstr "Kiltailta"
-
-#: 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/kaehmy.html:33
-msgid "Vaalikokous, osa 3 (toimarien valinta)"
-msgstr "Vaalikokous, osa 3 (toimarien valinta)"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:9
-msgid "All applications"
-msgstr "Kaikki kaehmyt"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:13
-msgid "Board applications"
-msgstr "Hallituskaehmyt"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:18
-msgid "Non-board applications"
-msgstr "Toimarikaehmyt"
-
-#: webapp/templates/kaehmy/kaehmy_export.html:23
-msgid "Front page"
-msgstr "Etusivulle"
-
-#: 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/kaehmy_message.html:11
-msgid "Reply"
-msgstr "Vastaa"
-
-#: webapp/templates/kaehmy/kaehmy_navigation.html:6
-msgid "List kaehmys"
-msgstr "Kaikki kaehmyt"
-
-#: webapp/templates/kaehmy/kaehmy_navigation.html:7
-msgid "New kaehmy"
-msgstr "Uusi kaehmy"
-
-#: webapp/templates/kaehmy/kaehmy_navigation.html:8
-#: webapp/templates/kaehmy/kaehmy_statistics.html:13
-msgid "Statistics"
-msgstr "Kaehmytilastot"
-
-#: webapp/templates/main_index.html:14
+#: webapp/templates/index.html:14
msgid "This site is not yet ready."
msgstr "Nämä sivut eivät ole vielä valmiit."
-#: webapp/templates/main_index.html:19
+#: webapp/templates/index.html:19
msgid "Are you perhaps looking for one of the following?"
msgstr "Etsitkö kenties jotain näistä?"
-#: webapp/templates/main_index.html:24
+#: webapp/templates/index.html:24
msgid "Infoscreen admin pane"
msgstr "Infonäyttöjen hallintapaneeli"
-#: webapp/templates/main_index.html:26
+#: webapp/templates/index.html:26
msgid "Kaehmy application"
msgstr "Kaehmy"
+#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28
+msgid "Jobs"
+msgstr "Työpaikat"
+
#: webapp/templates/navigation.html:6
msgid "Guild"
msgstr "Kilta"
@@ -1114,39 +1160,12 @@ msgstr "Sössö"
msgid "Corporate"
msgstr "Yritys"
-#: webapp/templates/ohlhafv/list.html:8
-msgid "All challenges"
-msgstr "Kaikki haasteet"
-
-#: 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 "Challenge your foe(s) to combat!"
-msgstr "Haasta kaverisi mittelöön!"
-
-#: webapp/templates/ohlhafv/new.html:19
-msgid "Challenge"
-msgstr "Haasta"
+#~ msgid "SIK Admin"
+#~ msgstr "SIK Hallintapaneeli"
#~ msgid "Team"
#~ msgstr "Joukkue"
-#~ msgid "Ohlhafv"
-#~ msgstr "Øhlhäfv"
-
-#~ msgid "Infoscreen"
-#~ msgstr "Infonäyttö"
-
#~ msgid "Admin tools"
#~ msgstr "Hallintatyökalut"
diff --git a/ohlhafv/templates/email.html b/ohlhafv/templates/email.html
new file mode 100644
index 0000000..c948928
--- /dev/null
+++ b/ohlhafv/templates/email.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+{% trans "Moikka" %} {{ challenge.victim }},
+
+{{ challenge.challenger }} {% trans "on haastanut sinut oluenjuontimittelöön" %} {{ challenge.get_series_display }} {% trans "-sarjassa" %}!
+
+{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3" %}.
+
+{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}
\ No newline at end of file
diff --git a/ohlhafv/views.py b/ohlhafv/views.py
index 0c99d60..ec1bce9 100644
--- a/ohlhafv/views.py
+++ b/ohlhafv/views.py
@@ -8,6 +8,8 @@ from django.views.decorators.csrf import ensure_csrf_cookie
from django.http import HttpResponse, HttpResponseRedirect
from django.contrib.auth.decorators import permission_required, login_required
from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+from django.template.loader import render_to_string
import logging
import requests
@@ -16,6 +18,7 @@ from dealer.git import git
from ohlhafv.models import OhlhafvChallenge
from ohlhafv.forms import OhlhafvForm
from ohlhafv.tables import OhlhafvTable
+from webapp.utils import send_email
@require_http_methods(["GET"])
@@ -32,6 +35,24 @@ def ohlhafv_submit(request, *args, **kwargs):
form = OhlhafvForm(request.POST)
if form.is_valid():
form.save()
+ challenge = form.instance
+ email = form.cleaned_data.get('victim_email', '')
+ #challenger = form.cleaned_data.get('challenger', 'Anonymous')
+ #victim = form.cleaned_data.get('victim', 'Anonymous')
+ #series = form.cleaned_data.get('series', '')
+
+ url = 'https://sika.sahkoinsinoorikilta.fi/ohlhafv/list'
+ subject = _('Sinut on haastettu Øhlhäfviin!')
+
+ message = render_to_string(
+ 'ohlhafv:email.html', {
+ 'challenge': challenge,
+ 'url': url,
+ }
+ )
+ send_email(email, subject, message)
+ logging.debug(
+ 'Sent ohlhafv email to recipient <{}>'.format(email))
else:
pass
return HttpResponseRedirect('/ohlhafv/list/')