Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated translation in event edit #797

Merged
merged 4 commits into from
Mar 13, 2024
Merged

Updated translation in event edit #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
886974d
Updated translation in event edit
edvardeid Mar 13, 2024
49998d9
Merge branch 'master' into 788-translation-tag
edvardeid Mar 13, 2024
3b7c4d7
removed python version file
edvardeid Mar 13, 2024
60994af
Merge branch 'master' into 788-translation-tag
CJGutz Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ venv/
*.mo
*.html.py
*.txt.py
pyenv/
pyenv/
.python-version
2 changes: 1 addition & 1 deletion applications/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion applications/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion files/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion files/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion internalportal/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion internalportal/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion inventory/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion inventory/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
19 changes: 14 additions & 5 deletions news/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -213,7 +213,7 @@ msgid "Lagre og publiser artikkel"
msgstr "Save and publish article"

#: news/templates/news/edit_article.html:76
#: news/templates/news/edit_event.html:241
#: news/templates/news/edit_event.html:239
msgid "Lagre som utkast"
msgstr "Save as draft"

Expand All @@ -237,12 +237,21 @@ msgstr "Skills"
msgid "Filer"
msgstr "Files"

#: news/templates/news/edit_event.html:220
#: news/templates/news/edit_event.html:199
msgid ""
"Det kan være nyttig å legge ved powerpoint eller andre relevante filer i "
"arrangementet. Da får deltakerene mulighet til å gjøre seg klare før "
"arrangementet starter."
msgstr ""
"It can be beneficial to add relevant documents to let participants prepare "
"ahead of time."

#: news/templates/news/edit_event.html:218
msgid "Ferdig"
msgstr "Done"

#: news/templates/news/edit_event.html:235
#: news/templates/news/edit_event.html:238
#: news/templates/news/edit_event.html:233
#: news/templates/news/edit_event.html:236
msgid "Lagre og publiser arrangement"
msgstr "Save and publish event"

Expand Down
17 changes: 12 additions & 5 deletions news/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -217,7 +217,7 @@ msgid "Lagre og publiser artikkel"
msgstr ""

#: news/templates/news/edit_article.html:76
#: news/templates/news/edit_event.html:241
#: news/templates/news/edit_event.html:239
msgid "Lagre som utkast"
msgstr ""

Expand All @@ -241,12 +241,19 @@ msgstr ""
msgid "Filer"
msgstr ""

#: news/templates/news/edit_event.html:220
#: news/templates/news/edit_event.html:199
msgid ""
"Det kan være nyttig å legge ved powerpoint eller andre relevante filer i "
"arrangementet. Da får deltakerene mulighet til å gjøre seg klare før "
"arrangementet starter."
msgstr ""

#: news/templates/news/edit_event.html:218
msgid "Ferdig"
msgstr ""

#: news/templates/news/edit_event.html:235
#: news/templates/news/edit_event.html:238
#: news/templates/news/edit_event.html:233
#: news/templates/news/edit_event.html:236
msgid "Lagre og publiser arrangement"
msgstr ""

Expand Down
4 changes: 1 addition & 3 deletions news/templates/news/edit_event.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,7 @@ <h5>{% trans "Ferdigheter" %}</h5>
<div class="row">
<div class="col s12">
<h5>{% trans "Filer" %}</h5>
<p>{% trans "Det kan være nyttig å legge ved powerpoint eller andre relevante filer i
arrangementet.
Da får deltakerene mulighet til å gjøre seg klare før arrangementet starter." %}</p>
<p>{% trans "Det kan være nyttig å legge ved powerpoint eller andre relevante filer i arrangementet. Da får deltakerene mulighet til å gjøre seg klare før arrangementet starter." %}</p>
<div class="divider"></div>
<br>
</div>
Expand Down
2 changes: 1 addition & 1 deletion projectarchive/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion projectarchive/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion reservations/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion reservations/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion userprofile/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion userprofile/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion watchlist/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion watchlist/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-24 15:22+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
14 changes: 7 additions & 7 deletions website/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -435,25 +435,25 @@ msgstr "No rules found"
#: website/templates/website/tos-returningls.html:12
msgid ""
"Vi har oppdatert våre retningslinjer for behandling av personinformasjon"
msgstr ""
"We have updated our privacy policy"
msgstr "We have updated our privacy policy"

#: website/templates/website/tos-returningls.html:16
msgid ""
"I forbindelse med nye lovverk (vektlagt er Personvernforordningen, også "
"kjent som GDPR) og formalisering internt i organisasjonen, ønsker vi å "
"informere og innhente nytt samtykke om bruk av personvern i Hackerspace."
msgstr ""
"With regulations for personal information (GDPR), we whish to inform "
"you about our updated privacy policy. We request that you concent to our "
"terms and conditions in Hackerspace NTNU."
"With regulations for personal information (GDPR), we whish to inform you "
"about our updated privacy policy. We request that you concent to our terms "
"and conditions in Hackerspace NTNU."

#: website/templates/website/tos-returningls.html:18
msgid ""
"Vennligst bekreft at du har lest og godtar informasjonen og samtykker til "
"vilkårene tilgjengelig"
msgstr ""
"Please confirm that you have read and accepted the information and concent to the terms"
"Please confirm that you have read and accepted the information and concent "
"to the terms"

#: website/templates/website/tos-returningls.html:18
#, fuzzy
Expand Down
2 changes: 1 addition & 1 deletion website/locale/nb/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-27 01:01+0100\n"
"POT-Creation-Date: 2024-03-13 20:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down