From 196d3d8dcc859f58906b5d9abaf0489e63ee3c96 Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Mon, 22 Feb 2016 04:00:14 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/dutch.txt  | 29 ++++++++++++++++++++++++++++-
 data/language/korean.txt | 18 ++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/data/language/dutch.txt b/data/language/dutch.txt
index c9b69fc879..6be8be11b7 100644
--- a/data/language/dutch.txt
+++ b/data/language/dutch.txt
@@ -3962,7 +3962,7 @@ STR_5626    :Overige parken
 STR_5627    :Scenariolijst groeperen op:
 STR_5628    :Oorsprong
 STR_5629    :Moeilijkheidsgraad
-STR_5630    :Moeilijke scenario's worden ontgrendeld door gemakkelijke
+STR_5630    :Moeilijke scenario's ontgrendelden met gemakkelijke
 STR_5631    :Originele DLC
 STR_5632    :Bouw je eigen...
 STR_5633    :CMD + 
@@ -4035,6 +4035,33 @@ STR_5733    :Bij opschalen met gehele getallen NN gebruiken
 STR_5734    :{SMALLFONT}{BLACK}Rendering
 STR_5735    :Netwerkstatus
 STR_5736    :Speler
+STR_5737    :Gesloten, nog {COMMA16} passagier
+STR_5738    :Gesloten, nog {COMMA16} passagiers
+STR_5739    :{WINDOW_COLOUR_2}Huidige aantal passagiers: {BLACK}{COMMA16}
+STR_5740    :Oneindige marketingcampagnes
+STR_5741    :{SMALLFONT}{BLACK}Marketingcampagnes verlopen nooit
+STR_5742    :Authenticeren ...
+STR_5743    :Verbinding maken ...
+STR_5744    :Opzoeken ...
+STR_5745    :Netwerkdesynchronisatie gedetecteerd
+STR_5746    :Verbinding verbroken
+STR_5747    :Verbinding verbroken: {STRING}
+STR_5748    :Van de server verwijderd
+STR_5749    :Ophoepelen!
+STR_5750    :Verbinding gesloten
+STR_5751    :Geen gegevens
+STR_5752    :{OUTLINE}{RED}{STRING} heeft afgesloten.
+STR_5753    :{OUTLINE}{RED}{STRING} heeft afgesloten ({STRING}).
+STR_5754    :Ongeldige gebruikersnaam
+STR_5755    :Incorrecte softwareversie
+STR_5756    :Ongeldig wachtwoord
+STR_5757    :Server is vol
+STR_5758    :{OUTLINE}{GREEN}Nieuwe speler: {STRING}.
+STR_5759    :Bezig met downloaden van de kaart ... ({INT32} / {INT32})
+STR_5760    :Hong Kong-dollar (HK$)
+STR_5761    :Taiwanese dollar (NT$)
+STR_5762    :Chinese yuan (CN{YEN})
+STR_5763    :Alle bestanden
 
 #############
 # Scenarios #
diff --git a/data/language/korean.txt b/data/language/korean.txt
index e6514c7221..7b5a444997 100644
--- a/data/language/korean.txt
+++ b/data/language/korean.txt
@@ -4043,6 +4043,24 @@ STR_5738    :닫힘, {COMMA16}명의 손님이 아직 놀이기구에 있음
 STR_5739    :{WINDOW_COLOUR_2}놀이기구를 타고 있는 손님: {BLACK}{COMMA16}명
 STR_5740    :광고 기간 무제한으로
 STR_5741    :{SMALLFONT}{BLACK}광고의 기간을 무제한으로 바꿉니다
+STR_5742    :인증하는 중 ...
+STR_5743    :접속 중 ...
+STR_5744    :분석 중 ...
+STR_5745    :네트워크 비동기화 감지
+STR_5746    :접속이 끊어짐
+STR_5747    :접속이 끊어짐: {STRING}
+STR_5748    :추방
+STR_5749    :서버에서 추방당하셨습니다!
+STR_5750    :접속 종료
+STR_5751    :데이터 없음
+STR_5752    :{OUTLINE}{RED}{STRING} 님 퇴장
+STR_5753    :{OUTLINE}{RED}{STRING} 님 퇴장 ({STRING})
+STR_5754    :올바르지 않은 플레이어 이름
+STR_5755    :소프트웨어 버전이 맞지 않습니다
+STR_5756    :비밀번호가 맞지 않습니다
+STR_5757    :서버 제한 인원이 꽉 찼습니다
+STR_5758    :{OUTLINE}{GREEN}{STRING} 님 입장
+STR_5759    :맵 다운로드 중 ... ({INT32} / {INT32})
 
 #############
 # Scenarios #