Merge branch 'develop' into 'master'

Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!98

kaehmy/models.py

@@ -17,7 +17,7 @@ class BaseRole(models.Model):
         ("corporate", _("Corporate affairs")),
         ("freshman", _("Freshmen")),
         ("international", _("International")),
-        ("external", _("External affairs")),
+        ("siwa", _("SIK's free time")),
         ("media", _("Media")),
         ("tech", _("Technology")),
         ("wellbeing", _("Wellbeing")),

locale/en/LC_MESSAGES/django.po

@@ -104,8 +104,8 @@ msgid "International"
 msgstr "International"
 
 #: kaehmy/models.py:20
-msgid "External affairs"
-msgstr "External affairs"
+msgid "SIK's free time"
+msgstr "SIK's free time"
 
 #: kaehmy/models.py:21
 msgid "Media"
@@ -637,7 +637,8 @@ msgstr ""
 "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"
+"held that position before or consult <a href=\"https://static.sahkoinsinoorikilta.fi/uus_webi/"
+"kahmyguide.pdf\">kähmy guide</a>.\n"
 "Best positions to consider for English speaking people are in the "
 "International category."
 

locale/fi/LC_MESSAGES/django.po

@@ -105,8 +105,8 @@ msgid "International"
 msgstr "International"
 
 #: kaehmy/models.py:20
-msgid "External affairs"
-msgstr "Ulkosuhteet"
+msgid "SIK's free time"
+msgstr "SIKin Wapaa-aika (SiWa)"
 
 #: kaehmy/models.py:21
 msgid "Media"