From 23d856162e8d27cbb6a778f940e1297795913071 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Sat, 28 May 2016 04:00:22 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/zh-CN.txt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/language/zh-CN.txt b/data/language/zh-CN.txt
index ee45474a66..7637dabd35 100644
--- a/data/language/zh-CN.txt
+++ b/data/language/zh-CN.txt
@@ -784,7 +784,7 @@ STR_0774    :未命名游乐园{POP16}{POP16}
 STR_0775    :未命名游乐园{POP16}{POP16}
 STR_0776    :未命名游乐园{POP16}{POP16}
 STR_0777    :未命名游乐园{POP16}{POP16}
-STR_0778    :Sign
+STR_0778    :指示牌
 STR_0779    :1日
 STR_0780    :2日
 STR_0781    :3日
@@ -2731,18 +2731,18 @@ STR_2716    :/
 STR_2717    :'
 STR_2718    :Up
 STR_2719    :New file
-STR_2720    :{UINT16}sec
-STR_2721    :{UINT16}secs
-STR_2722    :{UINT16}min:{UINT16}sec
-STR_2723    :{UINT16}min:{UINT16}secs
-STR_2724    :{UINT16}mins:{UINT16}sec
-STR_2725    :{UINT16}mins:{UINT16}secs
-STR_2726    :{UINT16}min
-STR_2727    :{UINT16}mins
-STR_2728    :{UINT16}hour:{UINT16}min
-STR_2729    :{UINT16}hour:{UINT16}mins
-STR_2730    :{UINT16}hours:{UINT16}min
-STR_2731    :{UINT16}hours:{UINT16}mins
+STR_2720    :{UINT16}秒
+STR_2721    :{UINT16}秒
+STR_2722    :{UINT16}分:{UINT16}秒
+STR_2723    :{UINT16}分:{UINT16}秒
+STR_2724    :{UINT16}分:{UINT16}秒
+STR_2725    :{UINT16}分:{UINT16}秒
+STR_2726    :{UINT16}分
+STR_2727    :{UINT16}分
+STR_2728    :{UINT16}小时:{UINT16}分
+STR_2729    :{UINT16}小时:{UINT16}分
+STR_2730    :{UINT16}小时:{UINT16}分
+STR_2731    :{UINT16}小时:{UINT16}分
 STR_2732    :{COMMA16}ft
 STR_2733    :{COMMA16}m
 STR_2734    :{COMMA16}mph