Merge branch 'feature/dressme' into 'master'

Added DressMe to styleguide

Closes #889

See merge request !1290

website/thaliawebsite/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-17 20:04+0200\n"
-"PO-Revision-Date: 2019-04-17 20:04+0200\n"
+"POT-Creation-Date: 2019-06-19 19:51+0200\n"
+"PO-Revision-Date: 2019-06-19 19:53+0200\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 
 #: admin.py
 msgid "Thalia administration"
@@ -1219,14 +1219,17 @@ msgid ""
 "for promotion and visibility of the assocation and the committee. However it "
 "would be unwise to have every committee wear the same colour, that would not "
 "improve the visibility of the committee. That means that committees are free "
-"to choose any color they want for their promotional material."
+"to choose any color they want for their promotional material. <a href="
+"\"https://www.dressmeclothing.nl/\">DressMe</a> is Thalia's preferred "
+"supplier for printed clothing."
 msgstr ""
 "Elke commissie mag een kledingstuk ontwerpen speciaal gemaakt voor de "
 "promotie en zichtbaarheid van de vereniging en de commissie zelf. Maar het "
 "zou niet handig zijn als elke commissie dezelfde kleur draagt, dan is de "
 "zichtbaarheid van de commissie nog steeds niet beter. Daarom mogen "
 "commissies zelf beslissen wat voor kleur ze willen gebruiken voor hun "
-"promotiemateriaal."
+"promotiemateriaal. <a href=\"https://www.dressmeclothing.nl/\">DressMe</a> "
+"is Thalia's voorkeursleverancier voor het bedrukken van kleding."
 
 #: templates/singlepages/styleguide.html
 msgid ""

website/thaliawebsite/templates/singlepages/styleguide.html

@@ -285,6 +285,7 @@
                     However it would be unwise to have every committee wear the same colour, that would not improve the
                     visibility of the committee.
                     That means that committees are free to choose any color they want for their promotional material.
+                    <a href="https://www.dressmeclothing.nl/">DressMe</a> is Thalia's preferred supplier for printed clothing.
                 {% endblocktrans %}
             </p>