diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 943f63b..89ca2b8 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 f0cecbc..0db10ee 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-06-19 20:44+0300\n"
+"POT-Creation-Date: 2018-10-15 18:30+0300\n"
"PO-Revision-Date: 2017-11-02 23:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -33,7 +33,7 @@ msgstr "External website"
msgid "Sössö articles"
msgstr "Sössö articles"
-#: infoscreen/models.py:199 signup/models.py:30
+#: infoscreen/models.py:199 webapp/models.py:72
msgid "Events"
msgstr "Events"
@@ -53,7 +53,7 @@ msgstr "External image"
msgid "Infoscreen admin"
msgstr "Infoscreen admin"
-#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:79
+#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:80
msgid "Log out"
msgstr "Log out"
@@ -112,8 +112,8 @@ msgstr "Preview"
msgid "Delete"
msgstr "Delete"
-#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:38
-#: kaehmy/templates/list.html:36 webapp/models.py:61 webapp/models.py:90
+#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:57
+#: kaehmy/templates/list.html:36 webapp/models.py:118 webapp/models.py:147
msgid "Name"
msgstr "Name"
@@ -177,119 +177,185 @@ msgstr "Create a new item by type"
msgid "Item type"
msgstr "Item type"
-#: kaehmy/forms.py:36
+#: kaehmy/forms.py:35
msgid "Email (not public)"
msgstr "Email (not public)"
-#: kaehmy/forms.py:37
+#: kaehmy/forms.py:36
msgid "Phone number (not public)"
msgstr "Phone number (not public)"
-#: kaehmy/forms.py:42
+#: kaehmy/forms.py:41
msgid "Custom roles"
msgstr "Custom roles"
-#: kaehmy/forms.py:50 kaehmy/templates/kaehmy.html:41
+#: kaehmy/forms.py:49 kaehmy/templates/kaehmy.html:41
msgid "Preset roles"
msgstr "Preset roles"
-#: kaehmy/forms.py:72
+#: kaehmy/forms.py:71
msgid "Invalid phone number"
msgstr "Invalid phone number"
-#: kaehmy/forms.py:80
+#: kaehmy/forms.py:79
msgid "Custom role with the same name already exists."
msgstr "Custom role with the same name already exists."
-#: kaehmy/models.py:17
+#: kaehmy/models.py:13
msgid "Kaehmy"
msgstr "Kaehmy"
+#: kaehmy/models.py:19
+msgid "Corporate affairs"
+msgstr "Corporate affairs"
+
+#: kaehmy/models.py:20 webapp/templates/freshmen.html:10
+#: webapp/templates/navigation.html:8
+msgid "Freshmen"
+msgstr "Freshmen"
+
+#: kaehmy/models.py:21 webapp/templates/international.html:10
+#: webapp/templates/navigation.html:14
+msgid "International"
+msgstr "International"
+
+#: kaehmy/models.py:22
+msgid "External affairs"
+msgstr "External affairs"
+
+#: kaehmy/models.py:23
+msgid "Media"
+msgstr ""
+
#: kaehmy/models.py:24
+msgid "Technology"
+msgstr ""
+
+#: kaehmy/models.py:25
+msgid "Wellbeing"
+msgstr ""
+
+#: kaehmy/models.py:26
+msgid "Elepaja"
+msgstr ""
+
+#: kaehmy/models.py:27
+msgid "Ceremonies"
+msgstr ""
+
+#: kaehmy/models.py:28
+msgid "Culture"
+msgstr ""
+
+#: kaehmy/models.py:29
+msgid "Studies"
+msgstr ""
+
+#: kaehmy/models.py:30
+msgid "Sössö magazine"
+msgstr "Sössö magazine"
+
+#: kaehmy/models.py:31
+msgid "Alumni relations"
+msgstr "Alumni relations"
+
+#: kaehmy/models.py:32
+msgid "Others"
+msgstr ""
+
+#: kaehmy/models.py:34
+msgid "Category"
+msgstr ""
+
+#: kaehmy/models.py:40 webapp/models.py:129
+msgid "Description"
+msgstr "Description"
+
+#: kaehmy/models.py:43
msgid "Preset kaehmy role"
msgstr "Preset kaehmy role"
-#: kaehmy/models.py:25
+#: kaehmy/models.py:44
msgid "Preset kaehmy roles"
msgstr "Preset kaehmy roles"
-#: kaehmy/models.py:32
+#: kaehmy/models.py:51
msgid "Custom kaehmy role"
msgstr "Custom kaehmy role"
-#: kaehmy/models.py:33
+#: kaehmy/models.py:52
msgid "Custom kaehmy roles"
msgstr "Custom kaehmy roles"
-#: kaehmy/models.py:39 kaehmy/templates/list.html:40 members/models.py:15
+#: kaehmy/models.py:58 kaehmy/templates/list.html:40 members/models.py:15
msgid "Email"
msgstr "Email"
-#: kaehmy/models.py:40
+#: kaehmy/models.py:59
msgid "Timestamp"
msgstr ""
-#: kaehmy/models.py:54
+#: kaehmy/models.py:73
msgid "Kaehmykommentti"
msgstr "Kaehmy comment"
-#: kaehmy/models.py:55
+#: kaehmy/models.py:74
msgid "Kaehmykommentit"
msgstr "Kaehmy comments"
-#: kaehmy/models.py:57 ohlhafv/models.py:36
+#: kaehmy/models.py:76 ohlhafv/models.py:36
msgid "Message"
msgstr ""
-#: kaehmy/models.py:76 kaehmy/templates/kaehmy.html:12
+#: kaehmy/models.py:95 kaehmy/templates/kaehmy.html:12
msgid "Kaehmylomake"
msgstr "Kaehmy application"
-#: kaehmy/models.py:77
+#: kaehmy/models.py:96
msgid "Kaehmylomakkeet"
msgstr "Kaehmy applications"
-#: kaehmy/models.py:80 webapp/models.py:125
+#: kaehmy/models.py:99 webapp/models.py:182
msgid "Phone number"
msgstr ""
-#: kaehmy/models.py:81
+#: kaehmy/models.py:100
msgid "Year"
msgstr ""
-#: kaehmy/models.py:82
+#: kaehmy/models.py:101
msgid "Text"
msgstr ""
-#: kaehmy/models.py:84
+#: kaehmy/models.py:103
msgid "Custom role name"
msgstr ""
-#: kaehmy/models.py:86 webapp/models.py:62
+#: kaehmy/models.py:105 webapp/models.py:119
msgid "Board member"
msgstr "Board member"
-#: kaehmy/models.py:94
+#: kaehmy/models.py:113
msgid "Kaehmy application: {}"
msgstr "Kaehmy application: {}"
-#: kaehmy/models.py:116
+#: kaehmy/models.py:135
msgid "Board: {}"
msgstr ""
-#: kaehmy/models.py:122
+#: kaehmy/models.py:141
msgid "Official: {}"
msgstr ""
-#: kaehmy/models.py:139
+#: kaehmy/models.py:158
msgid "Telegram channel"
msgstr ""
-#: kaehmy/models.py:140
+#: kaehmy/models.py:159
msgid "Telegram channels"
msgstr ""
-#: kaehmy/tables.py:13 webapp/models.py:109
+#: kaehmy/tables.py:13 webapp/models.py:166
msgid "Roles"
msgstr ""
@@ -317,7 +383,7 @@ msgstr "Non-board applications"
msgid "Front page"
msgstr ""
-#: kaehmy/templates/footer.html:23 ohlhafv/templates/footer.html:23
+#: kaehmy/templates/footer.html:22 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"
@@ -398,7 +464,6 @@ 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"
@@ -491,7 +556,7 @@ msgstr "Bank transfer"
msgid "Created"
msgstr "Created"
-#: members/models.py:103 members/templates/base.html:52
+#: members/models.py:103 members/templates/base.html:53
#: members/templates/member_add_many_confirm.html:12
msgid "Members"
msgstr "Members"
@@ -559,53 +624,53 @@ msgstr "Amazing! Your membership application has been sent."
msgid "Takaisin Sähköinsinöörikillan web-sivuille"
msgstr "Back to the front page"
-#: members/templates/base.html:15 members/templates/member_list.html:11
+#: members/templates/base.html:16 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
+#: members/templates/base.html:34 members/templates/base.html:43
msgid "Member register of SIK ry"
msgstr "Member register of SIK ry"
-#: members/templates/base.html:54
+#: members/templates/base.html:55
msgid "List members"
msgstr "List members"
-#: members/templates/base.html:55 members/templates/member_add.html:8
+#: members/templates/base.html:56 members/templates/member_add.html:8
msgid "Add member"
msgstr "Add member"
-#: members/templates/base.html:56
+#: members/templates/base.html:57
msgid "Add multiple"
msgstr "Add multiple"
-#: members/templates/base.html:60
+#: members/templates/base.html:61
#: members/templates/member_add_many_confirm.html:16
msgid "Payments"
msgstr "Payments"
-#: members/templates/base.html:62
+#: members/templates/base.html:63
msgid "List payments"
msgstr "List payments"
-#: members/templates/base.html:63 members/templates/payment_add.html:13
+#: members/templates/base.html:64 members/templates/payment_add.html:13
msgid "Add payment"
msgstr "Add payment"
-#: members/templates/base.html:67
+#: members/templates/base.html:68
msgid "Applications"
msgstr "Applications"
-#: members/templates/base.html:69
+#: members/templates/base.html:70
msgid "List applications"
msgstr "List applications"
-#: members/templates/base.html:70
+#: members/templates/base.html:71
msgid "Application form"
msgstr "Application form"
-#: members/templates/base.html:75 members/templates/settings.html:11
+#: members/templates/base.html:76 members/templates/settings.html:11
msgid "Settings"
msgstr "Settings"
@@ -726,11 +791,11 @@ msgstr "Payments in register:"
msgid "Language"
msgstr "Language"
-#: members/templates/settings.html:20 sikweb/base.py:247
+#: members/templates/settings.html:20 sikweb/base.py:248
msgid "Finnish"
msgstr "Finnish"
-#: members/templates/settings.html:21 sikweb/base.py:248
+#: members/templates/settings.html:21 sikweb/base.py:249
msgid "English"
msgstr "English"
@@ -760,32 +825,32 @@ msgstr "Successfully deleted application"
msgid "Could not delete application object"
msgstr "Could not delete application object"
-#: members/views/members.py:87 members/views/members.py:189
-#: members/views/members.py:213
+#: members/views/members.py:86 members/views/members.py:188
+#: members/views/members.py:212
msgid "No member id specified"
msgstr "No member id specified"
-#: members/views/members.py:128
+#: members/views/members.py:127
msgid "Failed to import members"
msgstr "Failed to import members"
-#: members/views/members.py:142
+#: members/views/members.py:141
msgid "Successfully added member"
msgstr "Successfully added member"
-#: members/views/members.py:163
+#: members/views/members.py:162
msgid "Member missing 'id' field."
msgstr "Member missing 'id' field."
-#: members/views/members.py:172
+#: members/views/members.py:171
msgid "Successfully updated member"
msgstr "Successfully updated member"
-#: members/views/members.py:193
+#: members/views/members.py:192
msgid "Successfully deleted member"
msgstr "Successfully deleted member"
-#: members/views/members.py:202
+#: members/views/members.py:201
msgid "Could not delete member object"
msgstr "Could not delete member object"
@@ -814,7 +879,7 @@ msgstr "Successfully updated payment"
msgid "Could not update payment object"
msgstr "Could not update payment object"
-#: members/views/utils.py:119
+#: members/views/utils.py:112
msgid "Missing CSV file"
msgstr "Missing CSV file"
@@ -903,183 +968,116 @@ msgstr "Challenge"
msgid "Sinut on haastettu Øhlhäfviin!"
msgstr "You have been challenged at Ohlhafv!"
-#: signup/models.py:14 webapp/models.py:16
-msgid "Webapp"
-msgstr "Webapp"
-
-#: signup/models.py:26
-msgid "Event: {}"
-msgstr ""
-
-#: signup/models.py:29
-msgid "Event"
-msgstr ""
-
-#: signup/models.py:40
-msgid "Template questions: {}"
-msgstr ""
-
-#: signup/models.py:43
-msgid "Template question"
-msgstr ""
-
-#: signup/models.py:44
-msgid "Template questions"
-msgstr ""
-
-#: signup/models.py:56
-msgid "Signup form"
-msgstr ""
-
-#: signup/models.py:57
-msgid "Signup forms"
-msgstr ""
-
-#: signup/models.py:66
-msgid "Sign-ups: {}"
-msgstr ""
-
-#: signup/models.py:69
-msgid "Sign-up"
-msgstr ""
-
-#: signup/models.py:70
-msgid "Sign-ups"
-msgstr ""
-
-#: templates/admin/base_site.html:43
+#: templates/admin/base_site.html:44
msgid "Go"
msgstr "Go"
-#: templates/footer.html:10 templates/project.html:15
+#: templates/footer.html:10 templates/project.html:16
#: webapp/templates/index.html:9
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
-#: templates/login.html:12 templates/login.html:13
-msgid "Username"
-msgstr "Username"
+#: webapp/models.py:17
+msgid "Webapp"
+msgstr "Webapp"
-#: templates/login.html:16 templates/login.html:17
-msgid "Password"
-msgstr "Password"
-
-#: templates/login.html:20
-msgid "Forgot password?"
-msgstr "Forgot password?"
-
-#: templates/login.html:26
-msgid "Log in"
-msgstr "Log in"
-
-#: templates/password_reset/recovery_done.html:3
-msgid "New password set"
-msgstr "New password set"
-
-#: templates/password_reset/recovery_done.html:6
-msgid ""
-"Your password has successfully been reset. You can use it right now on the "
-"login page."
-msgstr ""
-"Your password has successfully been reset. You can use it right now on the "
-"login page."
-
-#: templates/password_reset/recovery_form.html:6
-msgid "Password recovery"
-msgstr "Password recovery"
-
-#: templates/password_reset/reset.html:5
-#, python-format
-msgid ""
-"Sorry, this password reset link is invalid. You can still request a new one."
-msgstr ""
-"Sorry, this password reset link is invalid. You can still request a new one."
-
-#: templates/password_reset/reset.html:7
-#, python-format
-msgid "Hi, %(username)s. Please choose your new password."
-msgstr "Hi, %(username)s. Please choose your new password."
-
-#: templates/password_reset/reset.html:11
-msgid "Set new password"
-msgstr "Set new password"
-
-#: templates/password_reset/reset_sent.html:4
-msgid "Password recovery sent"
-msgstr "Password recovery sent"
-
-#: templates/password_reset/reset_sent.html:7
-#, python-format
-msgid ""
-"An email was sent to %(email)s %(ago)s ago. Use the link in "
-"it to set a new password."
-msgstr ""
-"An email was sent to %(email)s %(ago)s ago. Use the link in "
-"it to set a new password."
-
-#: webapp/models.py:27
+#: webapp/models.py:28
msgid "Tag"
msgstr "Tag"
-#: webapp/models.py:28
+#: webapp/models.py:29
msgid "Tags"
msgstr "Tags"
-#: webapp/models.py:31
+#: webapp/models.py:32
msgid "Tag: {}"
msgstr "Tag: {}"
-#: webapp/models.py:51
+#: webapp/models.py:52
msgid "Feed: {}"
msgstr "Feed: {}"
-#: webapp/models.py:54
+#: webapp/models.py:55
msgid "Feed"
msgstr ""
-#: webapp/models.py:55
+#: webapp/models.py:56
msgid "Feeds"
msgstr ""
-#: webapp/models.py:66
-msgid "board member"
-msgstr "board member"
+#: webapp/models.py:68
+msgid "Event: {}"
+msgstr ""
-#: webapp/models.py:72
-msgid "Description"
-msgstr "Description"
+#: webapp/models.py:71
+msgid "Event"
+msgstr ""
-#: webapp/models.py:84
-msgid "Committee"
+#: webapp/models.py:82
+msgid "Template questions: {}"
msgstr ""
#: webapp/models.py:85
-msgid "Committees"
+msgid "Template question"
msgstr ""
-#: webapp/models.py:88
-msgid "Committee: {}"
+#: webapp/models.py:86
+msgid "Template questions"
+msgstr ""
+
+#: webapp/models.py:98
+msgid "Signup form"
+msgstr ""
+
+#: webapp/models.py:99
+msgid "Signup forms"
msgstr ""
#: webapp/models.py:108
-msgid "Role"
+msgid "Sign-ups: {}"
msgstr ""
#: webapp/models.py:111
-msgid "Start date"
+msgid "Sign-up"
msgstr ""
#: webapp/models.py:112
-msgid "End date"
-msgstr ""
-
-#: webapp/models.py:122
-msgid "Official"
+msgid "Sign-ups"
msgstr ""
#: webapp/models.py:123
+msgid "board member"
+msgstr "board member"
+
+#: webapp/models.py:141
+msgid "Committee"
+msgstr ""
+
+#: webapp/models.py:142
+msgid "Committees"
+msgstr ""
+
+#: webapp/models.py:145
+msgid "Committee: {}"
+msgstr ""
+
+#: webapp/models.py:165
+msgid "Role"
+msgstr ""
+
+#: webapp/models.py:168
+msgid "Start date"
+msgstr ""
+
+#: webapp/models.py:169
+msgid "End date"
+msgstr ""
+
+#: webapp/models.py:179
+msgid "Official"
+msgstr ""
+
+#: webapp/models.py:180
msgid "Officials"
msgstr ""
@@ -1091,10 +1089,6 @@ msgstr "Contact"
msgid "Event calendar"
msgstr "Event calendar"
-#: webapp/templates/freshmen.html:10 webapp/templates/navigation.html:8
-msgid "Freshmen"
-msgstr "Freshmen"
-
#: webapp/templates/guild.html:10
msgid "Kilta"
msgstr "Guild"
@@ -1115,10 +1109,6 @@ msgstr "Infoscreen Admin Pane"
msgid "Kaehmy application"
msgstr "Kaehmy application"
-#: webapp/templates/international.html:10 webapp/templates/navigation.html:14
-msgid "International"
-msgstr "International"
-
#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:27
msgid "Jobs"
msgstr "Jobs"
@@ -1135,11 +1125,53 @@ msgstr "Sössö"
msgid "Corporate"
msgstr "Corporate"
-#~ msgid "Sössö magazine"
-#~ msgstr "Sössö magazine"
+#~ msgid "Username"
+#~ msgstr "Username"
-#~ msgid "Alumni relations"
-#~ msgstr "Alumni relations"
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "Forgot password?"
+#~ msgstr "Forgot password?"
+
+#~ msgid "Log in"
+#~ msgstr "Log in"
+
+#~ msgid "New password set"
+#~ msgstr "New password set"
+
+#~ msgid ""
+#~ "Your password has successfully been reset. You can use it right now on "
+#~ "the login page."
+#~ msgstr ""
+#~ "Your password has successfully been reset. You can use it right now on "
+#~ "the login page."
+
+#~ msgid "Password recovery"
+#~ msgstr "Password recovery"
+
+#~ msgid ""
+#~ "Sorry, this password reset link is invalid. You can still request a new one."
+#~ msgstr ""
+#~ "Sorry, this password reset link is invalid. You can still request a new one."
+
+#~ msgid "Hi, %(username)s. Please choose your new password."
+#~ msgstr "Hi, %(username)s. Please choose your new password."
+
+#~ msgid "Set new password"
+#~ msgstr "Set new password"
+
+#~ msgid "Password recovery sent"
+#~ msgstr "Password recovery sent"
+
+#~ msgid ""
+#~ "An email was sent to %(email)s %(ago)s ago. Use the link "
+#~ "in it to set a new password."
+#~ msgstr ""
+#~ "An email was sent to %(email)s %(ago)s ago. Use the link "
+#~ "in it to set a new password."
#~ msgid "SIK Admin"
#~ msgstr "SIK Admin"
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index 669eeea..edd9a6b 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 235c146..ab0b35e 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-06-19 20:44+0300\n"
+"POT-Creation-Date: 2018-10-15 18:30+0300\n"
"PO-Revision-Date: 2017-11-02 23:04+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -34,7 +34,7 @@ msgstr "Ulkoinen verkkosivu"
msgid "Sössö articles"
msgstr "Sössön artikkelit"
-#: infoscreen/models.py:199 signup/models.py:30
+#: infoscreen/models.py:199 webapp/models.py:72
msgid "Events"
msgstr "Tapahtumat"
@@ -54,7 +54,7 @@ msgstr "Ulkoinen kuva"
msgid "Infoscreen admin"
msgstr "Infonäyttöjen hallinta"
-#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:79
+#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:80
msgid "Log out"
msgstr "Kirjaudu ulos"
@@ -113,8 +113,8 @@ msgstr "Esikatsele"
msgid "Delete"
msgstr "Poista"
-#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:38
-#: kaehmy/templates/list.html:36 webapp/models.py:61 webapp/models.py:90
+#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:57
+#: kaehmy/templates/list.html:36 webapp/models.py:118 webapp/models.py:147
msgid "Name"
msgstr "Nimi"
@@ -178,119 +178,185 @@ msgstr "Luo uusi dia tyypin perusteella"
msgid "Item type"
msgstr "Diatyyppi"
-#: kaehmy/forms.py:36
+#: kaehmy/forms.py:35
msgid "Email (not public)"
msgstr "Sähköposti (ei julkinen)"
-#: kaehmy/forms.py:37
+#: kaehmy/forms.py:36
msgid "Phone number (not public)"
msgstr "Puhelinnumero (ei julkinen)"
-#: kaehmy/forms.py:42
+#: kaehmy/forms.py:41
msgid "Custom roles"
msgstr "Uudet virat"
-#: kaehmy/forms.py:50 kaehmy/templates/kaehmy.html:41
+#: kaehmy/forms.py:49 kaehmy/templates/kaehmy.html:41
msgid "Preset roles"
msgstr "Kaehmyvirat"
-#: kaehmy/forms.py:72
+#: kaehmy/forms.py:71
msgid "Invalid phone number"
msgstr "Virheellinen puhelinnumero"
-#: kaehmy/forms.py:80
+#: kaehmy/forms.py:79
msgid "Custom role with the same name already exists."
msgstr "Samanniminen virka on jo olemassa."
-#: kaehmy/models.py:17
+#: kaehmy/models.py:13
msgid "Kaehmy"
msgstr "Kaehmy"
+#: kaehmy/models.py:19
+msgid "Corporate affairs"
+msgstr "Yrityssuhteet"
+
+#: kaehmy/models.py:20 webapp/templates/freshmen.html:10
+#: webapp/templates/navigation.html:8
+msgid "Freshmen"
+msgstr "Fuksit"
+
+#: kaehmy/models.py:21 webapp/templates/international.html:10
+#: webapp/templates/navigation.html:14
+msgid "International"
+msgstr "International"
+
+#: kaehmy/models.py:22
+msgid "External affairs"
+msgstr "Ulkosuhteet"
+
+#: kaehmy/models.py:23
+msgid "Media"
+msgstr "Media"
+
#: kaehmy/models.py:24
+msgid "Technology"
+msgstr "Teknologia"
+
+#: kaehmy/models.py:25
+msgid "Wellbeing"
+msgstr "Hyvinvointi"
+
+#: kaehmy/models.py:26
+msgid "Elepaja"
+msgstr "Elepaja"
+
+#: kaehmy/models.py:27
+msgid "Ceremonies"
+msgstr "Hupitapahtumat"
+
+#: kaehmy/models.py:28
+msgid "Culture"
+msgstr "Kulttuuri"
+
+#: kaehmy/models.py:29
+msgid "Studies"
+msgstr "Opinnot"
+
+#: kaehmy/models.py:30
+msgid "Sössö magazine"
+msgstr "Kiltalehti Sössö"
+
+#: kaehmy/models.py:31
+msgid "Alumni relations"
+msgstr "Alumnisuhteet"
+
+#: kaehmy/models.py:32
+msgid "Others"
+msgstr "Muut"
+
+#: kaehmy/models.py:34
+msgid "Category"
+msgstr "Kategoria"
+
+#: kaehmy/models.py:40 webapp/models.py:129
+msgid "Description"
+msgstr "Kuvaus"
+
+#: kaehmy/models.py:43
msgid "Preset kaehmy role"
msgstr "Kaehmyvirka"
-#: kaehmy/models.py:25
+#: kaehmy/models.py:44
msgid "Preset kaehmy roles"
msgstr "Kaehmyvirat"
-#: kaehmy/models.py:32
+#: kaehmy/models.py:51
msgid "Custom kaehmy role"
msgstr "Uusi virka"
-#: kaehmy/models.py:33
+#: kaehmy/models.py:52
msgid "Custom kaehmy roles"
msgstr "Uudet kaehmyvirat"
-#: kaehmy/models.py:39 kaehmy/templates/list.html:40 members/models.py:15
+#: kaehmy/models.py:58 kaehmy/templates/list.html:40 members/models.py:15
msgid "Email"
msgstr "Sähköposti"
-#: kaehmy/models.py:40
+#: kaehmy/models.py:59
msgid "Timestamp"
msgstr "Aikaleima"
-#: kaehmy/models.py:54
+#: kaehmy/models.py:73
msgid "Kaehmykommentti"
msgstr "Kaehmykommentti"
-#: kaehmy/models.py:55
+#: kaehmy/models.py:74
msgid "Kaehmykommentit"
msgstr "Kaehmykommentit"
-#: kaehmy/models.py:57 ohlhafv/models.py:36
+#: kaehmy/models.py:76 ohlhafv/models.py:36
msgid "Message"
msgstr "Viesti"
-#: kaehmy/models.py:76 kaehmy/templates/kaehmy.html:12
+#: kaehmy/models.py:95 kaehmy/templates/kaehmy.html:12
msgid "Kaehmylomake"
msgstr "Kaehmylomake"
-#: kaehmy/models.py:77
+#: kaehmy/models.py:96
msgid "Kaehmylomakkeet"
msgstr "Kaehmylomakkeet"
-#: kaehmy/models.py:80 webapp/models.py:125
+#: kaehmy/models.py:99 webapp/models.py:182
msgid "Phone number"
msgstr "Puhelinnumero"
-#: kaehmy/models.py:81
+#: kaehmy/models.py:100
msgid "Year"
msgstr "Vuosi"
-#: kaehmy/models.py:82
+#: kaehmy/models.py:101
msgid "Text"
msgstr "Teksti"
-#: kaehmy/models.py:84
+#: kaehmy/models.py:103
msgid "Custom role name"
msgstr "Uusi virka"
-#: kaehmy/models.py:86 webapp/models.py:62
+#: kaehmy/models.py:105 webapp/models.py:119
msgid "Board member"
msgstr "Hallituksen jäsen"
-#: kaehmy/models.py:94
+#: kaehmy/models.py:113
msgid "Kaehmy application: {}"
msgstr "Kaehmy: {}"
-#: kaehmy/models.py:116
+#: kaehmy/models.py:135
msgid "Board: {}"
msgstr "Hallitus: {}"
-#: kaehmy/models.py:122
+#: kaehmy/models.py:141
msgid "Official: {}"
msgstr "Toimari: {}"
-#: kaehmy/models.py:139
+#: kaehmy/models.py:158
msgid "Telegram channel"
msgstr "Telegram-kanava"
-#: kaehmy/models.py:140
+#: kaehmy/models.py:159
msgid "Telegram channels"
msgstr "Telegram-kanavat"
-#: kaehmy/tables.py:13 webapp/models.py:109
+#: kaehmy/tables.py:13 webapp/models.py:166
msgid "Roles"
msgstr "Roolit"
@@ -318,7 +384,7 @@ msgstr "Toimarikaehmyt"
msgid "Front page"
msgstr "Etusivulle"
-#: kaehmy/templates/footer.html:23 ohlhafv/templates/footer.html:23
+#: kaehmy/templates/footer.html:22 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"
@@ -402,7 +468,6 @@ 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ä"
@@ -495,7 +560,7 @@ msgstr "Tilisiirto"
msgid "Created"
msgstr "Lisätty"
-#: members/models.py:103 members/templates/base.html:52
+#: members/models.py:103 members/templates/base.html:53
#: members/templates/member_add_many_confirm.html:12
msgid "Members"
msgstr "Jäsenet"
@@ -563,53 +628,53 @@ 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/base.html:15 members/templates/member_list.html:11
+#: members/templates/base.html:16 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
+#: members/templates/base.html:34 members/templates/base.html:43
msgid "Member register of SIK ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri"
-#: members/templates/base.html:54
+#: members/templates/base.html:55
msgid "List members"
msgstr "Jäsenlistaus"
-#: members/templates/base.html:55 members/templates/member_add.html:8
+#: members/templates/base.html:56 members/templates/member_add.html:8
msgid "Add member"
msgstr "Lisää jäsen"
-#: members/templates/base.html:56
+#: members/templates/base.html:57
msgid "Add multiple"
msgstr "Lisää useita"
-#: members/templates/base.html:60
+#: members/templates/base.html:61
#: members/templates/member_add_many_confirm.html:16
msgid "Payments"
msgstr "Maksutapahtumat"
-#: members/templates/base.html:62
+#: members/templates/base.html:63
msgid "List payments"
msgstr "Maksulistaus"
-#: members/templates/base.html:63 members/templates/payment_add.html:13
+#: members/templates/base.html:64 members/templates/payment_add.html:13
msgid "Add payment"
msgstr "Lisää maksu"
-#: members/templates/base.html:67
+#: members/templates/base.html:68
msgid "Applications"
msgstr "Jäsenhakemukset"
-#: members/templates/base.html:69
+#: members/templates/base.html:70
msgid "List applications"
msgstr "Hakemuslistaus"
-#: members/templates/base.html:70
+#: members/templates/base.html:71
msgid "Application form"
msgstr "Jäsenhakemuslomake"
-#: members/templates/base.html:75 members/templates/settings.html:11
+#: members/templates/base.html:76 members/templates/settings.html:11
msgid "Settings"
msgstr "Asetukset"
@@ -728,11 +793,11 @@ msgstr "Maksutapahtumia:"
msgid "Language"
msgstr "Kieli"
-#: members/templates/settings.html:20 sikweb/base.py:247
+#: members/templates/settings.html:20 sikweb/base.py:248
msgid "Finnish"
msgstr "suomi"
-#: members/templates/settings.html:21 sikweb/base.py:248
+#: members/templates/settings.html:21 sikweb/base.py:249
msgid "English"
msgstr "englanti"
@@ -761,32 +826,32 @@ msgstr "Onnistuneesti poistettiin hakemus"
msgid "Could not delete application object"
msgstr "Hakemusobjektia ei voitu poistaa"
-#: members/views/members.py:87 members/views/members.py:189
-#: members/views/members.py:213
+#: members/views/members.py:86 members/views/members.py:188
+#: members/views/members.py:212
msgid "No member id specified"
msgstr "Jäsenen ID ei määritelty"
-#: members/views/members.py:128
+#: members/views/members.py:127
msgid "Failed to import members"
msgstr "Jäsenten tuonti epäonnistui"
-#: members/views/members.py:142
+#: members/views/members.py:141
msgid "Successfully added member"
msgstr "Onnistuneesti lisättiin jäsen"
-#: members/views/members.py:163
+#: members/views/members.py:162
msgid "Member missing 'id' field."
msgstr "Jäsenen ID ei määritelty."
-#: members/views/members.py:172
+#: members/views/members.py:171
msgid "Successfully updated member"
msgstr "Onnistuneesti päivitettiin jäsen"
-#: members/views/members.py:193
+#: members/views/members.py:192
msgid "Successfully deleted member"
msgstr "Onnistuneesti poistettiin jäsen"
-#: members/views/members.py:202
+#: members/views/members.py:201
msgid "Could not delete member object"
msgstr "Jäsenobjektia ei voitu poistaa"
@@ -815,7 +880,7 @@ msgstr "Onnistuneesti päivitettiin maksutapahtuma"
msgid "Could not update payment object"
msgstr "Maksutapahtumaobjektia ei voitu päivittää"
-#: members/views/utils.py:119
+#: members/views/utils.py:112
msgid "Missing CSV file"
msgstr "Puuttuva CSV-tiedosto"
@@ -903,182 +968,116 @@ msgstr "Haasta"
msgid "Sinut on haastettu Øhlhäfviin!"
msgstr ""
-#: signup/models.py:14 webapp/models.py:16
-msgid "Webapp"
-msgstr "Nettisivut"
-
-#: signup/models.py:26
-msgid "Event: {}"
-msgstr "Tapahtuma: {}"
-
-#: signup/models.py:29
-msgid "Event"
-msgstr "Tapahtuma"
-
-#: signup/models.py:40
-msgid "Template questions: {}"
-msgstr "Vakiokysymykset: {}"
-
-#: signup/models.py:43
-msgid "Template question"
-msgstr "Vakiokysymys"
-
-#: signup/models.py:44
-msgid "Template questions"
-msgstr "Vakiokysymykset"
-
-#: signup/models.py:56
-msgid "Signup form"
-msgstr "Ilmoittautumislomake"
-
-#: signup/models.py:57
-msgid "Signup forms"
-msgstr "Ilmoittautumislomakkeet"
-
-#: signup/models.py:66
-msgid "Sign-ups: {}"
-msgstr "Ilmoittautumiset: {}"
-
-#: signup/models.py:69
-msgid "Sign-up"
-msgstr "Ilmoittautuminen"
-
-#: signup/models.py:70
-msgid "Sign-ups"
-msgstr "Ilmoittautumiset"
-
-#: templates/admin/base_site.html:43
+#: templates/admin/base_site.html:44
msgid "Go"
msgstr "Vaihda"
-#: templates/footer.html:10 templates/project.html:15
+#: templates/footer.html:10 templates/project.html:16
#: webapp/templates/index.html:9
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
-#: templates/login.html:12 templates/login.html:13
-msgid "Username"
-msgstr "Käyttäjänimi"
+#: webapp/models.py:17
+msgid "Webapp"
+msgstr "Nettisivut"
-#: templates/login.html:16 templates/login.html:17
-msgid "Password"
-msgstr "Salasana"
-
-#: templates/login.html:20
-msgid "Forgot password?"
-msgstr "Unohditko salasanasi?"
-
-#: templates/login.html:26
-msgid "Log in"
-msgstr "Kirjaudu sisään"
-
-#: templates/password_reset/recovery_done.html:3
-msgid "New password set"
-msgstr "Uusi salasana asetettu"
-
-#: templates/password_reset/recovery_done.html:6
-msgid ""
-"Your password has successfully been reset. You can use it right now on the "
-"login page."
-msgstr ""
-"Salasanasi on asetettu onnistuneesti. Voit käyttää sitä nyt kirjautuessasi."
-
-#: templates/password_reset/recovery_form.html:6
-msgid "Password recovery"
-msgstr "Salasanan palautus"
-
-#: templates/password_reset/reset.html:5
-#, python-format
-msgid ""
-"Sorry, this password reset link is invalid. You can still request a new one."
-msgstr ""
-"Pahoittelut, tämä salasanan palautuslinkki on epäkelpo. Voit kuitenkin hankkia uuden."
-
-#: templates/password_reset/reset.html:7
-#, python-format
-msgid "Hi, %(username)s. Please choose your new password."
-msgstr "Hei, %(username)s. Valitse uusi salasanasi."
-
-#: templates/password_reset/reset.html:11
-msgid "Set new password"
-msgstr "Aseta uusi salasana"
-
-#: templates/password_reset/reset_sent.html:4
-msgid "Password recovery sent"
-msgstr "Salasanan palautusviesti lähetetty"
-
-#: templates/password_reset/reset_sent.html:7
-#, python-format
-msgid ""
-"An email was sent to %(email)s %(ago)s ago. Use the link in "
-"it to set a new password."
-msgstr ""
-"Sähköposti on lähetetty osoitteeseen %(email)s %(ago)s:a "
-"sitten. Käytä linkkiä asettaaksesi uuden salasanan."
-
-#: webapp/models.py:27
+#: webapp/models.py:28
msgid "Tag"
msgstr "Tunniste"
-#: webapp/models.py:28
+#: webapp/models.py:29
msgid "Tags"
msgstr "Tunnisteet"
-#: webapp/models.py:31
+#: webapp/models.py:32
msgid "Tag: {}"
msgstr "Tunniste: {}"
-#: webapp/models.py:51
+#: webapp/models.py:52
msgid "Feed: {}"
msgstr "Uutinen: {}"
-#: webapp/models.py:54
+#: webapp/models.py:55
msgid "Feed"
msgstr "Uutinen"
-#: webapp/models.py:55
+#: webapp/models.py:56
msgid "Feeds"
msgstr "Uutiset"
-#: webapp/models.py:66
+#: webapp/models.py:68
+msgid "Event: {}"
+msgstr "Tapahtuma: {}"
+
+#: webapp/models.py:71
+msgid "Event"
+msgstr "Tapahtuma"
+
+#: webapp/models.py:82
+msgid "Template questions: {}"
+msgstr "Vakiokysymykset: {}"
+
+#: webapp/models.py:85
+msgid "Template question"
+msgstr "Vakiokysymys"
+
+#: webapp/models.py:86
+msgid "Template questions"
+msgstr "Vakiokysymykset"
+
+#: webapp/models.py:98
+msgid "Signup form"
+msgstr "Ilmoittautumislomake"
+
+#: webapp/models.py:99
+msgid "Signup forms"
+msgstr "Ilmoittautumislomakkeet"
+
+#: webapp/models.py:108
+msgid "Sign-ups: {}"
+msgstr "Ilmoittautumiset: {}"
+
+#: webapp/models.py:111
+msgid "Sign-up"
+msgstr "Ilmoittautuminen"
+
+#: webapp/models.py:112
+msgid "Sign-ups"
+msgstr "Ilmoittautumiset"
+
+#: webapp/models.py:123
msgid "board member"
msgstr "hallituksen jäsen"
-#: webapp/models.py:72
-msgid "Description"
-msgstr "Kuvaus"
-
-#: webapp/models.py:84
+#: webapp/models.py:141
msgid "Committee"
msgstr "Toimikunta"
-#: webapp/models.py:85
+#: webapp/models.py:142
msgid "Committees"
msgstr "Toimikunnat"
-#: webapp/models.py:88
+#: webapp/models.py:145
msgid "Committee: {}"
msgstr "Toimikunta: {}"
-#: webapp/models.py:108
+#: webapp/models.py:165
msgid "Role"
msgstr "Rooli"
-#: webapp/models.py:111
+#: webapp/models.py:168
msgid "Start date"
msgstr "Alkupäivämäärä"
-#: webapp/models.py:112
+#: webapp/models.py:169
msgid "End date"
msgstr "Loppupäivämäärä"
-#: webapp/models.py:122
+#: webapp/models.py:179
msgid "Official"
msgstr "Toimihenkilö"
-#: webapp/models.py:123
+#: webapp/models.py:180
msgid "Officials"
msgstr "Toimihenkilöt"
@@ -1090,10 +1089,6 @@ msgstr "Yhteystiedot"
msgid "Event calendar"
msgstr "Tapahtumakalenteri"
-#: webapp/templates/freshmen.html:10 webapp/templates/navigation.html:8
-msgid "Freshmen"
-msgstr "Fuksit"
-
#: webapp/templates/guild.html:10
msgid "Kilta"
msgstr "Kilta"
@@ -1114,10 +1109,6 @@ msgstr "Infonäyttöjen hallintapaneeli"
msgid "Kaehmy application"
msgstr "Kaehmy"
-#: webapp/templates/international.html:10 webapp/templates/navigation.html:14
-msgid "International"
-msgstr "International"
-
#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:27
msgid "Jobs"
msgstr "Työpaikat"
@@ -1134,6 +1125,54 @@ msgstr "Sössö"
msgid "Corporate"
msgstr "Yritys"
+#~ msgid "Username"
+#~ msgstr "Käyttäjänimi"
+
+#~ msgid "Password"
+#~ msgstr "Salasana"
+
+#~ msgid "Forgot password?"
+#~ msgstr "Unohditko salasanasi?"
+
+#~ msgid "Log in"
+#~ msgstr "Kirjaudu sisään"
+
+#~ msgid "New password set"
+#~ msgstr "Uusi salasana asetettu"
+
+#~ msgid ""
+#~ "Your password has successfully been reset. You can use it right now on "
+#~ "the login page."
+#~ msgstr ""
+#~ "Salasanasi on asetettu onnistuneesti. Voit käyttää sitä nyt "
+#~ "kirjautuessasi."
+
+#~ msgid "Password recovery"
+#~ msgstr "Salasanan palautus"
+
+#~ msgid ""
+#~ "Sorry, this password reset link is invalid. You can still request a new one."
+#~ msgstr ""
+#~ "Pahoittelut, tämä salasanan palautuslinkki on epäkelpo. Voit kuitenkin hankkia uuden."
+
+#~ msgid "Hi, %(username)s. Please choose your new password."
+#~ msgstr "Hei, %(username)s. Valitse uusi salasanasi."
+
+#~ msgid "Set new password"
+#~ msgstr "Aseta uusi salasana"
+
+#~ msgid "Password recovery sent"
+#~ msgstr "Salasanan palautusviesti lähetetty"
+
+#~ msgid ""
+#~ "An email was sent to %(email)s %(ago)s ago. Use the link "
+#~ "in it to set a new password."
+#~ msgstr ""
+#~ "Sähköposti on lähetetty osoitteeseen %(email)s %(ago)s:a "
+#~ "sitten. Käytä linkkiä asettaaksesi uuden salasanan."
+
#~ msgid "Registration: {}"
#~ msgstr "Registration: {}"
@@ -1143,45 +1182,6 @@ msgstr "Yritys"
#~ msgid "Registrations"
#~ msgstr "Ilmoittautumiset"
-#~ msgid "Corporate affairs"
-#~ msgstr "Yrityssuhteet"
-
-#~ msgid "External affairs"
-#~ msgstr "Ulkosuhteet"
-
-#~ msgid "Media"
-#~ msgstr "Media"
-
-#~ msgid "Technology"
-#~ msgstr "Teknologia"
-
-#~ msgid "Wellbeing"
-#~ msgstr "Hyvinvointi"
-
-#~ msgid "Elepaja"
-#~ msgstr "Elepaja"
-
-#~ msgid "Ceremonies"
-#~ msgstr "Hupitapahtumat"
-
-#~ msgid "Culture"
-#~ msgstr "Kulttuuri"
-
-#~ msgid "Studies"
-#~ msgstr "Opinnot"
-
-#~ msgid "Sössö magazine"
-#~ msgstr "Kiltalehti Sössö"
-
-#~ msgid "Alumni relations"
-#~ msgstr "Alumnisuhteet"
-
-#~ msgid "Others"
-#~ msgstr "Muut"
-
-#~ msgid "Category"
-#~ msgstr "Kategoria"
-
#~ msgid "Challenger email"
#~ msgstr "Haastajan sähköpostiosoite"