From 4c60112bd545458de4ad0de8e0e798e0a30b1189 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 4 Sep 2015 04:00:15 +0100
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/dutch.txt      | 32 ++++++++++++++++++++++++++++++++
 data/language/english_us.txt | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/data/language/dutch.txt b/data/language/dutch.txt
index f41d7684fb..05407b27a7 100644
--- a/data/language/dutch.txt
+++ b/data/language/dutch.txt
@@ -3848,3 +3848,35 @@ STR_5512    :Spel opslaan als...
 STR_5513    :Spel (snel) opslaan
 STR_5514    :Vandalisme uitschakelen
 STR_5515    :{SMALLFONT}{BLACK}Voorkomt dat bezoekers objecten in je park vernielen als ze kwaad zijn
+STR_5516    :{SMALLFONT}{BLACK}Zwart
+STR_5517    :{SMALLFONT}{BLACK}Grijs
+STR_5518    :{SMALLFONT}{BLACK}Wit
+STR_5519    :{SMALLFONT}{BLACK}Donkerpaars
+STR_5520    :{SMALLFONT}{BLACK}Lichtpaars
+STR_5521    :{SMALLFONT}{BLACK}Helder paars
+STR_5522    :{SMALLFONT}{BLACK}Darkblauw
+STR_5523    :{SMALLFONT}{BLACK}Lichtblauw
+STR_5524    :{SMALLFONT}{BLACK}IJzig blauw
+STR_5525    :{SMALLFONT}{BLACK}Turquoise
+STR_5526    :{SMALLFONT}{BLACK}Aquamarijn
+STR_5527    :{SMALLFONT}{BLACK}Verzadigd groen
+STR_5528    :{SMALLFONT}{BLACK}Donkergroen
+STR_5529    :{SMALLFONT}{BLACK}Mosgroen
+STR_5530    :{SMALLFONT}{BLACK}Helder groen
+STR_5531    :{SMALLFONT}{BLACK}Olijfgroen
+STR_5532    :{SMALLFONT}{BLACK}Donker olijfgroen
+STR_5533    :{SMALLFONT}{BLACK}Helder geel
+STR_5534    :{SMALLFONT}{BLACK}Geel
+STR_5535    :{SMALLFONT}{BLACK}Donkergeel
+STR_5536    :{SMALLFONT}{BLACK}Lichtoranje
+STR_5537    :{SMALLFONT}{BLACK}Donkeroranje
+STR_5538    :{SMALLFONT}{BLACK}Lichtbruin
+STR_5539    :{SMALLFONT}{BLACK}Verzadigd bruin
+STR_5540    :{SMALLFONT}{BLACK}Donkerbruin
+STR_5541    :{SMALLFONT}{BLACK}Zalmroze
+STR_5542    :{SMALLFONT}{BLACK}Bordeauxrood
+STR_5543    :{SMALLFONT}{BLACK}Verzadigd rood
+STR_5544    :{SMALLFONT}{BLACK}Helder rood
+STR_5545    :{SMALLFONT}{BLACK}Donkerroze
+STR_5546    :{SMALLFONT}{BLACK}Helder roze
+STR_5547    :{SMALLFONT}{BLACK}Lichtroze
diff --git a/data/language/english_us.txt b/data/language/english_us.txt
index 259eb6d548..e6a55caf1c 100644
--- a/data/language/english_us.txt
+++ b/data/language/english_us.txt
@@ -3856,3 +3856,35 @@ STR_5512    :Save Game As
 STR_5513    :(Quick) save game
 STR_5514    :Disable vandalism
 STR_5515    :{SMALLFONT}{BLACK}Stops guests from vandalising your park when they're angry
+STR_5516    :{SMALLFONT}{BLACK}Black
+STR_5517    :{SMALLFONT}{BLACK}Gray
+STR_5518    :{SMALLFONT}{BLACK}White
+STR_5519    :{SMALLFONT}{BLACK}Dark purple
+STR_5520    :{SMALLFONT}{BLACK}Light purple
+STR_5521    :{SMALLFONT}{BLACK}Bright purple
+STR_5522    :{SMALLFONT}{BLACK}Dark blue
+STR_5523    :{SMALLFONT}{BLACK}Light blue
+STR_5524    :{SMALLFONT}{BLACK}Icy blue
+STR_5525    :{SMALLFONT}{BLACK}Teal
+STR_5526    :{SMALLFONT}{BLACK}Aquamarine
+STR_5527    :{SMALLFONT}{BLACK}Saturated green
+STR_5528    :{SMALLFONT}{BLACK}Dark green
+STR_5529    :{SMALLFONT}{BLACK}Moss green
+STR_5530    :{SMALLFONT}{BLACK}Bright green
+STR_5531    :{SMALLFONT}{BLACK}Olive green
+STR_5532    :{SMALLFONT}{BLACK}Dark olive green
+STR_5533    :{SMALLFONT}{BLACK}Bright yellow
+STR_5534    :{SMALLFONT}{BLACK}Yellow
+STR_5535    :{SMALLFONT}{BLACK}Dark yellow
+STR_5536    :{SMALLFONT}{BLACK}Light orange
+STR_5537    :{SMALLFONT}{BLACK}Dark orange
+STR_5538    :{SMALLFONT}{BLACK}Light brown
+STR_5539    :{SMALLFONT}{BLACK}Saturated brown
+STR_5540    :{SMALLFONT}{BLACK}Dark brown
+STR_5541    :{SMALLFONT}{BLACK}Salmon pink
+STR_5542    :{SMALLFONT}{BLACK}Bordeaux red
+STR_5543    :{SMALLFONT}{BLACK}Saturated red
+STR_5544    :{SMALLFONT}{BLACK}Bright red
+STR_5545    :{SMALLFONT}{BLACK}Dark pink
+STR_5546    :{SMALLFONT}{BLACK}Bright pink
+STR_5547    :{SMALLFONT}{BLACK}Light pink