Commit 67857ec2 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'obsolete_translations_thaliawebsite' into 'master'

Remove obsolete translations

See merge request !981
parents 84a17101 18dc0355
...@@ -16,6 +16,14 @@ stages: ...@@ -16,6 +16,14 @@ stages:
- test - test
- deploy - deploy
obsolete-translations:
stage: test
image: $PY37_IMAGE
cache: {}
script:
# Check for obsolete translations in .po files (starting with `#~`).
- (grep --include="*.po" --quiet --recursive --regexp "^#~" website && exit 1) || exit 0
pep8: pep8:
stage: test stage: test
image: $PY36_IMAGE image: $PY36_IMAGE
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-11 20:07+0200\n" "POT-Creation-Date: 2018-10-05 15:12+0200\n"
"PO-Revision-Date: 2018-06-13 21:48+0200\n" "PO-Revision-Date: 2018-06-13 21:48+0200\n"
"Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n" "Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
"Language-Team: \n" "Language-Team: \n"
...@@ -18,116 +18,115 @@ msgstr "" ...@@ -18,116 +18,115 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.6\n" "X-Generator: Poedit 2.0.6\n"
#: documents/admin.py #: admin.py
msgid "lecture year" msgid "lecture year"
msgstr "college jaar" msgstr "college jaar"
#: documents/apps.py documents/models.py #: apps.py models.py templates/documents/index.html
#: documents/templates/documents/index.html
msgid "Documents" msgid "Documents"
msgstr "Documenten" msgstr "Documenten"
#: documents/models.py #: models.py
msgid "Document" msgid "Document"
msgstr "Document" msgstr "Document"
#: documents/models.py #: models.py
msgid "Annual document" msgid "Annual document"
msgstr "Jaarlijks document" msgstr "Jaarlijks document"
#: documents/models.py #: models.py
msgid "Association document" msgid "Association document"
msgstr "Verenigingsdocument" msgstr "Verenigingsdocument"
#: documents/models.py documents/templates/documents/meetingyear.html #: models.py templates/documents/meetingyear.html
msgid "Minutes" msgid "Minutes"
msgstr "Notulen" msgstr "Notulen"
#: documents/models.py #: models.py
msgid "Miscellaneous document" msgid "Miscellaneous document"
msgstr "Overig document" msgstr "Overig document"
#: documents/models.py #: models.py
msgid "name" msgid "name"
msgstr "naam" msgstr "naam"
#: documents/models.py #: models.py
msgid "created" msgid "created"
msgstr "aangemaakt op" msgstr "aangemaakt op"
#: documents/models.py #: models.py
msgid "last updated" msgid "last updated"
msgstr "laatst aangemaakt op" msgstr "laatst aangemaakt op"
#: documents/models.py #: models.py
msgid "category" msgid "category"
msgstr "categorie" msgstr "categorie"
#: documents/models.py #: models.py
msgid "file" msgid "file"
msgstr "bestand" msgstr "bestand"
#: documents/models.py #: models.py
msgid "members only" msgid "members only"
msgstr "alleen voor leden" msgstr "alleen voor leden"
#: documents/models.py #: models.py
msgid "Annual documents" msgid "Annual documents"
msgstr "Jaarlijkse documenten" msgstr "Jaarlijkse documenten"
#: documents/models.py documents/templates/documents/index.html #: models.py templates/documents/index.html
msgid "Annual report" msgid "Annual report"
msgstr "Jaarverslag" msgstr "Jaarverslag"
#: documents/models.py #: models.py
msgid "Financial report" msgid "Financial report"
msgstr "Financieel jaarverslag" msgstr "Financieel jaarverslag"
#: documents/models.py #: models.py
msgid "Policy document" msgid "Policy document"
msgstr "Beleidsdocument" msgstr "Beleidsdocument"
#: documents/models.py #: models.py
msgid "year" msgid "year"
msgstr "jaar" msgstr "jaar"
#: documents/models.py #: models.py
msgid "Miscellaneous association document" msgid "Miscellaneous association document"
msgstr "Overig verenigingsdocument" msgstr "Overig verenigingsdocument"
#: documents/models.py #: models.py
msgid "Miscellaneous association documents" msgid "Miscellaneous association documents"
msgstr "Overige verenigingsdocumenten" msgstr "Overige verenigingsdocumenten"
#: documents/models.py #: models.py
msgid "Miscellaneous documents" msgid "Miscellaneous documents"
msgstr "Overig documenten" msgstr "Overig documenten"
#: documents/models.py #: models.py
msgid "General meeting" msgid "General meeting"
msgstr "Algemene ledenvergadering" msgstr "Algemene ledenvergadering"
#: documents/models.py #: models.py
msgid "General meetings" msgid "General meetings"
msgstr "Algemene ledenvergaderingen" msgstr "Algemene ledenvergaderingen"
#: documents/models.py #: models.py
msgid "documents" msgid "documents"
msgstr "documenten" msgstr "documenten"
#: documents/models.py #: models.py
msgid "datetime" msgid "datetime"
msgstr "tijdstip" msgstr "tijdstip"
#: documents/models.py #: models.py
msgid "location" msgid "location"
msgstr "locatie" msgstr "locatie"
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "Miscellaneous Association Documents" msgid "Miscellaneous Association Documents"
msgstr "Overige Verenigingsdocumenten" msgstr "Overige Verenigingsdocumenten"
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "" msgid ""
"Thalia was officially founded on November 7th, 1990. The relevant statutes " "Thalia was officially founded on November 7th, 1990. The relevant statutes "
"and internal rules can be accessed here. The statues have last been amended " "and internal rules can be accessed here. The statues have last been amended "
...@@ -145,11 +144,11 @@ msgstr "" ...@@ -145,11 +144,11 @@ msgstr ""
"\"https://olympus.science.ru.nl\">de website van koepelvereniging Olympus</" "\"https://olympus.science.ru.nl\">de website van koepelvereniging Olympus</"
"a>." "a>."
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "Policy Documents &amp; Annual Reports" msgid "Policy Documents &amp; Annual Reports"
msgstr "Beleidsdocumenten &amp; Jaarverslagen" msgstr "Beleidsdocumenten &amp; Jaarverslagen"
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "" msgid ""
"Every candidate board of Thalia drafts a policy document before being " "Every candidate board of Thalia drafts a policy document before being "
"installed, to detail their plans for the next year. This also includes a " "installed, to detail their plans for the next year. This also includes a "
...@@ -170,15 +169,15 @@ msgstr "" ...@@ -170,15 +169,15 @@ msgstr ""
"er zijn georganiseerd. In het onderstaande overzicht zijn de afgelopen " "er zijn georganiseerd. In het onderstaande overzicht zijn de afgelopen "
"beleidsplannen en jaarverslagen terug te vinden." "beleidsplannen en jaarverslagen terug te vinden."
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "Policy" msgid "Policy"
msgstr "Beleidsdocument" msgstr "Beleidsdocument"
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "General Meetings" msgid "General Meetings"
msgstr "Algemene Ledenvergaderingen" msgstr "Algemene Ledenvergaderingen"
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "" msgid ""
"The General Meetings (ALVs) can be attended by all members, honorary members " "The General Meetings (ALVs) can be attended by all members, honorary members "
"and donors. Thalia organizes at least two general meetings each year. " "and donors. Thalia organizes at least two general meetings each year. "
...@@ -193,34 +192,28 @@ msgstr "" ...@@ -193,34 +192,28 @@ msgstr ""
"en begunstigers die niet aanwezig waren teruglezen wat er allemaal besproken " "en begunstigers die niet aanwezig waren teruglezen wat er allemaal besproken "
"is." "is."
#: documents/templates/documents/index.html #: templates/documents/index.html
msgid "Earlier.." msgid "Earlier.."
msgstr "Eerder.." msgstr "Eerder.."
#: documents/templates/documents/meetingyear.html #: templates/documents/meetingyear.html
#, python-format #, python-format
msgid "General Meetings of %(year)s-%(nextyear)s:" msgid "General Meetings of %(year)s-%(nextyear)s:"
msgstr "ALV's van %(year)s-%(nextyear)s:" msgstr "ALV's van %(year)s-%(nextyear)s:"
#: documents/templates/documents/meetingyear.html #: templates/documents/meetingyear.html
msgid "Meeting" msgid "Meeting"
msgstr "ALV" msgstr "ALV"
#: documents/templates/documents/meetingyear.html #: templates/documents/meetingyear.html
msgid "No minutes<br>available" msgid "No minutes<br>available"
msgstr "Geen notulen<br>beschikbaar" msgstr "Geen notulen<br>beschikbaar"
#: documents/templates/documents/meetingyear.html #: templates/documents/meetingyear.html
msgid "Only signed-in users can view<br>General Meeting documents." msgid "Only signed-in users can view<br>General Meeting documents."
msgstr "ALV-stukken zijn alleen in te zien<br>door ingelogde gebruikers." msgstr "ALV-stukken zijn alleen in te zien<br>door ingelogde gebruikers."
#: documents/templates/documents/meetingyear.html #: templates/documents/meetingyear.html
#, python-format #, python-format
msgid "There are no General Meetings available for %(year)s-%(nextyear)s" msgid "There are no General Meetings available for %(year)s-%(nextyear)s"
msgstr "Er zijn geen ALV's beschikbaar van %(year)s-%(nextyear)s" msgstr "Er zijn geen ALV's beschikbaar van %(year)s-%(nextyear)s"
#~ msgid "the website of umbrella association Olympus"
#~ msgstr "de website van koepelvereniging Olympus"
#~ msgid "General Meetings of"
#~ msgstr "ALV's van"
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-11 20:07+0200\n" "POT-Creation-Date: 2018-10-05 15:13+0200\n"
"PO-Revision-Date: 2018-08-19 15:24+0200\n" "PO-Revision-Date: 2018-08-19 15:24+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n" "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n" "Language-Team: \n"
...@@ -18,86 +18,83 @@ msgstr "" ...@@ -18,86 +18,83 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n" "X-Generator: Poedit 2.1.1\n"
#: partners/apps.py partners/templates/partners/index.html #: apps.py templates/partners/index.html templates/partners/partner.html
#: partners/templates/partners/partner.html
msgid "Partners" msgid "Partners"
msgstr "Partners" msgstr "Partners"
#: partners/models.py #: models.py
msgid "Enter a valid address" msgid "Enter a valid address"
msgstr "Voer een geldig adres in" msgstr "Voer een geldig adres in"
#: partners/models.py #: models.py
msgid "Enter a valid zip code" msgid "Enter a valid zip code"
msgstr "Voer een geldige postcode in" msgstr "Voer een geldige postcode in"
#: partners/models.py #: models.py
msgid "image of {}" msgid "image of {}"
msgstr "plaatje van {}" msgstr "plaatje van {}"
#: partners/models.py #: models.py
msgid "Vacancy Categories" msgid "Vacancy Categories"
msgstr "Vacaturecategorieën" msgstr "Vacaturecategorieën"
#: partners/models.py #: models.py
msgid "" msgid ""
"When you use a partner, the company name and logo below will not be used." "When you use a partner, the company name and logo below will not be used."
msgstr "" msgstr ""
"Wanneer je een partner aangeeft, zullen de bedrijfsnaam en logo hieronder " "Wanneer je een partner aangeeft, zullen de bedrijfsnaam en logo hieronder "
"niet gebruikt worden." "niet gebruikt worden."
#: partners/models.py #: models.py
msgid "not shown on the page" msgid "not shown on the page"
msgstr "wordt niet getoond op de vacaturepagina" msgstr "wordt niet getoond op de vacaturepagina"
#: partners/models.py partners/templates/partners/partner.html #: models.py templates/partners/partner.html templates/partners/vacancies.html
#: partners/templates/partners/vacancies.html
msgid "Vacancies" msgid "Vacancies"
msgstr "Vacatures" msgstr "Vacatures"
#: partners/models.py #: models.py
msgid "title" msgid "title"
msgstr "titel" msgstr "titel"
#: partners/models.py #: models.py
msgid "description" msgid "description"
msgstr "beschrijving" msgstr "beschrijving"
#: partners/models.py #: models.py
msgid "location" msgid "location"
msgstr "locatie" msgstr "locatie"
#: partners/models.py #: models.py
msgid "start time" msgid "start time"
msgstr "starttijd" msgstr "starttijd"
#: partners/models.py #: models.py
msgid "end time" msgid "end time"
msgstr "eindtijd" msgstr "eindtijd"
#: partners/models.py #: models.py
msgid "website" msgid "website"
msgstr "website" msgstr "website"
#: partners/models.py #: models.py
msgid "published" msgid "published"
msgstr "gepubliceerd" msgstr "gepubliceerd"
#: partners/models.py #: models.py
msgid "Please select or enter a partner for this event." msgid "Please select or enter a partner for this event."
msgstr "Selecteer of vul een partner in voor dit evenement." msgstr "Selecteer of vul een partner in voor dit evenement."
#: partners/templates/partners/index.html #: templates/partners/index.html templates/partners/partner.html
#: partners/templates/partners/partner.html #: templates/partners/vacancies.html
#: partners/templates/partners/vacancies.html
msgid "Career" msgid "Career"
msgstr "Carrière" msgstr "Carrière"
#: partners/templates/partners/index.html #: templates/partners/index.html
msgid "Our partners" msgid "Our partners"
msgstr "Onze partners" msgstr "Onze partners"
#: partners/templates/partners/index.html #: templates/partners/index.html
msgid "" msgid ""
"A brief introduction about our study association for Computer and " "A brief introduction about our study association for Computer and "
"Information Sciences, Thalia. As a study association we put great effort in " "Information Sciences, Thalia. As a study association we put great effort in "
...@@ -120,43 +117,41 @@ msgstr "" ...@@ -120,43 +117,41 @@ msgstr ""
"commissaris externe betrekkingen, die te bereiken is via <a href=\"mailto:" "commissaris externe betrekkingen, die te bereiken is via <a href=\"mailto:"
"samenwerking@thalia.nu\" target=\"_blank\">samenwerking@thalia.nu</a>." "samenwerking@thalia.nu\" target=\"_blank\">samenwerking@thalia.nu</a>."
#: partners/templates/partners/index.html #: templates/partners/index.html templates/partners/partner.html
#: partners/templates/partners/partner.html
msgid "Main Partner" msgid "Main Partner"
msgstr "Hoofdpartner" msgstr "Hoofdpartner"
#: partners/templates/partners/index.html #: templates/partners/index.html templates/partners/partner.html
#: partners/templates/partners/partner.html #: templates/partners/vacancies.html
#: partners/templates/partners/vacancies.html
msgid "Learn more" msgid "Learn more"
msgstr "Lees meer" msgstr "Lees meer"
#: partners/templates/partners/partner.html #: templates/partners/partner.html
#, python-format #, python-format
msgid "About %(name)s" msgid "About %(name)s"
msgstr "Over %(name)s" msgstr "Over %(name)s"
#: partners/templates/partners/partner.html #: templates/partners/partner.html
msgid "Information" msgid "Information"
msgstr "Informatie" msgstr "Informatie"
#: partners/templates/partners/partner.html #: templates/partners/partner.html
msgid "Street" msgid "Street"
msgstr "Straatnaam" msgstr "Straatnaam"
#: partners/templates/partners/partner.html #: templates/partners/partner.html
msgid "Zip Code" msgid "Zip Code"
msgstr "Postcode" msgstr "Postcode"
#: partners/templates/partners/partner.html #: templates/partners/partner.html
msgid "City" msgid "City"
msgstr "Plaatsnaam" msgstr "Plaatsnaam"
#: partners/templates/partners/partner.html #: templates/partners/partner.html
msgid "Website" msgid "Website"
msgstr "Website" msgstr "Website"
#: partners/templates/partners/vacancies.html #: templates/partners/vacancies.html
msgid "" msgid ""
"If you want to work besides studying or when you are (almost) graduated you " "If you want to work besides studying or when you are (almost) graduated you "
"can look here for interesting vacancies. When you want to post a vacancy on " "can look here for interesting vacancies. When you want to post a vacancy on "
...@@ -169,54 +164,10 @@ msgstr "" ...@@ -169,54 +164,10 @@ msgstr ""
"met de commissaris externe betrekkingen via <a href=\"mailto:" "met de commissaris externe betrekkingen via <a href=\"mailto:"
"samenwerking@thalia.nu\" target=\"_blank\">samenwerking@thalia.nu</a>." "samenwerking@thalia.nu\" target=\"_blank\">samenwerking@thalia.nu</a>."
#: partners/templates/partners/vacancies.html #: templates/partners/vacancies.html
msgid "Everything" msgid "Everything"
msgstr "Alles" msgstr "Alles"
#: partners/templates/partners/vacancies.html #: templates/partners/vacancies.html
msgid "All vacancies" msgid "All vacancies"
msgstr "Alle vacatures" msgstr "Alle vacatures"
#~ msgid ""
#~ "Je bent student en je hebt het maar krap. De politiek wil de studenten "
#~ "ook al niet een handje toesteken. Gelukkig hebben we bedrijven die bij "
#~ "ons vacatures aanbieden. Dus zit je krap en wil je wat bijverdienen, of "
#~ "ben je (bijna) afgestudeerd en wil je eens wat rondkijken, op deze pagina "
#~ "staan al onze openstaande vacatures. Wil je als bedrijf een vacature "
#~ "plaatsen op onze website, dan kun je contact opnemen met de commissaris "
#~ "externe betrekkingen via <a href=\"mailto:samenwerking@thalia.nu\" target="
#~ "\"_blank\">samenwerking@thalia.nu</a>."
#~ msgstr ""
#~ "You are a student and maybe you are looking for a job or part-time job. "
#~ "Happily we have companies that offer vacancies. So when you want to earn "
#~ "some additional money or when you are (almost) graduated you can look at "
#~ "this page for all outstanding vacancies. When you want to post a vacancy "
#~ "on this page as a company you can contact us at <a href=\"mailto:"
#~ "samenwerking@thalia.nu\" target=\"_blank\">samenwerking@thalia.nu</a>."
#~ msgid ""
#~ "Als studievereniging doen we ontzettend ons best om leuke evenementen en "
#~ "activiteiten te organiseren voor de studenten die lid zijn van Thalia. "
#~ "Voorbeelden van deze evenementen en activiteiten zijn symposia, borrels "
#~ "en programmeerwedstrijden. Verder organiseren wij ook lunchlezingen, "
#~ "workshops en brengen we vijf keer per jaar de Thabloid uit (het "