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

---
 data/language/cs-CZ.txt |  2 ++
 data/language/de-DE.txt |  2 ++
 data/language/es-ES.txt |  2 ++
 data/language/fr-FR.txt |  4 ++++
 data/language/ko-KR.txt |  2 ++
 data/language/sv-SE.txt | 24 +++++++-----------------
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/data/language/cs-CZ.txt b/data/language/cs-CZ.txt
index bc4410c00b..8959ae0749 100644
--- a/data/language/cs-CZ.txt
+++ b/data/language/cs-CZ.txt
@@ -4181,6 +4181,8 @@ STR_5869    :{WINDOW_COLOUR_2}Web provozovatele: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Zobrazovat informace o serveru
 STR_5871    :Nevadnoucí květiny.
 STR_5872    :{SMALLFONT}{BLACK}Vypnout stárnutí a uvadání květin.
+STR_5873    :Povolit řetězové výtahy na všech částech trati
+STR_5874    :{SMALLFONT}{BLACK}Umožní použít řetězový výtah na jakékoliv části dráhy
 
 
 ###############################################################################
diff --git a/data/language/de-DE.txt b/data/language/de-DE.txt
index 86582f5769..1304b1a408 100644
--- a/data/language/de-DE.txt
+++ b/data/language/de-DE.txt
@@ -4172,6 +4172,8 @@ STR_5869    :{WINDOW_COLOUR_2}Providerwebseite: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Informationen zum Server anzeigen
 STR_5871    :Pflanzen altern nicht
 STR_5872    :{SMALLFONT}{BLACK}Deaktiviert das Altern von Pflanzen,{NEWLINE}sodass sie nicht verwelken
+STR_5873    :Kettenlifte auf allen Streckenst. erlauben
+STR_5874    :{SMALLFONT}{BLACK}Erlaubt es jedes Streckenstück{NEWLINE}als Kettenlift zu verwenden
 
 #############
 # Scenarios #
diff --git a/data/language/es-ES.txt b/data/language/es-ES.txt
index 5853f91561..69416b5439 100644
--- a/data/language/es-ES.txt
+++ b/data/language/es-ES.txt
@@ -4179,6 +4179,8 @@ STR_5869    :{WINDOW_COLOUR_2}Web proveedor: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Mostrar información del servidor.
 STR_5871    :Las plantas no se marchitan
 STR_5872    :{SMALLFONT}{BLACK}Evitar que las plantas se marchiten si estas no son regadas.
+STR_5873    :Cadena de elevación en todo el trayecto
+STR_5874    :{SMALLFONT}{BLACK}Permite que en cualquier pieza del trayecto se pueda colocar una cadena de elevación.
 
 ##############
 # Escenarios #
diff --git a/data/language/fr-FR.txt b/data/language/fr-FR.txt
index a4807a1670..efe9cbb2d4 100644
--- a/data/language/fr-FR.txt
+++ b/data/language/fr-FR.txt
@@ -4180,6 +4180,10 @@ STR_5867    :{WINDOW_COLOUR_2}Nom du fournisseur : {BLACK}{STRING}
 STR_5868    :{WINDOW_COLOUR_2}E-mail du fournisseur : {BLACK}{STRING}
 STR_5869    :{WINDOW_COLOUR_2}Site web du fournisseur : {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Affiche les informations du serveur
+STR_5871    :Les plantes ne vieillissent pas
+STR_5872    :{SMALLFONT}{BLACK}Désactive le vieillissement des plantes pour qu'elles ne fanent pas
+STR_5873    :Autoriser remontées à chaîne sur {NEWLINE}tous les éléments de voie
+STR_5874    :{SMALLFONT}{BLACK}Permet à tous les éléments de voie d'être équipés d'une remontée à chaîne
 
 #############
 # Scenarios #
diff --git a/data/language/ko-KR.txt b/data/language/ko-KR.txt
index 7feb717437..cb97b9db34 100644
--- a/data/language/ko-KR.txt
+++ b/data/language/ko-KR.txt
@@ -4178,6 +4178,8 @@ STR_5869    :{WINDOW_COLOUR_2}서버 웹사이트: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}서버 정보 보기
 STR_5871    :꽃이 시들지 않게 하기
 STR_5872    :{SMALLFONT}{BLACK}꽃이 시들지 않게 만듭니다.
+STR_5873    :모든 트랙에 체인 걸기 허용
+STR_5874    :{SMALLFONT}{BLACK}모든 트랙 조각에 체인 리프트를 걸 수 있도록 허용합니다.
 
 
 #############
diff --git a/data/language/sv-SE.txt b/data/language/sv-SE.txt
index 0c75d442ac..65632cb592 100644
--- a/data/language/sv-SE.txt
+++ b/data/language/sv-SE.txt
@@ -842,13 +842,6 @@ STR_0837    :Kan inte initiera grafiksystemet
 STR_0838    :<not used anymore>
 STR_0839    :{UINT16} x {UINT16}
 STR_0840    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{UINT16} x {UINT16}
-# The following six strings were used for display resolutions, but have been replaced.
-STR_0841    :<not used anymore>
-STR_0842    :<not used anymore>
-STR_0843    :<not used anymore>
-STR_0844    :<not used anymore>
-STR_0845    :<not used anymore>
-STR_0846    :<not used anymore>
 STR_0847    :Om 'OpenRCT2'
 STR_0848    :RollerCoaster Tycoon 2
 STR_0849    :{WINDOW_COLOUR_2}Version 2.01.028
@@ -1065,7 +1058,6 @@ STR_1059    :Kan inte namnge åktur/attraktion...
 STR_1060    :Ogiltigt åktur/attraktionsnamn
 STR_1061    :Normalt läge
 STR_1062    :Kontinuerligt banläge
-#TODO
 STR_1063    :Backande kjedjelyfts start
 STR_1064    :Accelererad start (passerar station)
 STR_1065    :Pendlarläge
@@ -1654,9 +1646,6 @@ STR_1647    :
 STR_1648    :{SMALLFONT}{OPENQUOTES}Hjälp! Släpp ner mig!{ENDQUOTES}
 STR_1649    :{SMALLFONT}{OPENQUOTES}Jag börjar få slut på pengar!{ENDQUOTES}
 STR_1650    :{SMALLFONT}{OPENQUOTES}Wow! Dom bygger en ny åktur!{ENDQUOTES}
-# Two removed inside jokes about Intamin and Phoenix
-STR_1651    :<removed string - do not use>
-STR_1652    :<removed string - do not use>
 STR_1653    :{SMALLFONT}{OPENQUOTES}...och nu är vi på {STRINGID}!{ENDQUOTES}
 STR_1654    :{WINDOW_COLOUR_2}Nyliga tankar:
 STR_1655    :{SMALLFONT}{BLACK}Bygg gångväg på land
@@ -1677,7 +1666,6 @@ STR_1669    :{WINDOW_COLOUR_2}Tillfredsställd: {BLACK}{COMMA16}%
 STR_1670    :{WINDOW_COLOUR_2}Totalt antal kunder: {BLACK}{COMMA32}
 STR_1671    :{WINDOW_COLOUR_2}Total vinst: {BLACK}{CURRENCY2DP}
 STR_1672    :Bromsar
-#TODO
 STR_1673    :Snurr kontroll växlare
 STR_1674    :Bromshastighet
 STR_1675    :{POP16}{VELOCITY}
@@ -1897,10 +1885,6 @@ STR_1888    :{WINDOW_COLOUR_2}Tid sen senaste inspektion: {BLACK}mer än 4 timma
 STR_1889    :{WINDOW_COLOUR_2}Dötid: {MOVE_X}{255}{BLACK}{COMMA16}%
 STR_1890    :{SMALLFONT}{BLACK}Välj hur ofta en mekaniker ska göra underhåll på den här åkturen
 STR_1891    :Ingen {STRINGID} i parken än!
-# The following two strings were used to display an error when the disc was missing.
-# This has been replaced in OpenRCT2.
-STR_1892    :<not used anymore>
-STR_1893    :<not used anymore>
 STR_1894    :{WINDOW_COLOUR_2}{STRINGID} sålde: {BLACK}{COMMA32}
 STR_1895    :{SMALLFONT}{BLACK}Bygg ny Åktur/attraktion
 STR_1896    :{WINDOW_COLOUR_2}Utgifter/Inkomster
@@ -4183,7 +4167,13 @@ STR_5869    :{WINDOW_COLOUR_2}Ägarens Hemsida: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Visa server information
 STR_5871    :Växter åldras inte
 STR_5872    :{SMALLFONT}{BLACK}Avaktivera växterna från att åldras så dem inte visnar
-
+STR_5873    :Tillåt lyftkjedjor på alla spår
+STR_5874    :{SMALLFONT}{BLACK}Tillåter alla delar i berg-o-dal barnor att ha lyftkjedjor som drar vagnarna
+STR_5875    :Grafikmotor:
+STR_5876    :{SMALLFONT}{BLACK}Spelmotorn som ska används för att rita spelet.
+STR_5877    :Mjukvara
+STR_5878    :Mjukvara (hårdvaruhantering)
+STR_5879    :OpenGL
 
 #############
 # Scenarion #