diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index b901384..d8f27f1 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 158fbe0..afde5f3 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/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 \n" "Language-Team: LANGUAGE \n" @@ -81,10 +81,8 @@ msgid "Create new item" msgstr "Create new item" #: infoscreen/templates/infoscreen_admin.html:50 -#, fuzzy -#| msgid "Create new item" msgid "Create a new item by type" -msgstr "Create new item" +msgstr "Create a new item by type" #: infoscreen/templates/infoscreen_admin.html:53 msgid "Item type" @@ -532,12 +530,6 @@ msgstr "Could not update payment object" msgid "Missing \"textfield\" POST request field" msgstr "Missing \"textfield\" POST request field" -#: templates/admin/base_site.html:33 -#, fuzzy -#| msgid "Language" -msgid "language" -msgstr "Language" - #: templates/admin/base_site.html:43 msgid "Go" msgstr "" @@ -654,6 +646,30 @@ msgstr "SIK Admin" 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 "Contact" + +#: webapp/templates/event_calendar.html:7 webapp/templates/navigation.html:29 +msgid "Event calendar" +msgstr "Event calendar" + +#: webapp/templates/freshmen.html:7 webapp/templates/navigation.html:16 +msgid "Freshmen" +msgstr "Freshmen" + +#: webapp/templates/guild.html:7 +msgid "Kilta" +msgstr "Guild" + +#: 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 "Jobs" + #: webapp/templates/login.html:25 webapp/templates/login.html:27 msgid "Username" msgstr "Username" @@ -674,37 +690,38 @@ msgstr "Infoscreen" msgid "Admin tools" msgstr "Admin tools" -#: webapp/templates/navigation.html:29 -msgid "Event calendar" -msgstr "Event calendar" +#: webapp/templates/navigation.html:15 +msgid "Guild" +msgstr "Guild" -#: webapp/templates/navigation.html:30 -msgid "International" -msgstr "International" +#: webapp/templates/navigation.html:18 +msgid "Corporate" +msgstr "Corporate" -#: 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 "Contact" - #: webapp/templates/ohlhafv.html:8 msgid "Ohlhafv" -msgstr "" +msgstr "Ohlhafv" #: webapp/templates/ohlhafv.html:15 msgid "Challenge" -msgstr "" +msgstr "Challenge" #: webapp/templates/ohlhafv_list.html:11 msgid "All challenges" -msgstr "" +msgstr "All challenges" #: webapp/templates/ohlhafv_list.html:15 msgid "Total challenges:" -msgstr "" +msgstr "Total challenges:" + +#, fuzzy +#~| msgid "Language" +#~ msgid "language" +#~ msgstr "Language" #~ msgid "Successfully imported multiple members" #~ msgstr "Successfully imported multiple members" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 23bf56e..619b7a6 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 66aa1fd..758ca35 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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" diff --git a/webapp/templates/contact.html b/webapp/templates/contact.html new file mode 100644 index 0000000..58e342a --- /dev/null +++ b/webapp/templates/contact.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "Contact" %}

+
+ +{% endblock %} diff --git a/webapp/templates/event_calendar.html b/webapp/templates/event_calendar.html new file mode 100644 index 0000000..ab6a7e3 --- /dev/null +++ b/webapp/templates/event_calendar.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "Event calendar" %}

+
+ +{% endblock %} diff --git a/webapp/templates/freshmen.html b/webapp/templates/freshmen.html new file mode 100644 index 0000000..ae521fc --- /dev/null +++ b/webapp/templates/freshmen.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "Freshmen" %}

+
+ +{% endblock %} diff --git a/webapp/templates/guild.html b/webapp/templates/guild.html new file mode 100644 index 0000000..9daddfc --- /dev/null +++ b/webapp/templates/guild.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "Kilta" %}

+
+ +{% endblock %} diff --git a/webapp/templates/international.html b/webapp/templates/international.html new file mode 100644 index 0000000..bba5b35 --- /dev/null +++ b/webapp/templates/international.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "International" %}

+
+ +{% endblock %} diff --git a/webapp/templates/jobs.html b/webapp/templates/jobs.html new file mode 100644 index 0000000..ae4ec03 --- /dev/null +++ b/webapp/templates/jobs.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "Jobs" %}

+
+ +{% endblock %} diff --git a/webapp/templates/navigation.html b/webapp/templates/navigation.html index 92fbfcf..6ed4ce7 100644 --- a/webapp/templates/navigation.html +++ b/webapp/templates/navigation.html @@ -7,17 +7,17 @@ - +