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

---
 data/language/chinese_traditional.txt | 4 ++--
 data/language/dutch.txt               | 1 +
 data/language/english_us.txt          | 1 +
 data/language/german.txt              | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/language/chinese_traditional.txt b/data/language/chinese_traditional.txt
index 4e2ef366cd..e5a3b0a375 100644
--- a/data/language/chinese_traditional.txt
+++ b/data/language/chinese_traditional.txt
@@ -2723,8 +2723,8 @@ STR_2714    :-
 STR_2715    :.
 STR_2716    :/
 STR_2717    :'
-STR_2718    :(向上層)
-STR_2719    :(建立新檔案)
+STR_2718    :往上層目錄
+STR_2719    :建立新檔案
 STR_2720    :{UINT16}秒
 STR_2721    :{UINT16}秒
 STR_2722    :{UINT16}分:{UINT16}秒
diff --git a/data/language/dutch.txt b/data/language/dutch.txt
index ab3bd77c11..3d98c7d8f9 100644
--- a/data/language/dutch.txt
+++ b/data/language/dutch.txt
@@ -3911,6 +3911,7 @@ STR_5575    :Max. aant. spelers:
 STR_5576    :Poort:
 STR_5577    :Zuid-Koreaanse won (W)
 STR_5578    :Russische roebel (R)
+STR_5579    :Vergrotingsfactor:
 
 #############
 # Scenarios #
diff --git a/data/language/english_us.txt b/data/language/english_us.txt
index 94ccb3de73..eb610ff85b 100644
--- a/data/language/english_us.txt
+++ b/data/language/english_us.txt
@@ -3919,6 +3919,7 @@ STR_5575    :Max Players:
 STR_5576    :Port:
 STR_5577    :South Korean Won (W)
 STR_5578    :Russian Ruble (R)
+STR_5579    :Window scale factor:
 
 #########
 # Rides #
diff --git a/data/language/german.txt b/data/language/german.txt
index d923316476..0bae72fb23 100644
--- a/data/language/german.txt
+++ b/data/language/german.txt
@@ -3912,6 +3912,7 @@ STR_5575    :Max. Spieler:
 STR_5576    :Port:
 STR_5577    :Südkoreanischer Won (W)
 STR_5578    :Russischer Rubel (R)
+STR_5579    :Fensterskalierungsfaktor:
 
 #######################
 # Bahnen/Attraktionen #