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

---
 data/language/chinese_traditional.txt | 7 +++++--
 data/language/german.txt              | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/data/language/chinese_traditional.txt b/data/language/chinese_traditional.txt
index 956519123d..59f18568ce 100644
--- a/data/language/chinese_traditional.txt
+++ b/data/language/chinese_traditional.txt
@@ -3498,7 +3498,7 @@ STR_5156    :{SMALLFONT}{BLACK}容許測試大部份軌道設計, 即使未建
 STR_5157    :允許設置進入樂園及乘坐遊樂設施的價格
 STR_5158    :回到主選單
 STR_5159    :離開OpenRCT2
-STR_5160    :{MONTH} {STRINGID}, 第{COMMA16}年
+STR_5160    :{POP16}{MONTH} {PUSH16}{PUSH16}{STRINGID}, {POP16}第{COMMA16}年
 STR_5161    :日期格式:
 STR_5162    :日/月/年
 STR_5163    :月/日/年
@@ -3888,7 +3888,10 @@ STR_5545    :{SMALLFONT}{BLACK}暗粉紅色
 STR_5546    :{SMALLFONT}{BLACK}明粉紅色
 STR_5547    :{SMALLFONT}{BLACK}淺粉紅色
 STR_5548    :顯示所有運作模式
-
+STR_5549    :年/月/日
+STR_5550    :{POP16}{POP16}第{COMMA16}年, {PUSH16}{PUSH16}{MONTH} {PUSH16}{PUSH16}{STRINGID}
+STR_5551    :年/日/月
+STR_5552    :{POP16}{POP16}第{COMMA16}年, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH}
 
 #####################
 # Rides/attractions # 
diff --git a/data/language/german.txt b/data/language/german.txt
index 13422737f0..b23816f710 100644
--- a/data/language/german.txt
+++ b/data/language/german.txt
@@ -3493,7 +3493,7 @@ STR_5156    :{SMALLFONT}{BLACK}Erlaubt das Testen der meisten Bahnarten, selbst
 STR_5157    :Alle Preise freischalten
 STR_5158    :Spiel beenden
 STR_5159    :OpenRCT2 beenden
-STR_5160    :{MONTH} {STRINGID}, Jahr {COMMA16}
+STR_5160    :{POP16}{MONTH} {PUSH16}{PUSH16}{STRINGID}, Jahr {POP16}{COMMA16}
 STR_5161    :Datumsformat:
 STR_5162    :Tag/Monat/Jahr
 STR_5163    :Monat/Tag/Jahr
@@ -3882,3 +3882,7 @@ STR_5545    :{SMALLFONT}{BLACK}Dunkelrosa
 STR_5546    :{SMALLFONT}{BLACK}Leuchtendes Rosa
 STR_5547    :{SMALLFONT}{BLACK}Hellrosa
 STR_5548    :Alle Betriebsmodi anzeigen
+STR_5549    :Jahr/Monat/Tag
+STR_5550    :{POP16}{POP16}Jahr {COMMA16}, {PUSH16}{PUSH16}{MONTH} {PUSH16}{PUSH16}{STRINGID}
+STR_5551    :Jahr/Tag/Monat
+STR_5552    :{POP16}{POP16}Jahr {COMMA16}, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH}