Merge develop to branch

locale/fi/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-28 22:57+0300\n"
+"POT-Creation-Date: 2017-09-28 23:40+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -522,10 +522,6 @@ msgstr "Maksutapahtumaobjektia ei voitu päivittää"
 msgid "Missing \"textfield\" POST request field"
 msgstr "Puuttuva \"textfield\" POST-kenttä"
 
-#: templates/admin/base_site.html:33
-msgid "language"
-msgstr "Kieli"
-
 #: templates/admin/base_site.html:43
 msgid "Go"
 msgstr "Vaihda"
@@ -630,6 +626,30 @@ msgstr "SIK Hallintapaneeli"
 msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
 
+#: webapp/templates/contact.html:7 webapp/templates/navigation.html:32
+msgid "Contact"
+msgstr "Yhteystiedot"
+
+#: webapp/templates/event_calendar.html:7 webapp/templates/navigation.html:29
+msgid "Event calendar"
+msgstr "Tapahtumakalenteri"
+
+#: webapp/templates/freshmen.html:7 webapp/templates/navigation.html:16
+msgid "Freshmen"
+msgstr "Fuksit"
+
+#: webapp/templates/guild.html:7
+msgid "Kilta"
+msgstr ""
+
+#: webapp/templates/international.html:7 webapp/templates/navigation.html:30
+msgid "International"
+msgstr "International"
+
+#: webapp/templates/jobs.html:7 webapp/templates/navigation.html:20
+msgid "Jobs"
+msgstr "Työpaikat"
+
 #: webapp/templates/login.html:25 webapp/templates/login.html:27
 msgid "Username"
 msgstr "Käyttäjänimi"
@@ -650,22 +670,18 @@ msgstr "Infonäyttö"
 msgid "Admin tools"
 msgstr "Hallintatyökalut"
 
-#: webapp/templates/navigation.html:29
-msgid "Event calendar"
-msgstr "Tapahtumakalenteri"
+#: webapp/templates/navigation.html:15
+msgid "Guild"
+msgstr "Kilta"
 
-#: webapp/templates/navigation.html:30
-msgid "International"
-msgstr "International"
+#: webapp/templates/navigation.html:18
+msgid "Corporate"
+msgstr "Yritys"
 
-#: webapp/templates/navigation.html:31
+#: webapp/templates/navigation.html:31 webapp/templates/sosso.html:7
 msgid "Sössö"
 msgstr "Sössö"
 
-#: webapp/templates/navigation.html:32
-msgid "Contact"
-msgstr "Yhteystiedot"
-
 #: webapp/templates/ohlhafv.html:8
 msgid "Ohlhafv"
 msgstr "Øhlhäfv"
@@ -681,3 +697,6 @@ msgstr "Kaikki haasteet"
 #: webapp/templates/ohlhafv_list.html:15
 msgid "Total challenges:"
 msgstr "Haasteita yhteensä:"
+
+#~ msgid "language"
+#~ msgstr "Kieli"