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

---
 data/language/cs-CZ.txt | 1 +
 data/language/es-ES.txt | 2 ++
 data/language/pt-BR.txt | 6 ++++++
 data/language/sv-SE.txt | 8 ++++++++
 data/language/zh-CN.txt | 1 +
 data/language/zh-TW.txt | 5 +++++
 6 files changed, 23 insertions(+)

diff --git a/data/language/cs-CZ.txt b/data/language/cs-CZ.txt
index d68f80cc5d..ddeea07570 100644
--- a/data/language/cs-CZ.txt
+++ b/data/language/cs-CZ.txt
@@ -4206,6 +4206,7 @@ STR_5894    :Zadejte kurz měny
 STR_5895    :Uložit trať
 STR_5896    :Nepodařilo se uložit trať!
 STR_5897    :Limit okna:
+STR_5898    :{BLACK}Nelze načíst trať - soubor neexistuje,{newline}nebo je pravděpodobně poškozen!
 
 
 ###############################################################################
diff --git a/data/language/es-ES.txt b/data/language/es-ES.txt
index 50fa474bda..32e5389596 100644
--- a/data/language/es-ES.txt
+++ b/data/language/es-ES.txt
@@ -4165,6 +4165,8 @@ STR_5893    :Tasa de Cambio
 STR_5894    :Introduce la Tasa de Cambio
 STR_5895    :Guardar diseño de vía
 STR_5896    :¡Falló al guardar el diseño de vía!
+STR_5897    :Límite de ventanas:
+STR_5898    :{BLACK}No se pudo cargar el diseño de vía:{NEWLINE}¡El archivo parece estar corrupto, dañado o no existe!
 
 ##############
 # Escenarios #
diff --git a/data/language/pt-BR.txt b/data/language/pt-BR.txt
index bf842dfe2e..95470de62c 100644
--- a/data/language/pt-BR.txt
+++ b/data/language/pt-BR.txt
@@ -4201,6 +4201,12 @@ STR_5889    :Símbolo de moeda personalizada
 STR_5890    :Insira o símbolo da moeda para exibir
 STR_5891    :Padrão
 STR_5892    :{SMALLFONT}{BLACK}Vai para o diretório padrão
+STR_5893    :Taxa de Câmbio
+STR_5894    :Insira a taxa de câmbio
+STR_5895    :Salvar pista
+STR_5896    :Falha ao salvar pista!
+STR_5897    :Limite da janela:
+STR_5898    :{BLACK}Não é possível carregar pista, o arquivo pode estar {newline}corrompido, quebrado ou faltando!
 
 #############
 # Scenarios #
diff --git a/data/language/sv-SE.txt b/data/language/sv-SE.txt
index 6d0a1ce4af..6898a7f6c8 100644
--- a/data/language/sv-SE.txt
+++ b/data/language/sv-SE.txt
@@ -4185,6 +4185,14 @@ STR_5887    :Prefix
 STR_5888    :Suffix
 STR_5889    :Skriv in valutatecken
 STR_5890    :Skriv in vilket valutatecken som ska visas
+STR_5891    :Standard
+STR_5892    :{SMALLFONT}{BLACK}Gå till standardmappen
+STR_5893    :Valutakurs
+STR_5894    :Skriv in valutakurs
+STR_5895    :Spara bandesign
+STR_5896    :Misslyckades med att spara bandesignen!
+STR_5897    :Max antal fönster:
+STR_5898    :{BLACK}Kan inte ladda bandesignen, filen kan vara {newline}skadad eller saknas!
 
 #############
 # Scenarion #
diff --git a/data/language/zh-CN.txt b/data/language/zh-CN.txt
index d28d90039c..48442237c6 100644
--- a/data/language/zh-CN.txt
+++ b/data/language/zh-CN.txt
@@ -4213,6 +4213,7 @@ STR_5893    :汇率
 STR_5894    :请输入汇率
 STR_5895    :保存轨道设计
 STR_5896    :保存轨道设计失败!
+STR_5897    :窗口数量限制:
 
 #############
 # Scenarios #
diff --git a/data/language/zh-TW.txt b/data/language/zh-TW.txt
index af2ca9bc14..8e9070fe89 100644
--- a/data/language/zh-TW.txt
+++ b/data/language/zh-TW.txt
@@ -4202,6 +4202,11 @@ STR_5889    :自訂貨幣符號
 STR_5890    :請輸入用於顯示的貨幣符號
 STR_5891    :預設文件夾
 STR_5892    :{SMALLFONT}{BLACK}回到預設文件夾
+STR_5893    :匯率
+STR_5894    :請輸入匯率
+STR_5895    :儲存軌道設計
+STR_5896    :軌道設計儲存失真!
+STR_5897    :同時開啟視窗的數目限制:
 
 #############
 # Scenarios #