From 6496895e40a3f94d79ffbdde4c8a202ba0f884e6 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Tue, 20 Sep 2016 04:00:21 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/fr-FR.txt | 6 ++++++
 data/language/zh-CN.txt | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/data/language/fr-FR.txt b/data/language/fr-FR.txt
index d1ebcfc50d..137dc28228 100644
--- a/data/language/fr-FR.txt
+++ b/data/language/fr-FR.txt
@@ -4223,6 +4223,12 @@ STR_5910    :Appliquer
 STR_5911    :Allées transparentes
 STR_5912    :Allées transparentes
 STR_5913    :Chat
+STR_5914    :Attraction inconnue
+STR_5915    :Joueur
+STR_5916    :{COMMA16} joueur
+STR_5917    :{COMMA16} joueurs
+STR_5918    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
+STR_5919    :{COMMA16}
 
 #############
 # Scenarios #
diff --git a/data/language/zh-CN.txt b/data/language/zh-CN.txt
index fd9c33476c..1fca3e99b2 100644
--- a/data/language/zh-CN.txt
+++ b/data/language/zh-CN.txt
@@ -4230,6 +4230,12 @@ STR_5910    :应用
 STR_5911    :半透明道路
 STR_5912    :开启/关闭'半透明道路'选项
 STR_5913    :聊天
+STR_5914    :未知的游乐设施
+STR_5915    :玩家
+STR_5916    :{COMMA16}位玩家
+STR_5917    :{COMMA16}位玩家
+STR_5918    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
+STR_5919    :{COMMA16}
 
 #############
 # Scenarios #