From 3a3b731db60f08ea2e1180d867ca8171dff86fc5 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Fri, 5 Feb 2016 04:00:11 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/chinese_traditional.txt |  2 +
 data/language/czech.txt               |  6 ++-
 data/language/english_us.txt          | 70 +++++++++++++++++++++++++++
 data/language/german.txt              |  2 +
 4 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/data/language/chinese_traditional.txt b/data/language/chinese_traditional.txt
index 5d2afdd6b4..85b150759d 100644
--- a/data/language/chinese_traditional.txt
+++ b/data/language/chinese_traditional.txt
@@ -4040,6 +4040,8 @@ STR_5732    :各向異性
 STR_5733    :以整數比例調整最鄰近式縮放
 # tooltip for tab in options window
 STR_5734    :{SMALLFONT}{BLACK}渲染
+STR_5735    :網絡狀況
+STR_5736    :玩家
 
 #############
 # Scenarios #
diff --git a/data/language/czech.txt b/data/language/czech.txt
index 1f4cf8a4d5..c9f3669278 100644
--- a/data/language/czech.txt
+++ b/data/language/czech.txt
@@ -3570,7 +3570,7 @@ STR_5227    :Výzva k přepisu uložené hry
 STR_5228    :{SMALLFONT}{BLACK}Hlavní UI
 STR_5229    :{SMALLFONT}{BLACK}Park
 STR_5230    :{SMALLFONT}{BLACK}Nástroje
-STR_5231    :{SMALLFONT}{BLACK}Rides and Peeps
+STR_5231    :{SMALLFONT}{BLACK}Atrakce a návštěvníci
 STR_5232    :{SMALLFONT}{BLACK}Editory
 STR_5233    :{SMALLFONT}{BLACK}Ostatní
 STR_5234    :{SMALLFONT}{BLACK}Výzvy
@@ -3975,7 +3975,7 @@ STR_5632    :Postav si vlastní...
 STR_5633    :CMD + 
 STR_5634    :OPTION + 
 STR_5635    :{WINDOW_COLOUR_2}Utracená hotovost: {BLACK}{CURRENCY2DP}
-STR_5636    :{WINDOW_COLOUR_2}Spuštění příkazy: {BLACK}{COMMA16}
+STR_5636    :{WINDOW_COLOUR_2}Spuštěné příkazy: {BLACK}{COMMA16}
 STR_5637    :Toto nelze provést...
 STR_5638    :Přístup zamítnut
 STR_5639    :{SMALLFONT}{BLACK}Zobrazit seznam hráčů
@@ -4040,6 +4040,8 @@ STR_5732    :Anizotropní
 STR_5733    :U celočíselného škálování používat NS metodu
 # tooltip for tab in options window
 STR_5734    :{SMALLFONT}{BLACK}Vykreslování
+STR_5735    :Stav připojení
+STR_5736    :Hráč
 
 ###############################################################################
 ## RCT2 Objects
diff --git a/data/language/english_us.txt b/data/language/english_us.txt
index 8ce410de46..502c0bbbfa 100644
--- a/data/language/english_us.txt
+++ b/data/language/english_us.txt
@@ -3973,6 +3973,76 @@ STR_5629    :Difficulty level
 STR_5630    :Enable unlocking of scenarios
 STR_5631    :Original DLC Parks
 STR_5632    :Build your own...
+STR_5633    :CMD + 
+STR_5634    :OPTION + 
+STR_5635    :{WINDOW_COLOUR_2}Money spent: {BLACK}{CURRENCY2DP}
+STR_5636    :{WINDOW_COLOUR_2}Commands ran: {BLACK}{COMMA16}
+STR_5637    :Can't do this...
+STR_5638    :Permission denied
+STR_5639    :{SMALLFONT}{BLACK}Show list of players
+STR_5640    :{SMALLFONT}{BLACK}Manage groups
+STR_5641    :Default Group:
+STR_5642    :Group:
+STR_5643    :Add Group
+STR_5644    :Remove Group
+STR_5645    :Chat
+STR_5646    :Terraform
+STR_5647    :Toggle Pause
+STR_5648    :Set Water Level
+STR_5649    :Create Ride
+STR_5650    :Remove Ride
+STR_5651    :Build Ride
+STR_5652    :Ride Properties
+STR_5653    :Scenery
+STR_5654    :Path
+STR_5655    :Guest
+STR_5656    :Staff
+STR_5657    :Park Properties
+STR_5658    :Park Funding
+STR_5659    :Kick Player
+STR_5660    :Modify Groups
+STR_5661    :Set Player Group
+STR_5662    :N/A
+STR_5663    :Clear Landscape
+STR_5664    :Cheat
+STR_5701    :{WINDOW_COLOUR_2}Last action: {BLACK}{STRINGID}
+STR_5702    :{SMALLFONT}{BLACK}Locate player's most recent action
+STR_5703    :Can't kick the host
+STR_5704    :Last Action:
+STR_5705    :Can't set to this group
+STR_5706    :Can't remove group that players belong to
+STR_5707    :This group cannot be modified
+STR_5708    :Can't change the group that the host belongs to
+STR_5709    :Rename Group
+STR_5710    :Group name
+STR_5711    :Enter new name for this group:
+STR_5712    :Can't modify permission that you do not have yourself
+STR_5713    :Kick Player
+STR_5714    :Show options window
+STR_5715    :New Game
+STR_5716    :Not allowed in multiplayer mode
+# For identifying client network version in server list window
+STR_5717    :Network version: {STRING}
+STR_5718    :{SMALLFONT}{BLACK}Network version: {STRING}
+STR_5719    :Sunny
+STR_5720    :Partially Cloudy
+STR_5721    :Cloudy
+STR_5722    :Rain
+STR_5723    :Heavy Rain
+STR_5724    :Thunderstorm
+STR_5725    :{BLACK}Force weather:
+STR_5726    :{SMALLFONT}{BLACK}Sets the current weather in park
+STR_5727    :Scaling quality
+STR_5728    :Requires hardware display option
+STR_5729    :{SMALLFONT}{BLACK}Requires hardware display option
+STR_5730    :Nearest neighbor
+STR_5731    :Linear
+STR_5732    :Anisotropic
+STR_5733    :Use NN scaling at integer scales
+# tooltip for tab in options window
+STR_5734    :{SMALLFONT}{BLACK}Rendering
+STR_5735    :Network Status
+STR_5736    :Player
 
 #############
 # Scenarios #
diff --git a/data/language/german.txt b/data/language/german.txt
index d710235283..d7ccaa1bbf 100644
--- a/data/language/german.txt
+++ b/data/language/german.txt
@@ -4032,6 +4032,8 @@ STR_5731    :Linear
 STR_5732    :Anisotrop
 STR_5733    :Pixelwdh. bei ganzzahligem Skalierungsfaktor
 STR_5734    :{SMALLFONT}{BLACK}Darstellung
+STR_5735    :Netzwerkstatus
+STR_5736    :Spieler
 
 #############
 # Scenarios #