From 60c438d9e9ba6946911f2a0b3cfd20651c98e774 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Tue, 29 May 2018 04:00:29 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/cs-CZ.txt | 2 +-
 data/language/ko-KR.txt | 2 +-
 data/language/nb-NO.txt | 3 +++
 data/language/sv-SE.txt | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/language/cs-CZ.txt b/data/language/cs-CZ.txt
index a511d49dd0..1ada227ab6 100644
--- a/data/language/cs-CZ.txt
+++ b/data/language/cs-CZ.txt
@@ -4536,7 +4536,7 @@ STR_6226    :Povolit předčasné splnění scénáře
 STR_6227    :{SMALLFONT}{BLACK}Umožní splnit úkoly a ukončit scénář před daným koncem scénáře
 STR_6228    :Nastavení scénáře
 STR_6229    :{WINDOW_COLOUR_2}{STRINGID}: {STRINGID}
-STR_6230    :{STRINGID}: {MOVE_X}{185}{STRINGID}
+STR_6230    :{STRINGID}:
 STR_6231    :{WINDOW_COLOUR_2}{STRINGID}: {MOVE_X}{185}{STRINGID}
 STR_6232    :Zmrazený
 STR_6233    :Seříznuté zobrazení
diff --git a/data/language/ko-KR.txt b/data/language/ko-KR.txt
index 86cdf02292..99caa0daaf 100644
--- a/data/language/ko-KR.txt
+++ b/data/language/ko-KR.txt
@@ -4536,7 +4536,7 @@ STR_6226    :시나리오 조기 클리어 활성화
 STR_6227    :{SMALLFONT}{BLACK}주어진 기간이 되기 전에 모든 시나리오 목표가 달성되면 시나리오를 조기에 클리어합니다.
 STR_6228    :시나리오 설정
 STR_6229    :{WINDOW_COLOUR_2}{STRINGID}: {STRINGID}
-STR_6230    :{STRINGID}: {MOVE_X}{185}{STRINGID}
+STR_6230    :{STRINGID}:
 STR_6231    :{WINDOW_COLOUR_2}{STRINGID}: {MOVE_X}{185}{STRINGID}
 STR_6232    :얼리기
 STR_6233    :특정 높이 잘라 보기
diff --git a/data/language/nb-NO.txt b/data/language/nb-NO.txt
index 0aaf2ed882..11b56d865c 100644
--- a/data/language/nb-NO.txt
+++ b/data/language/nb-NO.txt
@@ -4126,6 +4126,7 @@ STR_5814    :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES}
 STR_5815    :{SMALLFONT}{BLACK}Display FPS counter in-game
 STR_5816    :{SMALLFONT}{BLACK}Sets ratio to scale the game by.{NEWLINE}Most useful when playing in{NEWLINE}high resolutions
 STR_5817    :{SMALLFONT}{BLACK}[Requires hardware display]{NEWLINE}Sets UI scaling type
+STR_5817    :{SMALLFONT}{BLACK}Setter skaleringsmetode for brukergrensesnitt. Krever hardware rendering.{NEWLINE}Lineær skalering er jevn, men utydelig. 'Jevn nærmeste-nabo'-skalering er skarp, men er mer krevende.
 STR_5818    :{SMALLFONT}{BLACK}[Requires hardware display]{NEWLINE}Use nearest neighbour scaling{NEWLINE}when window scaling factor set{NEWLINE}to integer values (1, 2, 3, etc)
 STR_5819    :{SMALLFONT}{BLACK}[Requires hardware display]{NEWLINE}Pause the game if Steam{NEWLINE}in-game overlay is opened
 STR_5820    :{SMALLFONT}{BLACK}Minimise the game if focus is{NEWLINE}lost while in fullscreen mode
@@ -4468,6 +4469,8 @@ STR_6154    :Det er ikke anbefalt å kjøre OpenRCT2 med opphøyde brukerrettigh
 STR_6155    :Hverken KDialog eller Zenity er installert. Installer en av dem, eller konfigurer fra kommandolinjen.
 STR_6156    :Reservert navn
 STR_6157    :Kommandolinje
+STR_6158    :Kunne ikke laste inn fil...{NEWLINE}RCTC-versjon {COMMA16} er ikke kompatibel.
+STR_6159    :Jevn nærmeste-nabo
 
 #############
 # Scenarios #
diff --git a/data/language/sv-SE.txt b/data/language/sv-SE.txt
index 2ce71dbfdc..6f21063845 100644
--- a/data/language/sv-SE.txt
+++ b/data/language/sv-SE.txt
@@ -4517,7 +4517,7 @@ STR_6218    :Officiella OpenRCT2
 STR_6219    :Visa problem på gångvägar
 
 STR_6229    :{WINDOW_COLOUR_2}{STRINGID}: {STRINGID}
-STR_6230    :{STRINGID}: {MOVE_X}{185}{STRINGID}
+STR_6230    :{STRINGID}:
 STR_6231    :{WINDOW_COLOUR_2}{STRINGID}: {MOVE_X}{185}{STRINGID}