From 0aa0bec8049d1e16d8a2b03748c72eefae274702 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Mon, 3 Oct 2016 04:00:19 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/cs-CZ.txt | 8 ++++++--
 data/language/es-ES.txt | 8 ++++++--
 data/language/ko-KR.txt | 6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/data/language/cs-CZ.txt b/data/language/cs-CZ.txt
index c4e640e0c9..1eeb40398b 100644
--- a/data/language/cs-CZ.txt
+++ b/data/language/cs-CZ.txt
@@ -4118,8 +4118,8 @@ STR_5806    :Přepnout zobrazení v okně
 STR_5807    :{WINDOW_COLOUR_2}Počet atrakcí: {BLACK}{COMMA16}
 STR_5808    :{WINDOW_COLOUR_2}Počet obchodů a stánků: {BLACK}{COMMA16}
 STR_5809    :{WINDOW_COLOUR_2}Počet informačních kiosků a ostatních zařízení: {BLACK}{COMMA16}
-STR_5810    :Zrušit limit délky vlaků
-STR_5811    :{SMALLFONT}{BLACK}Pokud zaškrtnete, vlaky budou {NEWLINE}moci mít až 255 vagonů
+STR_5810    :Zrušit limit počtu vozů
+STR_5811    :{SMALLFONT}{BLACK}Pokud zaškrtnete, vlaky budou {NEWLINE}moci mít až 255 vagonů a atrakce až 31 vlaků
 STR_5812    :Zobrazit okno Hry více hráčů
 STR_5813    :{OPENQUOTES}{STRING}{ENDQUOTES}
 STR_5814    :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES}
@@ -4228,6 +4228,10 @@ STR_5916    :{COMMA16} hráč
 STR_5917    :{COMMA16} hráči
 STR_5918    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
 STR_5919    :{COMMA16}
+STR_5920    :Vykreslovat efekty počasí
+STR_5921    :{SMALLFONT}{BLACK}Pokud zaškrtnete, budou během bouřek barvy ponurejší.
+STR_5922    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{SMALLFONT}{BLACK}Max {STRINGID}
+STR_5923    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{SMALLFONT}{BLACK}Max {COMMA16} {STRINGID} / vlak
 
 
 ###############################################################################
diff --git a/data/language/es-ES.txt b/data/language/es-ES.txt
index 6ef612b5c4..6971bfcadf 100644
--- a/data/language/es-ES.txt
+++ b/data/language/es-ES.txt
@@ -4078,8 +4078,8 @@ STR_5806    :Alternar Modo de Pantalla Completa
 STR_5807    :{WINDOW_COLOUR_2}Número de Juegos/Atracciones: {BLACK}{COMMA16}
 STR_5808    :{WINDOW_COLOUR_2}Número de Tiendas y Puestos: {BLACK}{COMMA16}
 STR_5809    :{WINDOW_COLOUR_2}Número de Quioscos y Otras Facilidades: {BLACK}{COMMA16}
-STR_5810    :Desactivar límite de longitud de los trenes
-STR_5811    :{SMALLFONT}{BLACK}Si se activa, puedes tener hasta 255 vagones por tren.
+STR_5810    :Desactivar límite de vehículos
+STR_5811    :{SMALLFONT}{BLACK}Si se activa, puedes tener hasta 255 vagones por tren y 31 trenes por atracción.
 STR_5812    :Mostrar ventana Multijugador
 STR_5813    :{OPENQUOTES}{STRING}{ENDQUOTES}
 STR_5814    :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES}
@@ -4188,6 +4188,10 @@ STR_5916    :{COMMA16} jugador
 STR_5917    :{COMMA16} jugadores
 STR_5918    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
 STR_5919    :{COMMA16}
+STR_5920    :Efectos de Clima
+STR_5921    :{SMALLFONT}{BLACK}Si se activa, la lluvia y los colores oscuros se renderizarán durante una tormenta
+STR_5922    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{SMALLFONT}{BLACK}Máx {STRINGID}
+STR_5923    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{SMALLFONT}{BLACK}Máx {COMMA16} {STRINGID} por tren
 
 ##############
 # Escenarios #
diff --git a/data/language/ko-KR.txt b/data/language/ko-KR.txt
index 5a0976086f..ac9e84855c 100644
--- a/data/language/ko-KR.txt
+++ b/data/language/ko-KR.txt
@@ -4116,7 +4116,7 @@ STR_5807    :{WINDOW_COLOUR_2}놀이기구 수: {BLACK}{COMMA16}
 STR_5808    :{WINDOW_COLOUR_2}상점 및 매점 수: {BLACK}{COMMA16}
 STR_5809    :{WINDOW_COLOUR_2}안내소 및 기타 시설 수: {BLACK}{COMMA16}
 STR_5810    :열차 길이 제한 해제
-STR_5811    :{SMALLFONT}{BLACK}이 설정을 켜면, 열차 1대당 차량 수를 255대까지 늘릴 수 있습니다.
+STR_5811    :{SMALLFONT}{BLACK}이 설정을 켜면, 놀이기구 하나당 차량 수를 255량까지, 열차를 31대까지 늘릴 수 있습니다.
 STR_5812    :멀티플레이 창 열기
 STR_5813    :{OPENQUOTES}{STRING}{ENDQUOTES}
 STR_5814    :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES}
@@ -4226,6 +4226,10 @@ STR_5916    :{COMMA16}명 접속 중
 STR_5917    :{COMMA16}명 접속 중
 STR_5918    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
 STR_5919    :{COMMA16}
+STR_5920    :날씨 효과 표현
+STR_5921    :{SMALLFONT}{BLACK}이 설정을 켜면, 폭풍우가 치는 동안 비와 흐린 색상을 표현합니다.
+STR_5922    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{SMALLFONT}{BLACK}최대 {STRINGID}
+STR_5923    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{SMALLFONT}{BLACK}열차당 최대 {COMMA16} {STRINGID}
 
 #############
 # Scenarios #