TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge develop to branch

Browse Source
This commit is contained in:
Jan Tuomi
2017-09-28 23:42:51 +03:00
parent 8f06190bd0 ff801f5e08
commit bfc462a332
14 changed files with 216 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/en/LC_MESSAGES/django.po
+42 -25
View File
@@ -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"
@@ -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"