From e225ea2bc0594d6704da2be2c2d491a0c9ccc36b Mon Sep 17 00:00:00 2001
From: OpenRCT2 git bot <gitbot@openrct2.org>
Date: Sat, 8 Jul 2017 04:00:41 +0000
Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop.

---
 data/language/ca-ES.txt | 2 +-
 data/language/cs-CZ.txt | 2 +-
 data/language/de-DE.txt | 2 +-
 data/language/es-ES.txt | 2 +-
 data/language/fi-FI.txt | 2 +-
 data/language/fr-FR.txt | 2 +-
 data/language/it-IT.txt | 2 +-
 data/language/ja-JP.txt | 2 +-
 data/language/ko-KR.txt | 2 +-
 data/language/nb-NO.txt | 2 +-
 data/language/nl-NL.txt | 2 +-
 data/language/pt-BR.txt | 2 +-
 data/language/sv-SE.txt | 4 ++--
 data/language/zh-CN.txt | 2 +-
 data/language/zh-TW.txt | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/language/ca-ES.txt b/data/language/ca-ES.txt
index 3dd5bb6770..c06a7af874 100644
--- a/data/language/ca-ES.txt
+++ b/data/language/ca-ES.txt
@@ -3762,7 +3762,7 @@ STR_5420    :Gira{MOVE_X}{87}{COMMA16}
 STR_5421    :Enfoca
 STR_5422    :Enfoca{MOVE_X}{87}{COMMA16}
 STR_5423    :Espera
-STR_5424    :Espera{MOVE_X}{87}{COMMA16}
+STR_5424    :Espera{MOVE_X}{87}{UINT16}
 STR_5425    :Torna a començar
 STR_5426    :Acaba
 STR_5427    :Coordenades:
diff --git a/data/language/cs-CZ.txt b/data/language/cs-CZ.txt
index f2f6985049..2ed7e72015 100644
--- a/data/language/cs-CZ.txt
+++ b/data/language/cs-CZ.txt
@@ -3764,7 +3764,7 @@ STR_5420    :Otočit{MOVE_X}{87}{COMMA16}
 STR_5421    :Přiblížit
 STR_5422    :Přiblížit{MOVE_X}{87}{COMMA16}
 STR_5423    :Čekat
-STR_5424    :Čekat{MOVE_X}{87}{COMMA16}
+STR_5424    :Čekat{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :Konec
 STR_5427    :Souřadnice:
diff --git a/data/language/de-DE.txt b/data/language/de-DE.txt
index ff2e8f354a..28c560d758 100644
--- a/data/language/de-DE.txt
+++ b/data/language/de-DE.txt
@@ -3758,7 +3758,7 @@ STR_5420    :Drehen{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Warten
-STR_5424    :Warten{MOVE_X}{87}{COMMA16}
+STR_5424    :Warten{MOVE_X}{87}{UINT16}
 STR_5425    :Neustart
 STR_5426    :Ende
 STR_5427    :Koordinaten:
diff --git a/data/language/es-ES.txt b/data/language/es-ES.txt
index 0a2cc9996f..b7a7f95da6 100644
--- a/data/language/es-ES.txt
+++ b/data/language/es-ES.txt
@@ -3759,7 +3759,7 @@ STR_5420    :Rotar{MOVE_X}{87}{COMMA16}
 STR_5421    :Enfocar
 STR_5422    :Enfocar{MOVE_X}{87}{COMMA16}
 STR_5423    :Esperar
-STR_5424    :Esperar{MOVE_X}{87}{COMMA16}
+STR_5424    :Esperar{MOVE_X}{87}{UINT16}
 STR_5425    :Reiniciar
 STR_5426    :Fin
 STR_5427    :Coordenadas:
diff --git a/data/language/fi-FI.txt b/data/language/fi-FI.txt
index 8bbede9246..1d42e53df5 100644
--- a/data/language/fi-FI.txt
+++ b/data/language/fi-FI.txt
@@ -3766,7 +3766,7 @@ STR_5420    :Käännä{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Odota
-STR_5424    :Odota{MOVE_X}{87}{COMMA16}
+STR_5424    :Odota{MOVE_X}{87}{UINT16}
 STR_5425    :Uudelleen käynnistä
 STR_5426    :Lopeta
 STR_5427    :Koordinaatit:
diff --git a/data/language/fr-FR.txt b/data/language/fr-FR.txt
index 5336030e62..d7d8483874 100644
--- a/data/language/fr-FR.txt
+++ b/data/language/fr-FR.txt
@@ -3763,7 +3763,7 @@ STR_5420    :Tourner{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoomer
 STR_5422    :Zoomer{MOVE_X}{87}{COMMA16}
 STR_5423    :Attendre
-STR_5424    :Attendre{MOVE_X}{87}{COMMA16}
+STR_5424    :Attendre{MOVE_X}{87}{UINT16}
 STR_5425    :Redémarrer
 STR_5426    :Fin
 STR_5427    :Coordonnées :
diff --git a/data/language/it-IT.txt b/data/language/it-IT.txt
index 6e1e0e8630..16330c4db4 100644
--- a/data/language/it-IT.txt
+++ b/data/language/it-IT.txt
@@ -3765,7 +3765,7 @@ STR_5420    :Ruota{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Aspetta
-STR_5424    :Aspetta{MOVE_X}{87}{COMMA16}
+STR_5424    :Aspetta{MOVE_X}{87}{UINT16}
 STR_5425    :Riavvia
 STR_5426    :Fine
 STR_5427    :Coordinate:
diff --git a/data/language/ja-JP.txt b/data/language/ja-JP.txt
index 48f28aa276..3005e56f91 100644
--- a/data/language/ja-JP.txt
+++ b/data/language/ja-JP.txt
@@ -3762,7 +3762,7 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wait
-STR_5424    :Wait{MOVE_X}{87}{COMMA16}
+STR_5424    :Wait{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :End
 STR_5427    :Coordinates:
diff --git a/data/language/ko-KR.txt b/data/language/ko-KR.txt
index 3a697453ae..8d349f784b 100644
--- a/data/language/ko-KR.txt
+++ b/data/language/ko-KR.txt
@@ -3761,7 +3761,7 @@ STR_5420    :{MOVE_X}{87}{COMMA16} 회전
 STR_5421    :확대
 STR_5422    :{MOVE_X}{87}{COMMA16} 확대
 STR_5423    :기다림
-STR_5424    :{MOVE_X}{87}{COMMA16} 동안 기다림
+STR_5424    :{MOVE_X}{87}{UINT16} 동안 기다림
 STR_5425    :재시작
 STR_5426    :끝
 STR_5427    :좌표:
diff --git a/data/language/nb-NO.txt b/data/language/nb-NO.txt
index 3e141109ab..ea7c1f99e9 100644
--- a/data/language/nb-NO.txt
+++ b/data/language/nb-NO.txt
@@ -3762,7 +3762,7 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wait
-STR_5424    :Wait{MOVE_X}{87}{COMMA16}
+STR_5424    :Wait{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :End
 STR_5427    :Coordinates:
diff --git a/data/language/nl-NL.txt b/data/language/nl-NL.txt
index a4c30aede6..fa96ed39ad 100644
--- a/data/language/nl-NL.txt
+++ b/data/language/nl-NL.txt
@@ -3757,7 +3757,7 @@ STR_5420    :Draai{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wacht
-STR_5424    :Wacht{MOVE_X}{87}{COMMA16}
+STR_5424    :Wacht{MOVE_X}{87}{UINT16}
 STR_5425    :Herstarten
 STR_5426    :Einde
 STR_5427    :Coördinaten:
diff --git a/data/language/pt-BR.txt b/data/language/pt-BR.txt
index e9059e74ed..97880b742c 100644
--- a/data/language/pt-BR.txt
+++ b/data/language/pt-BR.txt
@@ -3762,7 +3762,7 @@ STR_5420    :Rotacionar{MOVE_X}{87}{COMMA16}
 STR_5421    :Ampliar
 STR_5422    :Ampliar{MOVE_X}{87}{COMMA16}
 STR_5423    :Aguardar
-STR_5424    :Aguardar{MOVE_X}{87}{COMMA16}
+STR_5424    :Aguardar{MOVE_X}{87}{UINT16}
 STR_5425    :Reiniciar
 STR_5426    :Fim
 STR_5427    :Cordenadas:
diff --git a/data/language/sv-SE.txt b/data/language/sv-SE.txt
index e079eb67f3..e8d5f2657d 100644
--- a/data/language/sv-SE.txt
+++ b/data/language/sv-SE.txt
@@ -3760,13 +3760,13 @@ STR_5420    :Rotera{MOVE_X}{87}{COMMA16}
 STR_5421    :Zooma
 STR_5422    :Zooma{MOVE_X}{87}{COMMA16}
 STR_5423    :Vänta
-STR_5424    :Vänta{MOVE_X}{87}{COMMA16}
+STR_5424    :Vänta{MOVE_X}{87}{UINT16}
 STR_5425    :Börja om
 STR_5426    :Slut
 STR_5427    :Koordinater:
 STR_5428    :Moturs rotation:
 STR_5429    :Zoomnivå:
-STR_5430    :Sekunder att vänta:
+STR_5430    :Millisekunder att vänta:
 STR_5431    :Sparfil att ladda:
 STR_5432    :Kommando:
 STR_5433    :Titelsekvens
diff --git a/data/language/zh-CN.txt b/data/language/zh-CN.txt
index bfd5a15386..71e2cc7e27 100644
--- a/data/language/zh-CN.txt
+++ b/data/language/zh-CN.txt
@@ -3768,7 +3768,7 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :放大
 STR_5422    :放大{MOVE_X}{87}{COMMA16}
 STR_5423    :等待
-STR_5424    :等待{MOVE_X}{87}{COMMA16}
+STR_5424    :等待{MOVE_X}{87}{UINT16}
 STR_5425    :重新开始
 STR_5426    :结束
 STR_5427    :坐标:
diff --git a/data/language/zh-TW.txt b/data/language/zh-TW.txt
index 6ffb61a555..b765b1311c 100644
--- a/data/language/zh-TW.txt
+++ b/data/language/zh-TW.txt
@@ -3764,7 +3764,7 @@ STR_5420    :旋轉{MOVE_X}{87}{COMMA16}
 STR_5421    :放大
 STR_5422    :放大{MOVE_X}{87}{COMMA16}
 STR_5423    :等候
-STR_5424    :等候{MOVE_X}{87}{COMMA16}
+STR_5424    :等候{MOVE_X}{87}{UINT16}
 STR_5425    :重新開始
 STR_5426    :結束
 STR_5427    :座標: