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

---
 data/language/chinese_simplified.txt |  5 +++--
 data/language/czech.txt              |  1 +
 data/language/dutch.txt              |  2 +-
 data/language/korean.txt             |  1 +
 data/language/portuguese_br.txt      | 13 ++++++++++---
 data/language/spanish_sp.txt         |  1 +
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/data/language/chinese_simplified.txt b/data/language/chinese_simplified.txt
index 94b5fe6ab1..ec0dbfbb65 100644
--- a/data/language/chinese_simplified.txt
+++ b/data/language/chinese_simplified.txt
@@ -4113,10 +4113,11 @@ STR_5797    :{SMALLFONT}{BLACK}Disables weather changes and{NEWLINE}freezes the
 STR_5798    :{SMALLFONT}{BLACK}Allows building actions in pause mode
 STR_5799    :{SMALLFONT}{BLACK}Disables ride breakdowns and crashes due to brake failure
 STR_5800    :{SMALLFONT}{BLACK}Prevents rides from breaking down
-STR_5801    :禁止丢弃
-STR_5802    :{SMALLFONT}{BLACK}阻止游客丢弃或呕吐
+STR_5801    :禁止乱丢垃圾
+STR_5802    :{SMALLFONT}{BLACK}阻止游客乱丢垃圾或呕吐
 STR_5803    :{SMALLFONT}{BLACK}旋转选中的地图元素
 STR_5804    :静音
+STR_5805    :{SMALLFONT}{BLACK}若选中此选项, 你的服务器将会添加至{NEWLINE}公共服务区列表，所有玩家均可以找到它
 
 #############
 # Scenarios #
diff --git a/data/language/czech.txt b/data/language/czech.txt
index bfc67a04ac..b7e3c692ee 100644
--- a/data/language/czech.txt
+++ b/data/language/czech.txt
@@ -4111,6 +4111,7 @@ STR_5801    :Zakázat odhazování odpadků
 STR_5802    :{SMALLFONT}{BLACK}Návštěvníci nebudou odhazovat odpadky a zvracet
 STR_5803    :{SMALLFONT}{BLACK}Otočit vybraný prvek mapy
 STR_5804    :Vypnout zvuky
+STR_5805    :{SMALLFONT}{BLACK}Pokud zaškrtnete, bude váš server zařazen do{NEWLINE}veřejného seznamu, aby ho mohl kdokoliv najít
 
 
 ###############################################################################
diff --git a/data/language/dutch.txt b/data/language/dutch.txt
index 934741ee22..4c786eb385 100644
--- a/data/language/dutch.txt
+++ b/data/language/dutch.txt
@@ -4104,7 +4104,7 @@ STR_5801    :Bevuiling voorkomen
 STR_5802    :{SMALLFONT}{BLACK}Voorkomt dat bezoekers braken of afval op de grond gooien.
 STR_5803    :{SMALLFONT}{BLACK}Geselecteerd kaartelement draaien
 STR_5804    :Geluid dempen
-
+STR_5805    :{SMALLFONT}{BLACK}Als dit is ingeschakeld zal je server worden aangemeld{NEWLINE}bij de openbare serverlijst, zodat iedereen hem kan zien.
 
 #############
 # Scenarios #
diff --git a/data/language/korean.txt b/data/language/korean.txt
index aec2fc7540..9b9e39283a 100644
--- a/data/language/korean.txt
+++ b/data/language/korean.txt
@@ -4108,6 +4108,7 @@ STR_5801    :구토와 쓰레기 버림 끄기
 STR_5802    :{SMALLFONT}{BLACK}손님들이 구토를 하거나 쓰레기를 버리지 않습니다.
 STR_5803    :{SMALLFONT}{BLACK}선택한 맵 요소를 회전시킵니다.
 STR_5804    :음소거
+STR_5805    :{SMALLFONT}{BLACK}이 설정을 켜면, 서버가 마스터 서버 목록에 홍보·추가되어 누구나 검색할 수 있게 됩니다.
 
 #############
 # Scenarios #
diff --git a/data/language/portuguese_br.txt b/data/language/portuguese_br.txt
index 4daca5d697..82cf02a100 100644
--- a/data/language/portuguese_br.txt
+++ b/data/language/portuguese_br.txt
@@ -3465,7 +3465,7 @@ STR_5123    :Renovar atrações
 STR_5124    :<not used anymore>
 STR_5125    :Tudo destruível
 STR_5126    :Música de título aleatória
-STR_5127    :{SMALLFONT}{BLACK}Enquanto arrastando, pinta a paisagem ao invés de mudar a elevação
+STR_5127    :{SMALLFONT}{BLACK}Enquanto arrasta, pinta a paisagem ao invés de mudar a elevação
 STR_5128    :Tamanho da seleção
 STR_5129    :Insira o tamanho da seleção entre {COMMA16} e {COMMA16}
 STR_5130    :Tamanho do mapa
@@ -4003,6 +4003,7 @@ STR_5661    :Definir Grupo do Jogador
 STR_5662    :N/A
 STR_5663    :Limpar Paisagem
 STR_5664    :Trapaças
+STR_5665    :Alternar Conjunto de Cenário
 STR_5701    :{WINDOW_COLOUR_2}Última ação: {BLACK}{STRINGID}
 STR_5702    :{SMALLFONT}{BLACK}Localizar ação mais recente do jogador
 STR_5703    :Não é possível expulsar o anfitrião
@@ -4059,11 +4060,11 @@ STR_5751    :Sem dados
 STR_5752    :{OUTLINE}{RED}{STRING} se desconectou
 STR_5753    :{OUTLINE}{RED}{STRING} se desconectou ({STRING})
 STR_5754    :Nome de Jogador Ruim
-STR_5755    :Versão de Software Incorreta
+STR_5755    :Versão de Software Incorreta (Servidor está usando {STRING})
 STR_5756    :Senha Ruim
 STR_5757    :Servidor Cheio
 STR_5758    :{OUTLINE}{GREEN}{STRING} entrou no jogo
-STR_5759    :Baixando mapa ... ({INT32} / {INT32})
+STR_5759    :Baixando mapa ... ({INT32} / {INT32}) KiB
 STR_5760    :Dólar de Hong Kong (HK$)
 STR_5761    :Dólar de New Taiwan (NT$)
 STR_5762    :Yuan Chinês(CN{YEN})
@@ -4105,6 +4106,12 @@ STR_5797    :{SMALLFONT}{BLACK}Desliga a mudança de clima e{NEWLINE}congela no
 STR_5798    :{SMALLFONT}{BLACK}Permite construir no modo pausado
 STR_5799    :{SMALLFONT}{BLACK}Desabilita quebras nas atrações e acidentes causados por falha nos freios
 STR_5800    :{SMALLFONT}{BLACK}Previne atrações de quebrar
+STR_5801    :Desabilitar lixo
+STR_5802    :{SMALLFONT}{BLACK}Impede que visitantes joguem lixo ou vomitem
+STR_5803    :{SMALLFONT}{BLACK}Rotaciona elemento de mapa selecionado
+STR_5804    :Som Mudo
+STR_5805    :{SMALLFONT}{BLACK}Se selecionado, seu servidor será adicionado à{NEWLINE}lista de servidores públicos para que todos possam encontrar
+
 
 #############
 # Scenarios #
diff --git a/data/language/spanish_sp.txt b/data/language/spanish_sp.txt
index 44423f49dd..2ace284c4e 100644
--- a/data/language/spanish_sp.txt
+++ b/data/language/spanish_sp.txt
@@ -4109,6 +4109,7 @@ STR_5801    :Desactivar basura
 STR_5802    :{SMALLFONT}{BLACK}Evita que los visitantes tiren basura o vomiten en los senderos.
 STR_5803    :{SMALLFONT}{BLACK}Rotar el elemento del mapa seleccionado.
 STR_5804    :Silenciar sonido
+STR_5805    :{SMALLFONT}{BLACK}Si se selecciona tu servidor será añadido a la lista de servidores publicos en donde cualquiera puede encontrar tu servidor.
 
 ##############
 # Escenarios #