From 9cc930ebac340fa6dae02623a2dd2114541faeb9 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Wed, 2 Mar 2016 04:00:17 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/czech.txt      | 4 ++++
 data/language/german.txt     | 3 +++
 data/language/korean.txt     | 4 +++-
 data/language/spanish_sp.txt | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/data/language/czech.txt b/data/language/czech.txt
index 3a1f43e170..9b1d30ae2f 100644
--- a/data/language/czech.txt
+++ b/data/language/czech.txt
@@ -4088,6 +4088,10 @@ STR_5779    :Příjem: {CURRENCY2DP} za hodinu
 STR_5780    :Cena údržby: {CURRENCY2DP} za hodinu
 STR_5781    :Cena údržby: neznámá
 STR_5782    :Úspěšně připojeno. Chatujte stisknutím klávesy '{STRING}'.
+STR_5783    :{WINDOW_COLOUR_2}Neodemčený scénář
+STR_5784    :{BLACK}Pro odemčení tohoto scénáře dokončete předcházející scénáře
+STR_5785    :Nelze přejmenovat skupinu...
+STR_5786    :Neplatný název skupiny.
 
 ###############################################################################
 ## RCT2 Objects
diff --git a/data/language/german.txt b/data/language/german.txt
index 6289325914..9601290d1d 100644
--- a/data/language/german.txt
+++ b/data/language/german.txt
@@ -4082,6 +4082,9 @@ STR_5781    :Betriebskosten: Unbekannt
 STR_5782    :Sie sind jetzt verbunden. Drücken Sie '{STRING}' um zu chatten.
 STR_5783    :{WINDOW_COLOUR_2}Szenario gesperrt
 STR_5784    :{BLACK}Vorhergehende Szenarios abschließen, um dieses Szenario freizuschalten.
+STR_5785    :Gruppe kann nicht umbenannt werden...
+STR_5786    :Ungültiger Gruppenname
+STR_5787    :{COMMA32} Spieler online
 
 #############
 # Scenarios #
diff --git a/data/language/korean.txt b/data/language/korean.txt
index a7e5a7e4c0..b4930ae038 100644
--- a/data/language/korean.txt
+++ b/data/language/korean.txt
@@ -3492,7 +3492,7 @@ STR_5152    :.
 STR_5153    :테마 수정...
 STR_5154    :하드웨어 디스플레이
 STR_5155    :완성되지 않은 트랙의 테스트 허용
-STR_5156    :{SMALLFONT}{BLACK}대부분의 놀이기구 종류에서 트랙{NEWLINE}을 완성되지 않아도 테스트를{NEWLINE}할 수 있도록 허용합니다. 블록 섹션 모드에는 적용되지 않습니다
+STR_5156    :{SMALLFONT}{BLACK}대부분의 놀이기구 종류에서 트랙{NEWLINE}이 완성되지 않아도 테스트를{NEWLINE}할 수 있도록 허용합니다. 블록 섹션 모드에는 적용되지 않습니다
 STR_5157    :모든 가격 잠금 해제
 STR_5158    :종료하고 메뉴로
 STR_5159    :OpenRCT2 종료
@@ -4085,6 +4085,8 @@ STR_5779    :수익: 시간당 {CURRENCY2DP}
 STR_5780    :유지비: 시간당 {CURRENCY2DP}
 STR_5781    :유지비: 알 수 없음
 STR_5782    :접속이 완료되었습니다. 대화를 시작하시려면 '{STRING}'를 누르세요.
+STR_5783    :{WINDOW_COLOUR_2}시나리오 잠김
+STR_5784    :{BLACK}이 시나리오를 플레이하려면 이전 시나리오의 목표를 먼저 완료하세요.
 
 #############
 # Scenarios #
diff --git a/data/language/spanish_sp.txt b/data/language/spanish_sp.txt
index 52dfab11bf..7f648c3bfc 100644
--- a/data/language/spanish_sp.txt
+++ b/data/language/spanish_sp.txt
@@ -4086,6 +4086,10 @@ STR_5779    :Ingresos: {CURRENCY2DP} por hora
 STR_5780    :Coste de funcionamiento: {CURRENCY2DP} por hora
 STR_5781    :Coste de funcionamiento: Desconocido
 STR_5782    :Ahora estas conectado. Presiona '{STRING}' para chatear.
+STR_5783    :{WINDOW_COLOUR_2}Escenario bloqueado
+STR_5784    :{BLACK}Completa escenarios anteriores para desbloquear este escenario.
+STR_5785    :No puedes renombrar el grupo...
+STR_5786    :Nombre de grupo no válido
 
 #############
 # Scenarios #