Commit 2ab5286a authored by Luko van der Maas's avatar Luko van der Maas Committed by Sébastiaan Versteeg
Browse files

Merge branch 'sister_associations' into 'master'

Improve sister associations page

See merge request !1036

(cherry picked from commit e56c47be)

7f1e952a Use https urls for sister and brother associations
8b38648c Remove home.php returning 404
15969265 Add BBB to brothers on sister association page
parent c25190f8
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ 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-10-05 15:12+0200\n" "POT-Creation-Date: 2018-11-07 20:12+0100\n"
"PO-Revision-Date: 2018-10-01 13:36+0200\n" "PO-Revision-Date: 2018-11-07 19:06+0100\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"
"Language: nl\n" "Language: nl\n"
...@@ -16,7 +16,7 @@ msgstr "" ...@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"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.2\n"
#: admin.py #: admin.py
msgid "Thalia administration" msgid "Thalia administration"
...@@ -161,11 +161,11 @@ msgstr "" ...@@ -161,11 +161,11 @@ msgstr ""
"500: Interne fout in de server. Thalia's websitecommissie (de Technicie) is " "500: Interne fout in de server. Thalia's websitecommissie (de Technicie) is "
"op de hoogte gesteld." "op de hoogte gesteld."
#: templates/base.html templates/index.html templates/old-base.html #: templates/base.html templates/index.html
msgid "Study Association Thalia" msgid "Study Association Thalia"
msgstr "Studievereniging Thalia" msgstr "Studievereniging Thalia"
#: templates/base.html templates/old-base.html #: templates/base.html
msgid "" msgid ""
"You're currently not a member of Thalia. Renew your membership to get access " "You're currently not a member of Thalia. Renew your membership to get access "
"to all parts of the website." "to all parts of the website."
...@@ -173,24 +173,23 @@ msgstr "" ...@@ -173,24 +173,23 @@ msgstr ""
"Je bent op dit moment geen lid van Thalia. Vernieuw je lidmaatschap om " "Je bent op dit moment geen lid van Thalia. Vernieuw je lidmaatschap om "
"toegang te krijgen tot de gehele website." "toegang te krijgen tot de gehele website."
#: templates/base.html templates/old-base.html #: templates/base.html
msgid "edit profile" msgid "edit profile"
msgstr "bewerk profiel" msgstr "bewerk profiel"
#: templates/base.html templates/old-base.html #: templates/base.html
msgid "change password" msgid "change password"
msgstr "wijzig mijn wachtwoord" msgstr "wijzig mijn wachtwoord"
#: templates/base.html templates/old-base.html #: templates/base.html
msgid "Site administration" msgid "Site administration"
msgstr "Sitebeheer" msgstr "Sitebeheer"
#: templates/base.html templates/old-base.html #: templates/base.html
msgid "Log Out" msgid "Log Out"
msgstr "Uitloggen" msgstr "Uitloggen"
#: templates/base.html templates/old-base.html #: templates/base.html templates/singlepages/privacy_policy.html
#: templates/singlepages/privacy_policy.html
msgid "privacy policy" msgid "privacy policy"
msgstr "privacybeleid" msgstr "privacybeleid"
...@@ -214,14 +213,6 @@ msgstr "" ...@@ -214,14 +213,6 @@ msgstr ""
"ontspanning tijdens de studie. Via Thalia kunnen studenten gemakkelijk " "ontspanning tijdens de studie. Via Thalia kunnen studenten gemakkelijk "
"contacten onderhouden met docenten en studenten van andere jaren." "contacten onderhouden met docenten en studenten van andere jaren."
#: templates/old-base.html
msgid "Login"
msgstr "Inloggen"
#: templates/old-base.html
msgid "My Account"
msgstr "Mijn Account"
#: templates/singlepages/become_active.html #: templates/singlepages/become_active.html
msgid "Become active" msgid "Become active"
msgstr "Actief worden" msgstr "Actief worden"
...@@ -864,6 +855,10 @@ msgstr "Overkoepelende bètavereniging" ...@@ -864,6 +855,10 @@ msgstr "Overkoepelende bètavereniging"
msgid "Molecular Sciences" msgid "Molecular Sciences"
msgstr "Moleculaire Wetenschappen" msgstr "Moleculaire Wetenschappen"
#: templates/singlepages/sister_associations.html
msgid "BBB Career Event"
msgstr "Beta Bedrijven Beurs"
#: templates/singlepages/sister_associations.html #: templates/singlepages/sister_associations.html
msgid "University of Twente" msgid "University of Twente"
msgstr "Universiteit Twente" msgstr "Universiteit Twente"
...@@ -980,12 +975,18 @@ msgid "Logo" ...@@ -980,12 +975,18 @@ msgid "Logo"
msgstr "Logo" msgstr "Logo"
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "Thalia's logo consists of a 'T' formed by the pieces of a <a href="
#| "\"https://en.wikipedia.org/wiki/Tangram\" target=\"_blank\">tangram</a> "
#| "and the text 'Study Association Thalia'. The font that was used for this "
#| "text is ' <a href=\"%(font_url)s\">Gill Sans MT Condensed</a>'."
msgid "" msgid ""
"Thalia's logo consists of a 'T' formed by the pieces of a <a href=\"https://" "Thalia's logo consists of a 'T' formed by the pieces of a <a href=\"https://"
"en.wikipedia.org/wiki/Tangram\" target=\"_blank\">tangram</a> and the text " "en.wikipedia.org/wiki/Tangram\" target=\"_blank\">tangram</a> and the text "
"'Study Association Thalia'. The font that was used for this text is ' <a " "'Study Association Thalia'. The font that was used for this text is ' <a "
"href=\"%(font_url)s\">Gill Sans MT Condensed</a>'." "href=\"https://drive.google.com/drive/"
"folders/1ngaQc481MbZAXwbvs85NW07exwM7_Bfo\">Gill Sans MT Condensed</a>'."
msgstr "" msgstr ""
"Het logo van Thalia bestaat uit een 'T' gevormd uit de stukken van een <a " "Het logo van Thalia bestaat uit een 'T' gevormd uit de stukken van een <a "
"href=\"https://en.wikipedia.org/wiki/Tangram\" target=\"_blank\">tangram</a> " "href=\"https://en.wikipedia.org/wiki/Tangram\" target=\"_blank\">tangram</a> "
...@@ -1024,10 +1025,14 @@ msgstr "" ...@@ -1024,10 +1025,14 @@ msgstr ""
"achtergrond gebruikt." "achtergrond gebruikt."
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "You can download the archive with all versions of the logo in PNG, SVG "
#| "and Illustrator <a href=\"%(logo_url)s\">here</a>."
msgid "" msgid ""
"You can download the archive with all versions of the logo in PNG, SVG and " "You can download the archive with all versions of the logo in PNG, SVG and "
"Illustrator <a href=\"%(logo_url)s\">here</a>." "Illustrator <a href=\"https://drive.google.com/drive/"
"folders/1RlkLn2Rqk4ETWd4CUUHlU-gaKC7iVU9k\">here</a>."
msgstr "" msgstr ""
"Het zip-archief met alle versies in PNG en SVG formaat en een Illustrator " "Het zip-archief met alle versies in PNG en SVG formaat en een Illustrator "
"bronbestand is <a href=\"%(logo_url)s\">hier</a> te downloaden." "bronbestand is <a href=\"%(logo_url)s\">hier</a> te downloaden."
...@@ -1067,10 +1072,14 @@ msgid "" ...@@ -1067,10 +1072,14 @@ msgid ""
msgstr "De tekst staat altijd op dezelfde afstand van de T." msgstr "De tekst staat altijd op dezelfde afstand van de T."
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "You can download the archive with the Illustrator and EPS files to create "
#| "a variant <a href=\"%(variant_logo_url)s\">here</a>."
msgid "" msgid ""
"You can download the archive with the Illustrator and EPS files to create a " "You can download the archive with the Illustrator and EPS files to create a "
"variant <a href=\"%(variant_logo_url)s\">here</a>." "variant <a href=\"https://drive.google.com/drive/"
"folders/1RlkLn2Rqk4ETWd4CUUHlU-gaKC7iVU9k\">here</a>."
msgstr "" msgstr ""
"Het zip-archief met Illustrator bestanden om een variatie op het logo te " "Het zip-archief met Illustrator bestanden om een variatie op het logo te "
"maken kun je <a href=\"%(variant_logo_url)s\">hier</a> vinden." "maken kun je <a href=\"%(variant_logo_url)s\">hier</a> vinden."
...@@ -1112,11 +1121,17 @@ msgid "Declarations" ...@@ -1112,11 +1121,17 @@ msgid "Declarations"
msgstr "Declaraties" msgstr "Declaraties"
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "You can download these template as <a href=\"%(documents_url)s\">here</a> "
#| "as archive. We've also included PDF examples. In case you prefer LaTeX "
#| "then you can download the <a href=\"%(latex_url)s\">template</a>."
msgid "" msgid ""
"You can download these template as <a href=\"%(documents_url)s\">here</a> as " "You can download these template as <a href=\"https://drive.google.com/drive/"
"archive. We've also included PDF examples. In case you prefer LaTeX then you " "folders/13jGBucdXpkw2BA0_Z8TFFhlVW_8umFKW\">here</a> as archive. We've also "
"can download the <a href=\"%(latex_url)s\">template</a>." "included PDF examples. In case you prefer LaTeX then you can download the <a "
"href=\"https://drive.google.com/drive/"
"folders/1KQVG7i7e146YOQ9h_6mO3RqbLC9539lG\">template</a>."
msgstr "" msgstr ""
"Deze templates kun je <a href=\"%(documents_url)s\">hier</a> gezipt " "Deze templates kun je <a href=\"%(documents_url)s\">hier</a> gezipt "
"downloaden. Inclusief voorbeelden in PDF. Daarnaast is er een <a href=" "downloaden. Inclusief voorbeelden in PDF. Daarnaast is er een <a href="
...@@ -1124,10 +1139,14 @@ msgstr "" ...@@ -1124,10 +1139,14 @@ msgstr ""
"nog wat." "nog wat."
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "Templates for PowerPoint, Keynote and LibreOffice are available <a href="
#| "\"%(presentations_url)s\">here</a>."
msgid "" msgid ""
"Templates for PowerPoint, Keynote and LibreOffice are available <a href=" "Templates for PowerPoint, Keynote and LibreOffice are available <a href="
"\"%(presentations_url)s\">here</a>." "\"https://drive.google.com/drive/folders/1CL4eVSqlvYcqP_u99y6mgGJpqWWG_q7Z"
"\">here</a>."
msgstr "" msgstr ""
"Templates voor presentaties vind je <a href=\"%(presentations_url)s\">hier</" "Templates voor presentaties vind je <a href=\"%(presentations_url)s\">hier</"
"a> voor PowerPoint, Keynote en LibreOffice." "a> voor PowerPoint, Keynote en LibreOffice."
...@@ -1165,13 +1184,19 @@ msgstr "" ...@@ -1165,13 +1184,19 @@ msgstr ""
"varianten van zwart, wit en magenta." "varianten van zwart, wit en magenta."
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "The templates are available for download <a href=\"%(posters_url)s"
#| "\">here</a>. Although, it's the task of the media committee to create the "
#| "posters and banners. So you're always welcome to send an email to <a href="
#| "\"mailto:media@thalia.nu\">media@thalia.nu</a> to get yourself a sleek "
#| "poster for your event."
msgid "" msgid ""
"The templates are available for download <a href=\"%(posters_url)s\">here</" "The templates are available for download <a href=\"https://drive.google.com/"
"a>. Although, it's the task of the media committee to create the posters and " "drive/folders/1oPxLJ20AURaLjgYNSMuf9I-LarSQWjzC\">here</a>. Although, it's "
"banners. So you're always welcome to send an email to <a href=\"mailto:" "the task of the media committee to create the posters and banners. So you're "
"media@thalia.nu\">media@thalia.nu</a> to get yourself a sleek poster for " "always welcome to send an email to <a href=\"mailto:media@thalia.nu"
"your event." "\">media@thalia.nu</a> to get yourself a sleek poster for your event."
msgstr "" msgstr ""
"Je kunt de templates <a href=\"%(posters_url)s\">hier</a> vinden. Het is " "Je kunt de templates <a href=\"%(posters_url)s\">hier</a> vinden. Het is "
"echter in principe de taak van de Mediacommissie om deze posters & banners " "echter in principe de taak van de Mediacommissie om deze posters & banners "
...@@ -1206,12 +1231,17 @@ msgid "Introshirts" ...@@ -1206,12 +1231,17 @@ msgid "Introshirts"
msgstr "Introshirts" msgstr "Introshirts"
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
#, python-format #, fuzzy
#| msgid ""
#| "The introshirts too are an exception. These shirts are in different "
#| "colours every year. The templates for the shirts can be found <a href="
#| "\"%(introshirt_url)s\">here</a>. The partner logos and texts can be "
#| "changed to those you prefer."
msgid "" msgid ""
"The introshirts too are an exception. These shirts are in different colours " "The introshirts too are an exception. These shirts are in different colours "
"every year. The templates for the shirts can be found <a href=" "every year. The templates for the shirts can be found <a href=\"https://"
"\"%(introshirt_url)s\">here</a>. The partner logos and texts can be changed " "drive.google.com/drive/folders/1MdrSb0G-MjV2hfJt92ZXo5MSXWFcO3L7\">here</a>. "
"to those you prefer." "The partner logos and texts can be changed to those you prefer."
msgstr "" msgstr ""
"Ook de introshirts zijn een uitzondering op het kleurenpalet. Het is " "Ook de introshirts zijn een uitzondering op het kleurenpalet. Het is "
"toegestaan om elke kleur te gebruiken die je maar wilt, zolang het maar niet " "toegestaan om elke kleur te gebruiken die je maar wilt, zolang het maar niet "
...@@ -1282,10 +1312,6 @@ msgstr "Lettertype" ...@@ -1282,10 +1312,6 @@ msgstr "Lettertype"
msgid "Logos" msgid "Logos"
msgstr "Logo’s" msgstr "Logo’s"
#: templates/singlepages/styleguide.html
msgid "Logo variant template"
msgstr "Templates logo varianten"
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
msgid "Word documents" msgid "Word documents"
msgstr "Word-documenten" msgstr "Word-documenten"
......
...@@ -9,14 +9,15 @@ ...@@ -9,14 +9,15 @@
<div class="container"> <div class="container">
<h1 class="section-title text-center">{% trans "Associations of the Radboud University Science Faculty" %}</h1> <h1 class="section-title text-center">{% trans "Associations of the Radboud University Science Faculty" %}</h1>
<ul> <ul>
<li><a href="http://www.beevee.nl/home.php">BeeVee ({% trans "(Medical) Biology" %})</a></li> <li><a href="https://www.beevee.nl/">BeeVee ({% trans "(Medical) Biology" %})</a></li>
<li><a href="http://svcognac.nl/">CognAC ({% trans "Artificial Intelligence" %})</a></li> <li><a href="https://svcognac.nl/">CognAC ({% trans "Artificial Intelligence" %})</a></li>
<li><a href="http://www.desda.org/">DESDA ({% trans "Mathematics" %})</a></li> <li><a href="https://www.desda.org/">DESDA ({% trans "Mathematics" %})</a></li>
<li><a href="http://www.leonardo.science.ru.nl/">Leonardo da Vinci ({% trans "Science" %})</a></li> <li><a href="https://www.leonardo.science.ru.nl/">Leonardo da Vinci ({% trans "Science" %})</a></li>
<li><a href="http://www.marie-curie.nl/">Marie Curie ({% trans "Physics and Astronomy" %})</a></li> <li><a href="https://www.marie-curie.nl/">Marie Curie ({% trans "Physics and Astronomy" %})</a></li>
<li><a href="http://www.olympus.science.ru.nl/">Olympus <li><a href="https://www.olympus.science.ru.nl/">Olympus
({% trans "Science faculty umbrella association" %})</a></li> ({% trans "Science faculty umbrella association" %})</a></li>
<li><a href="https://www.vcmw-sigma.nl/home">Sigma ({% trans "Molecular Sciences" %})</a></li> <li><a href="https://www.vcmw-sigma.nl/home">Sigma ({% trans "Molecular Sciences" %})</a></li>
<li><a href="http://www.bbb-careerevent.com/">{% trans "BBB Career Event" %}</a></li>
</ul> </ul>
</div> </div>
</section> </section>
...@@ -25,20 +26,20 @@ ...@@ -25,20 +26,20 @@
<h1 class="section-title text-center">{% trans "Sister Associations" %}</h1> <h1 class="section-title text-center">{% trans "Sister Associations" %}</h1>
<ul> <ul>
<li><a href="https://www.abacus.utwente.nl/">Abacus ({% trans "University of Twente" %})</a></li> <li><a href="https://www.abacus.utwente.nl/">Abacus ({% trans "University of Twente" %})</a></li>
<li><a href="http://www.a-eskwadraat.nl/">A-Eskwadraat ({% trans "Utrecht University" %})</a></li> <li><a href="https://www.a-eskwadraat.nl/">A-Eskwadraat ({% trans "Utrecht University" %})</a></li>
<li><a href="http://ch.tudelft.nl/">Christiaan Huygens <li><a href="https://ch.tudelft.nl/">Christiaan Huygens
({% trans "Delft University of Technology" %})</a></li> ({% trans "Delft University of Technology" %})</a></li>
<li><a href="http://www.svcover.nl/">Cover ({% trans "University of Groningen" %})</a></li> <li><a href="https://www.svcover.nl/">Cover ({% trans "University of Groningen" %})</a></li>
<li><a href="http://www.deleidscheflesch.nl/">De Leidsche Flesch ({% trans "Leiden University" %})</a> <li><a href="https://www.deleidscheflesch.nl/">De Leidsche Flesch ({% trans "Leiden University" %})</a>
</li> </li>
<li><a href="http://www.fmf.nl/">FMF ({% trans "University of Groningen" %})</a></li> <li><a href="https://www.fmf.nl/">FMF ({% trans "University of Groningen" %})</a></li>
<li><a href="http://www.gewis.nl/">GEWIS ({% trans "Eindhoven University of Technology" %})</a></li> <li><a href="https://www.gewis.nl/">GEWIS ({% trans "Eindhoven University of Technology" %})</a></li>
<li><a href="https://www.inter-actief.utwente.nl/">Inter-<i>Actief</i> <li><a href="https://www.inter-actief.utwente.nl/">Inter-<i>Actief</i>
({% trans "University of Twente" %})</a></li> ({% trans "University of Twente" %})</a></li>
<li><a href="http://nsaweb.nl/">NSA ({% trans "University of Amsterdam" %})</a></li> <li><a href="https://nsaweb.nl/">NSA ({% trans "University of Amsterdam" %})</a></li>
<li><a href="http://www.stickyutrecht.nl/">Sticky ({% trans "Utrecht University" %})</a></li> <li><a href="https://www.stickyutrecht.nl/">Sticky ({% trans "Utrecht University" %})</a></li>
<li><a href="http://www.storm.vu/">STORM ({% trans "VU University Amsterdam" %})</a></li> <li><a href="https://www.storm.vu/">STORM ({% trans "VU University Amsterdam" %})</a></li>
<li><a href="http://www.svia.nl/">via ({% trans "University of Amsterdam" %})</a></li> <li><a href="https://www.svia.nl/">via ({% trans "University of Amsterdam" %})</a></li>
</ul> </ul>
</div> </div>
</section> </section>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment