From 5caacd8f44dd92ea0c321b69bc1d881292aad9d2 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Tue, 22 May 2018 23:54:58 +0300
Subject: [PATCH] Add and fix translations

---
 locale/en/LC_MESSAGES/django.po | 168 ++++++++++---------------
 locale/fi/LC_MESSAGES/django.po | 209 +++++++++++++++-----------------
 2 files changed, 165 insertions(+), 212 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index f3d30c9..5c71ad1 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-03-02 02:43+0200\n"
+"POT-Creation-Date: 2018-05-22 23:51+0300\n"
 "PO-Revision-Date: 2017-11-02 23:09+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -113,7 +113,7 @@ msgid "Delete"
 msgstr "Delete"
 
 #: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:39
-#: kaehmy/templates/list.html:36 webapp/models.py:110
+#: kaehmy/templates/list.html:36 webapp/models.py:110 webapp/models.py:140
 msgid "Name"
 msgstr "Name"
 
@@ -221,7 +221,7 @@ msgstr "Custom kaehmy role"
 msgid "Custom kaehmy roles"
 msgstr "Custom kaehmy roles"
 
-#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:16
+#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:15
 msgid "Email"
 msgstr "Email"
 
@@ -249,7 +249,7 @@ msgstr "Kaehmy application"
 msgid "Kaehmylomakkeet"
 msgstr "Kaehmy applications"
 
-#: kaehmy/models.py:81 webapp/models.py:153
+#: kaehmy/models.py:81 webapp/models.py:175
 msgid "Phone number"
 msgstr ""
 
@@ -289,17 +289,15 @@ msgstr ""
 msgid "Telegram channels"
 msgstr ""
 
-#: kaehmy/tables.py:13 webapp/models.py:137
+#: kaehmy/tables.py:13 webapp/models.py:159
 msgid "Roles"
 msgstr ""
 
-#: kaehmy/templates/error.html:8 members/templates/error.html:8
-#: templates/error.html:8
+#: kaehmy/templates/error.html:8 templates/error.html:8
 msgid "Error"
 msgstr "Error"
 
-#: kaehmy/templates/error.html:15 members/templates/error.html:15
-#: templates/error.html:15
+#: kaehmy/templates/error.html:15 templates/error.html:15
 msgid "Back"
 msgstr "Back"
 
@@ -436,7 +434,7 @@ msgstr "New application"
 msgid "Statistics"
 msgstr ""
 
-#: members/forms.py:107 members/models.py:103 members/tables.py:46
+#: members/forms.py:107 members/models.py:102 members/tables.py:41
 msgid "Member"
 msgstr "Member"
 
@@ -448,65 +446,65 @@ msgstr "I'm a member of AYY"
 msgid "I want to receive a weekly newsletter"
 msgstr "I want to receive a weekly newsletter"
 
-#: members/models.py:14
+#: members/models.py:13
 msgid "First name"
 msgstr "First name"
 
-#: members/models.py:15
+#: members/models.py:14
 msgid "Last name"
 msgstr "Last name"
 
-#: members/models.py:17
+#: members/models.py:16
 msgid "Place of residence"
 msgstr "Place of residence"
 
-#: members/models.py:19 members/models.py:70
+#: members/models.py:18 members/models.py:69
 #: members/templates/member_add_many.html:39
 msgid "AYY"
 msgstr "AYY"
 
-#: members/models.py:20
+#: members/models.py:19
 msgid "JAS"
 msgstr "JAS"
 
-#: members/models.py:51
+#: members/models.py:50
 msgid "Submitted"
 msgstr "Submitted"
 
-#: members/models.py:68
+#: members/models.py:67
 msgid "Date"
 msgstr "Date"
 
-#: members/models.py:69
+#: members/models.py:68
 msgid "Source"
 msgstr "Source"
 
-#: members/models.py:71
+#: members/models.py:70
 msgid "Cash"
 msgstr "Cash"
 
-#: members/models.py:72 members/templates/member_add_many.html:40
+#: members/models.py:71 members/templates/member_add_many.html:40
 msgid "Bank transfer"
 msgstr "Bank transfer"
 
-#: members/models.py:96
+#: members/models.py:95
 msgid "Created"
 msgstr "Created"
 
-#: members/models.py:104 members/templates/base.html:52
+#: members/models.py:103 members/templates/base.html:52
 #: members/templates/member_add_many_confirm.html:12
 msgid "Members"
 msgstr "Members"
 
-#: members/tables.py:14
+#: members/tables.py:15
 msgid "Last paid"
 msgstr "Last paid"
 
-#: members/tables.py:19 members/tables.py:51 members/tables.py:68
+#: members/tables.py:19 members/tables.py:45 members/tables.py:60
 msgid "Edit"
 msgstr "Edit"
 
-#: members/tables.py:33
+#: members/tables.py:31
 msgid " (not paid)"
 msgstr " (not paid)"
 
@@ -728,11 +726,11 @@ msgstr "Payments in register:"
 msgid "Language"
 msgstr "Language"
 
-#: members/templates/settings.html:20 sikweb/base.py:232
+#: members/templates/settings.html:20 sikweb/base.py:246
 msgid "Finnish"
 msgstr "Finnish"
 
-#: members/templates/settings.html:21 sikweb/base.py:233
+#: members/templates/settings.html:21 sikweb/base.py:247
 msgid "English"
 msgstr "English"
 
@@ -762,32 +760,32 @@ msgstr "Successfully deleted application"
 msgid "Could not delete application object"
 msgstr "Could not delete application object"
 
-#: members/views/members.py:73 members/views/members.py:175
-#: members/views/members.py:199
+#: members/views/members.py:87 members/views/members.py:189
+#: members/views/members.py:213
 msgid "No member id specified"
 msgstr "No member id specified"
 
-#: members/views/members.py:114
+#: members/views/members.py:128
 msgid "Failed to import members"
 msgstr "Failed to import members"
 
-#: members/views/members.py:128
+#: members/views/members.py:142
 msgid "Successfully added member"
 msgstr "Successfully added member"
 
-#: members/views/members.py:149
+#: members/views/members.py:163
 msgid "Member missing 'id' field."
 msgstr "Member missing 'id' field."
 
-#: members/views/members.py:158
+#: members/views/members.py:172
 msgid "Successfully updated member"
 msgstr "Successfully updated member"
 
-#: members/views/members.py:179
+#: members/views/members.py:193
 msgid "Successfully deleted member"
 msgstr "Successfully deleted member"
 
-#: members/views/members.py:188
+#: members/views/members.py:202
 msgid "Could not delete member object"
 msgstr "Could not delete member object"
 
@@ -1025,68 +1023,6 @@ msgstr ""
 msgid "Registrations"
 msgstr ""
 
-#: webapp/models.py:94
-msgid "Corporate affairs"
-msgstr ""
-
-#: webapp/models.py:95 webapp/templates/freshmen.html:10
-#: webapp/templates/navigation.html:8
-msgid "Freshmen"
-msgstr "Freshmen"
-
-#: webapp/models.py:96 webapp/templates/international.html:10
-#: webapp/templates/navigation.html:14
-msgid "International"
-msgstr "International"
-
-#: webapp/models.py:97
-msgid "External affairs"
-msgstr ""
-
-#: webapp/models.py:98
-msgid "Media"
-msgstr ""
-
-#: webapp/models.py:99
-msgid "Technology"
-msgstr ""
-
-#: webapp/models.py:100
-msgid "Wellbeing"
-msgstr ""
-
-#: webapp/models.py:101
-msgid "Elepaja"
-msgstr ""
-
-#: webapp/models.py:102
-msgid "Ceremonies"
-msgstr ""
-
-#: webapp/models.py:103
-msgid "Culture"
-msgstr ""
-
-#: webapp/models.py:104
-msgid "Studies"
-msgstr ""
-
-#: webapp/models.py:105
-msgid "Sössö magazine"
-msgstr "Sössö magazine"
-
-#: webapp/models.py:106
-msgid "Alumni relations"
-msgstr "Alumni relations"
-
-#: webapp/models.py:107
-msgid "Others"
-msgstr ""
-
-#: webapp/models.py:112
-msgid "Category"
-msgstr ""
-
 #: webapp/models.py:116
 msgid "board member"
 msgstr "board member"
@@ -1095,27 +1031,39 @@ msgstr "board member"
 msgid "Description"
 msgstr "Description"
 
-#: webapp/models.py:136
+#: webapp/models.py:134
+msgid "Committee"
+msgstr ""
+
+#: webapp/models.py:135
+msgid "Committees"
+msgstr ""
+
+#: webapp/models.py:138
+msgid "Committee: {}"
+msgstr ""
+
+#: webapp/models.py:158
 msgid "Role"
 msgstr ""
 
-#: webapp/models.py:139
+#: webapp/models.py:161
 msgid "Start date"
 msgstr ""
 
-#: webapp/models.py:140
+#: webapp/models.py:162
 msgid "End date"
 msgstr ""
 
-#: webapp/models.py:150
+#: webapp/models.py:172
 msgid "Official"
 msgstr ""
 
-#: webapp/models.py:151
+#: webapp/models.py:173
 msgid "Officials"
 msgstr ""
 
-#: webapp/templates/contact.html:10 webapp/templates/navigation.html:20
+#: webapp/templates/contact.html:9 webapp/templates/navigation.html:20
 msgid "Contact"
 msgstr "Contact"
 
@@ -1123,6 +1071,10 @@ 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"
@@ -1143,6 +1095,10 @@ 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"
@@ -1159,6 +1115,12 @@ msgstr "Sössö"
 msgid "Corporate"
 msgstr "Corporate"
 
+#~ msgid "Sössö magazine"
+#~ msgstr "Sössö magazine"
+
+#~ msgid "Alumni relations"
+#~ msgstr "Alumni relations"
+
 #~ msgid "SIK Admin"
 #~ msgstr "SIK Admin"
 
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 03f7e96..d758578 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-03-02 02:43+0200\n"
+"POT-Creation-Date: 2018-05-22 23:51+0300\n"
 "PO-Revision-Date: 2017-11-02 23:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -51,10 +51,8 @@ msgid "External image"
 msgstr "Ulkoinen kuva"
 
 #: infoscreen/templates/infoscreen_admin.html:10
-#, fuzzy
-#| msgid "Infoscreen admin pane"
 msgid "Infoscreen admin"
-msgstr "Infonäyttöjen hallintapaneeli"
+msgstr "Infonäyttöjen hallinta"
 
 #: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:79
 msgid "Log out"
@@ -116,7 +114,7 @@ msgid "Delete"
 msgstr "Poista"
 
 #: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:39
-#: kaehmy/templates/list.html:36 webapp/models.py:110
+#: kaehmy/templates/list.html:36 webapp/models.py:110 webapp/models.py:140
 msgid "Name"
 msgstr "Nimi"
 
@@ -205,10 +203,8 @@ 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"
+msgstr "Kaehmy"
 
 #: kaehmy/models.py:25
 msgid "Preset kaehmy role"
@@ -226,7 +222,7 @@ msgstr "Uusi virka"
 msgid "Custom kaehmy roles"
 msgstr "Uudet kaehmyvirat"
 
-#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:16
+#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:15
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -254,7 +250,7 @@ msgstr "Kaehmylomake"
 msgid "Kaehmylomakkeet"
 msgstr "Kaehmylomakkeet"
 
-#: kaehmy/models.py:81 webapp/models.py:153
+#: kaehmy/models.py:81 webapp/models.py:175
 msgid "Phone number"
 msgstr "Puhelinnumero"
 
@@ -294,17 +290,15 @@ msgstr "Telegram-kanava"
 msgid "Telegram channels"
 msgstr "Telegram-kanavat"
 
-#: kaehmy/tables.py:13 webapp/models.py:137
+#: kaehmy/tables.py:13 webapp/models.py:159
 msgid "Roles"
 msgstr "Roolit"
 
-#: kaehmy/templates/error.html:8 members/templates/error.html:8
-#: templates/error.html:8
+#: kaehmy/templates/error.html:8 templates/error.html:8
 msgid "Error"
 msgstr "Virhe"
 
-#: kaehmy/templates/error.html:15 members/templates/error.html:15
-#: templates/error.html:15
+#: kaehmy/templates/error.html:15 templates/error.html:15
 msgid "Back"
 msgstr "Takaisin"
 
@@ -444,7 +438,7 @@ msgstr "Uusi kaehmy"
 msgid "Statistics"
 msgstr "Kaehmytilastot"
 
-#: members/forms.py:107 members/models.py:103 members/tables.py:46
+#: members/forms.py:107 members/models.py:102 members/tables.py:41
 msgid "Member"
 msgstr "Jäsen"
 
@@ -456,65 +450,65 @@ msgstr "Olen AYY:n jäsen"
 msgid "I want to receive a weekly newsletter"
 msgstr "Haluan saada viikottaisen jäsentiedotteen"
 
-#: members/models.py:14
+#: members/models.py:13
 msgid "First name"
 msgstr "Etunimi"
 
-#: members/models.py:15
+#: members/models.py:14
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: members/models.py:17
+#: members/models.py:16
 msgid "Place of residence"
 msgstr "Asuinpaikka"
 
-#: members/models.py:19 members/models.py:70
+#: members/models.py:18 members/models.py:69
 #: members/templates/member_add_many.html:39
 msgid "AYY"
 msgstr "AYY"
 
-#: members/models.py:20
+#: members/models.py:19
 msgid "JAS"
 msgstr "JAS"
 
-#: members/models.py:51
+#: members/models.py:50
 msgid "Submitted"
 msgstr "Lisätty"
 
-#: members/models.py:68
+#: members/models.py:67
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: members/models.py:69
+#: members/models.py:68
 msgid "Source"
 msgstr "Lähde"
 
-#: members/models.py:71
+#: members/models.py:70
 msgid "Cash"
 msgstr "Käteinen"
 
-#: members/models.py:72 members/templates/member_add_many.html:40
+#: members/models.py:71 members/templates/member_add_many.html:40
 msgid "Bank transfer"
 msgstr "Tilisiirto"
 
-#: members/models.py:96
+#: members/models.py:95
 msgid "Created"
 msgstr "Lisätty"
 
-#: members/models.py:104 members/templates/base.html:52
+#: members/models.py:103 members/templates/base.html:52
 #: members/templates/member_add_many_confirm.html:12
 msgid "Members"
 msgstr "Jäsenet"
 
-#: members/tables.py:14
+#: members/tables.py:15
 msgid "Last paid"
 msgstr "Viimeksi maksettu"
 
-#: members/tables.py:19 members/tables.py:51 members/tables.py:68
+#: members/tables.py:19 members/tables.py:45 members/tables.py:60
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: members/tables.py:33
+#: members/tables.py:31
 msgid " (not paid)"
 msgstr " (ei maksua)"
 
@@ -734,11 +728,11 @@ msgstr "Maksutapahtumia:"
 msgid "Language"
 msgstr "Kieli"
 
-#: members/templates/settings.html:20 sikweb/base.py:232
+#: members/templates/settings.html:20 sikweb/base.py:246
 msgid "Finnish"
 msgstr "suomi"
 
-#: members/templates/settings.html:21 sikweb/base.py:233
+#: members/templates/settings.html:21 sikweb/base.py:247
 msgid "English"
 msgstr "englanti"
 
@@ -767,32 +761,32 @@ msgstr "Onnistuneesti poistettiin hakemus"
 msgid "Could not delete application object"
 msgstr "Hakemusobjektia ei voitu poistaa"
 
-#: members/views/members.py:73 members/views/members.py:175
-#: members/views/members.py:199
+#: members/views/members.py:87 members/views/members.py:189
+#: members/views/members.py:213
 msgid "No member id specified"
 msgstr "Jäsenen ID ei määritelty"
 
-#: members/views/members.py:114
+#: members/views/members.py:128
 msgid "Failed to import members"
 msgstr "Jäsenten tuonti epäonnistui"
 
-#: members/views/members.py:128
+#: members/views/members.py:142
 msgid "Successfully added member"
 msgstr "Onnistuneesti lisättiin jäsen"
 
-#: members/views/members.py:149
+#: members/views/members.py:163
 msgid "Member missing 'id' field."
 msgstr "Jäsenen ID ei määritelty."
 
-#: members/views/members.py:158
+#: members/views/members.py:172
 msgid "Successfully updated member"
 msgstr "Onnistuneesti päivitettiin jäsen"
 
-#: members/views/members.py:179
+#: members/views/members.py:193
 msgid "Successfully deleted member"
 msgstr "Onnistuneesti poistettiin jäsen"
 
-#: members/views/members.py:188
+#: members/views/members.py:202
 msgid "Could not delete member object"
 msgstr "Jäsenobjektia ei voitu poistaa"
 
@@ -1028,68 +1022,6 @@ msgstr "Ilmoittautuminen"
 msgid "Registrations"
 msgstr "Ilmoittautumiset"
 
-#: webapp/models.py:94
-msgid "Corporate affairs"
-msgstr "Yrityssuhteet"
-
-#: webapp/models.py:95 webapp/templates/freshmen.html:10
-#: webapp/templates/navigation.html:8
-msgid "Freshmen"
-msgstr "Fuksit"
-
-#: webapp/models.py:96 webapp/templates/international.html:10
-#: webapp/templates/navigation.html:14
-msgid "International"
-msgstr "International"
-
-#: webapp/models.py:97
-msgid "External affairs"
-msgstr "Ulkosuhteet"
-
-#: webapp/models.py:98
-msgid "Media"
-msgstr "Media"
-
-#: webapp/models.py:99
-msgid "Technology"
-msgstr "Teknologia"
-
-#: webapp/models.py:100
-msgid "Wellbeing"
-msgstr "Hyvinvointi"
-
-#: webapp/models.py:101
-msgid "Elepaja"
-msgstr "Elepaja"
-
-#: webapp/models.py:102
-msgid "Ceremonies"
-msgstr "Hupitapahtumat"
-
-#: webapp/models.py:103
-msgid "Culture"
-msgstr "Kulttuuri"
-
-#: webapp/models.py:104
-msgid "Studies"
-msgstr "Opinnot"
-
-#: webapp/models.py:105
-msgid "Sössö magazine"
-msgstr "Kiltalehti Sössö"
-
-#: webapp/models.py:106
-msgid "Alumni relations"
-msgstr "Alumnisuhteet"
-
-#: webapp/models.py:107
-msgid "Others"
-msgstr "Muut"
-
-#: webapp/models.py:112
-msgid "Category"
-msgstr "Kategoria"
-
 #: webapp/models.py:116
 msgid "board member"
 msgstr "hallituksen jäsen"
@@ -1098,27 +1030,39 @@ msgstr "hallituksen jäsen"
 msgid "Description"
 msgstr "Kuvaus"
 
-#: webapp/models.py:136
+#: webapp/models.py:134
+msgid "Committee"
+msgstr "Toimikunta"
+
+#: webapp/models.py:135
+msgid "Committees"
+msgstr "Toimikunnat"
+
+#: webapp/models.py:138
+msgid "Committee: {}"
+msgstr "Toimikunta: {}"
+
+#: webapp/models.py:158
 msgid "Role"
 msgstr "Rooli"
 
-#: webapp/models.py:139
+#: webapp/models.py:161
 msgid "Start date"
 msgstr "Alkupäivämäärä"
 
-#: webapp/models.py:140
+#: webapp/models.py:162
 msgid "End date"
 msgstr "Loppupäivämäärä"
 
-#: webapp/models.py:150
+#: webapp/models.py:172
 msgid "Official"
 msgstr "Toimihenkilö"
 
-#: webapp/models.py:151
+#: webapp/models.py:173
 msgid "Officials"
 msgstr "Toimihenkilöt"
 
-#: webapp/templates/contact.html:10 webapp/templates/navigation.html:20
+#: webapp/templates/contact.html:9 webapp/templates/navigation.html:20
 msgid "Contact"
 msgstr "Yhteystiedot"
 
@@ -1126,6 +1070,10 @@ 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"
@@ -1146,6 +1094,10 @@ 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"
@@ -1162,6 +1114,45 @@ msgstr "Sössö"
 msgid "Corporate"
 msgstr "Yritys"
 
+#~ 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"