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

Merge branch 'develop' into feature/webhooks

Browse Source
This commit is contained in:
Aarni Halinen
2022-01-13 22:18:59 +02:00
parent 867996ae27 1dc5d45e96
commit 02634c8e02
7 changed files with 207 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/en/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/en/LC_MESSAGES/django.po
+37 -50
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 00:07+0200\n"
"POT-Creation-Date: 2022-01-13 22:18+0200\n"
"PO-Revision-Date: 2017-11-02 23:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -37,7 +37,7 @@ msgstr "Sössö articles"
msgid "Today's lunch"
msgstr ""
#: infoscreen/models.py:212 webapp/models.py:73
#: infoscreen/models.py:212 webapp/models.py:93
msgid "Events"
msgstr "Events"
@@ -113,7 +113,7 @@ msgid "Delete"
msgstr "Delete"
#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:57
#: kaehmy/templates/list.html:36 webapp/models.py:147 webapp/models.py:176
#: kaehmy/templates/list.html:36 webapp/models.py:188 webapp/models.py:223
msgid "Name"
msgstr "Name"
@@ -327,7 +327,7 @@ msgstr ""
msgid "Custom role name"
msgstr ""
#: kaehmy/models.py:105 webapp/models.py:177
#: kaehmy/models.py:105 webapp/models.py:224
msgid "Board member"
msgstr "Board member"
@@ -419,8 +419,6 @@ msgid "Päivämääriä & deadlineja"
msgstr "Dates and deadlines"
#: kaehmy/templates/kaehmy.html:31
#, fuzzy
#| msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
msgid "Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli"
msgstr "Election meeting, part 1 (chairman election)"
@@ -437,14 +435,7 @@ msgid "Vaalikokous, osa 3 (toimarien valinta)"
msgstr "Election meeting, part 3 (non-board election)"
#: kaehmy/templates/kaehmy.html:77
#, fuzzy, python-format
#| msgid ""
#| "\n"
#| " Hyväksyn <a href=\"https://sik.ayy.fi/files/official/"
#| "Tietosuojaseloste%%20%%E2%%80%%93%%20Toimihenkil%%C3%%B6ksi%%20hakemisen"
#| "%%20rekisteri.pdf\" target=\"_blank\">tietosuojaselosteen</a> ja "
#| "tietojeni tallentamisen.\n"
#| " "
#, python-format
msgid ""
"\n"
" Hyväksyn <a href=\"https://static.sahkoinsinoorikilta.fi/"
@@ -1100,10 +1091,6 @@ msgstr ""
msgid "Challenge"
msgstr "Challenge"
#: ohlhafv/views.py:44
msgid "You have been challenged at Ohlhafv!"
msgstr ""
#: templates/admin/base_site.html:44
msgid "Go"
msgstr "Go"
@@ -1113,132 +1100,132 @@ msgstr "Go"
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/models.py:21
#: webapp/models.py:20
msgid "Webapp"
msgstr "Webapp"
#: webapp/models.py:29
#: webapp/models.py:28
msgid "Tag"
msgstr "Tag"
#: webapp/models.py:30
#: webapp/models.py:29
msgid "Tags"
msgstr "Tags"
#: webapp/models.py:37
#: webapp/models.py:36
msgid "Tag: {}"
msgstr "Tag: {}"
#: webapp/models.py:55
#: webapp/models.py:54
msgid "Feed"
msgstr ""
#: webapp/models.py:56
#: webapp/models.py:55
msgid "Feeds"
msgstr ""
#: webapp/models.py:64 webapp/models.py:83 webapp/models.py:122
#: webapp/models.py:155 webapp/models.py:201
#: webapp/models.py:63 webapp/models.py:102 webapp/models.py:162
#: webapp/models.py:196 webapp/models.py:248
msgid "Deleted: "
msgstr "Deleted: "
#: webapp/models.py:65
#: webapp/models.py:64
msgid "{}Feed: {}"
msgstr ""
#: webapp/models.py:72
#: webapp/models.py:92
msgid "Event"
msgstr ""
#: webapp/models.py:84
#: webapp/models.py:103
msgid "{}Event: {}"
msgstr ""
#: webapp/models.py:93
#: webapp/models.py:133
msgid "Template question"
msgstr ""
#: webapp/models.py:94
#: webapp/models.py:134
msgid "Template questions"
msgstr ""
#: webapp/models.py:101
#: webapp/models.py:141
msgid "Template questions: {}"
msgstr ""
#: webapp/models.py:108
#: webapp/models.py:148
msgid "Signup form"
msgstr ""
#: webapp/models.py:109
#: webapp/models.py:149
msgid "Signup forms"
msgstr ""
#: webapp/models.py:123
#: webapp/models.py:163
msgid "#{} {}{}"
msgstr ""
#: webapp/models.py:141
#: webapp/models.py:181
msgid "Sign-up"
msgstr ""
#: webapp/models.py:142
#: webapp/models.py:182
msgid "Sign-ups"
msgstr ""
#: webapp/models.py:181
#: webapp/models.py:228
msgid "board member"
msgstr "board member"
#: webapp/models.py:188
#: webapp/models.py:235
msgid "JobAd"
msgstr ""
#: webapp/models.py:189
#: webapp/models.py:236
msgid "JobAds"
msgstr ""
#: webapp/models.py:211
#: webapp/models.py:295
#, fuzzy
#| msgid "Kaehmy"
msgid "Hook Kaehmys"
msgstr "Kaehmy"
#: webapp/models.py:212
#: webapp/models.py:296
#, fuzzy
#| msgid "Total challenges:"
msgid "Hook Ohlhafv challenges"
msgstr "Total challenges:"
#: webapp/models.py:213
#: webapp/models.py:297
msgid "Hook published news"
msgstr ""
#: webapp/models.py:214
#: webapp/models.py:298
msgid "Hook published Job Ads"
msgstr ""
#: webapp/models.py:215
#: webapp/models.py:299
msgid "Hook published events"
msgstr ""
#: webapp/models.py:216
#: webapp/models.py:300
msgid "Hook opened signups"
msgstr ""
#: webapp/models.py:241
#: webapp/models.py:325
msgid "Webhook"
msgstr ""
#: webapp/models.py:242
#: webapp/models.py:326
msgid "Webhooks"
msgstr ""
#: webapp/models.py:256
#: webapp/models.py:339
msgid "Telegram channel"
msgstr ""
#: webapp/models.py:257
#: webapp/models.py:340
msgid "Telegram channels"
msgstr ""