Skip to content

Commit

Permalink
Merge branch 'master' into vtk-master
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiddo committed Oct 24, 2024
2 parents 345da73 + fac34fa commit 740303c
Show file tree
Hide file tree
Showing 4 changed files with 267,379 additions and 9 deletions.
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions module/CommonBundle/Resources/translations/site.en.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
'International Student' => 'International Student',
'I am an international student' => 'I am an international student',

//'The POC\'ers are elected! You can find your POC\'ers here!' => 'The POC\'ers are elected! You can find your POC\'ers here!',
'The POC\'ers are elected! You can find your POC\'ers here!' => 'Below you can find the candidate POC for this academic year. If you wish to file an objection against one of the candidates, send an email to [email protected] before Monday, October 14, 11:59 PM.',
'The POC\'ers are elected! You can find your POC\'ers here!' => 'The POC\'ers are elected! You can find your POC\'ers here!',
//'The POC\'ers are elected! You can find your POC\'ers here!' => 'Below you can find the candidate POC for this academic year. If you wish to file an objection against one of the candidates, send an email to [email protected] before Monday, October 14, 11:59 PM.',
'We could not find any POC\'ers for you, try again later!' => 'We could not find any POC\'ers for you, try again later!',
'Please login to see your POC\'ers!' => 'Please login to see your POC\'ers!',
'Visit the POC page for more ' => 'Visit the POC page for more ',
Expand Down
4 changes: 2 additions & 2 deletions module/CommonBundle/Resources/translations/site.nl.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
'International Student' => 'Internationale Student',
'I am an international student' => 'Ik ben een internationale student',

//'The POC\'ers are elected! You can find your POC\'ers here!' => 'De POC\'ers zijn verkozen! Hieronder kan jij jouw POC\'ers vinden! ',
'The POC\'ers are elected! You can find your POC\'ers here!' => 'Hieronder kun je de kandidaat-RiVers voor dit academiejaar terugvinden. Indien je wenst een bezwaar in te dienen tegen een van de kandidaten, stuur je een e-mail naar [email protected] voor maandag 14 oktober 23u59.',
'The POC\'ers are elected! You can find your POC\'ers here!' => 'De POC\'ers zijn verkozen! Hieronder kan jij jouw POC\'ers vinden! ',
//'The POC\'ers are elected! You can find your POC\'ers here!' => 'Hieronder kun je de kandidaat-RiVers voor dit academiejaar terugvinden. Indien je wenst een bezwaar in te dienen tegen een van de kandidaten, stuur je een e-mail naar [email protected] voor maandag 14 oktober 23u59.',
'We could not find any POC\'ers for you, try again later!' => 'We konden geen POC\'ers voor jou vinden, probeer later nog eens !',
'Please login to see your POC\'ers!' => 'Login om jouw POC\'ers te bekijken',
'Visit the POC page for more ' => 'Bezoek de POC pagina voor meer ',
Expand Down
Loading

0 comments on commit 740303c

Please sign in to comment.