From d32b7286f514ee568dd6dc320a2c9c27fa5a86c1 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sun, 21 Feb 2016 00:15:08 +0100
Subject: [PATCH] Adjust string ids

---
 data/language/english_uk.txt  | 4 +++-
 src/localisation/currency.c   | 6 +++---
 src/localisation/string_ids.h | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt
index 66e2ff36d6..6a4848a534 100644
--- a/data/language/english_uk.txt
+++ b/data/language/english_uk.txt
@@ -4064,7 +4064,9 @@ STR_5756    :Bad Password
 STR_5757    :Server Full
 STR_5758    :{OUTLINE}{GREEN}{STRING} has joined the game
 STR_5759    :Downloading map ... ({INT32} / {INT32})
-
+STR_5760    :Hong Kong Dollars (HK$)
+STR_5761    :New Taiwan Dollar (NT$)
+STR_5762    :Chinese Yuan (CN{YEN})
 
 #############
 # Scenarios #
diff --git a/src/localisation/currency.c b/src/localisation/currency.c
index 6a5e25f487..001ad23158 100644
--- a/src/localisation/currency.c
+++ b/src/localisation/currency.c
@@ -35,7 +35,7 @@ const currency_descriptor CurrencyDescriptors[CURRENCY_END] = {
 	{	"KRW",	10000,	CURRENCY_PREFIX,	"\xE2\x82\xA9",	CURRENCY_PREFIX,	"W",	STR_WON				},	// South Korean Won
 	{	"RUB",	1000,	CURRENCY_PREFIX,	"R ",			CURRENCY_PREFIX,	"R ",	STR_ROUBLE			},	// Russian Rouble
 	{	"CZK",	100,	CURRENCY_SUFFIX,	" K\xC4\x8D",	CURRENCY_SUFFIX,	" Kc",	STR_CZECH_KORUNA	},	// Czech koruna
-	{	"HKD",	100,	CURRENCY_SUFFIX,	"$",	CURRENCY_SUFFIX,	"HKD",	STR_HKD	},	// Hong Kong Dollar
-	{	"TWD",	1000,	CURRENCY_SUFFIX,	"NT$",	CURRENCY_SUFFIX,	"NT$",	STR_TWD	},	// New Taiwan Dollar
-	{	"HKD",	100,	CURRENCY_SUFFIX,	"CN\xC2\xA5",	CURRENCY_SUFFIX,	"CNY",	STR_YUAN	},	// Chinese Yuan
+	{	"HKD",	100,	CURRENCY_SUFFIX,	"$",			CURRENCY_SUFFIX,	"HKD",	STR_HONG_KONG_DOLLAR},	// Hong Kong Dollar
+	{	"TWD",	1000,	CURRENCY_SUFFIX,	"NT$",			CURRENCY_SUFFIX,	"NT$",	STR_NEW_TAIWAN_DOLLAR},	// New Taiwan Dollar
+	{	"HKD",	100,	CURRENCY_SUFFIX,	"CN\xC2\xA5",	CURRENCY_SUFFIX,	"CNY",	STR_CHINESE_YUAN	},	// Chinese Yuan
 };
diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h
index bb1d53ca4f..b2420cc64e 100644
--- a/src/localisation/string_ids.h
+++ b/src/localisation/string_ids.h
@@ -2338,10 +2338,6 @@ enum {
 	STR_USE_NN_AT_INTEGER_SCALE = 5733,
 
 	STR_OPTIONS_RENDERING_TIP = 5734,
-	
-	STR_HKD = 5735,
-	STR_TWD = 5736,
-	STR_YUAN = 5737,
 
 	STR_CLOSED_WITH_PERSON = 5737,
 	STR_CLOSED_WITH_PEOPLE = 5738,
@@ -2370,6 +2366,10 @@ enum {
 	STR_MULTIPLAYER_PLAYER_HAS_JOINED_THE_GAME = 5758,
 	STR_MULTIPLAYER_DOWNLOADING_MAP = 5759,
 
+	STR_HONG_KONG_DOLLAR = 5760,
+	STR_NEW_TAIWAN_DOLLAR = 5761,
+	STR_CHINESE_YUAN = 5762,
+
 	// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
 	STR_COUNT = 32768
 };