From 8bcf2e1b8cdc7521d533ec792cb482c524f46cb5 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 13 Nov 2015 04:00:17 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/chinese_traditional.txt | 4 ++--
 data/language/english_us.txt          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/language/chinese_traditional.txt b/data/language/chinese_traditional.txt
index 6364397fb5..4e2ef366cd 100644
--- a/data/language/chinese_traditional.txt
+++ b/data/language/chinese_traditional.txt
@@ -3864,8 +3864,8 @@ STR_5521    :{SMALLFONT}{BLACK}明紫色
 STR_5522    :{SMALLFONT}{BLACK}暗藍色
 STR_5523    :{SMALLFONT}{BLACK}淺藍色
 STR_5524    :{SMALLFONT}{BLACK}冰藍色
-STR_5525    :{SMALLFONT}{BLACK}鴨綠色
-STR_5526    :{SMALLFONT}{BLACK}藍綠色
+STR_5525    :{SMALLFONT}{BLACK}深水配色
+STR_5526    :{SMALLFONT}{BLACK}淺水配色
 STR_5527    :{SMALLFONT}{BLACK}深綠色
 STR_5528    :{SMALLFONT}{BLACK}暗綠色
 STR_5529    :{SMALLFONT}{BLACK}苔蘚綠色
diff --git a/data/language/english_us.txt b/data/language/english_us.txt
index a173125c84..3f9cdf3d31 100644
--- a/data/language/english_us.txt
+++ b/data/language/english_us.txt
@@ -3907,7 +3907,7 @@ STR_5563    :This feature is currently unstable, take extra caution.
 STR_5564    :Insert Corrupt Element
 STR_5565    :{SMALLFONT}{BLACK}Inserts a corrupt map element at top of tile. This will hide any element above the corrupt element.
 STR_5566    :Password:
-STR_5567    :Advertize
+STR_5567    :Advertise
 STR_5568    :Password Required
 STR_5569    :This server requires a password
 STR_5570    :Fetch Servers