From f6bfbb018697e65bb712b96da106804ce5ac34f2 Mon Sep 17 00:00:00 2001 From: OpenRCT2 git bot Date: Thu, 21 Apr 2016 04:00:15 +0000 Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop. --- data/language/czech.txt | 5 ++++- data/language/dutch.txt | 3 ++- data/language/french.txt | 4 +++- data/language/korean.txt | 5 ++++- data/language/spanish_sp.txt | 11 +++++++---- data/language/swedish.txt | 5 ++++- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/data/language/czech.txt b/data/language/czech.txt index 086ed82f34..88540de498 100644 --- a/data/language/czech.txt +++ b/data/language/czech.txt @@ -4061,7 +4061,7 @@ STR_5751 :Žádná data STR_5752 :{OUTLINE}Hráč {RED}{STRING} se odpojil STR_5753 :{OUTLINE}Hráč {RED}{STRING} se odpojil ({STRING}) STR_5754 :Neplatné jméno hráče -STR_5755 :Nesprávná verze hry +STR_5755 :Nesprávná verze hry (Server používá {STRING}) STR_5756 :Špatné heslo STR_5757 :Server je plný STR_5758 :{OUTLINE}{GREEN}Hráč {STRING} se připojil do hry @@ -4107,6 +4107,9 @@ STR_5797 :{SMALLFONT}{BLACK}Zakáže změny počasí{NEWLINE}(v parku bude od STR_5798 :{SMALLFONT}{BLACK}Povolí stavění, když je hra zapauzována STR_5799 :{SMALLFONT}{BLACK}Zakáže havárie atrakcí způsobené poruchou brzd STR_5800 :{SMALLFONT}{BLACK}Atrakce nebudou mít poruchy +STR_5801 :Zakázat odhazování odpadků +STR_5802 :{SMALLFONT}{BLACK}Návštěvníci nebudou odhazovat odpadky a zvracet +STR_5803 :{SMALLFONT}{BLACK}Otočit vybraný prvek mapy ############################################################################### diff --git a/data/language/dutch.txt b/data/language/dutch.txt index f0cd3e0d7b..7b2d89b382 100644 --- a/data/language/dutch.txt +++ b/data/language/dutch.txt @@ -4054,7 +4054,7 @@ 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_5755 :Incompatibele softwareversie (server gebruikt {STRING}) STR_5756 :Ongeldig wachtwoord STR_5757 :Server is vol STR_5758 :{OUTLINE}{GREEN}Nieuwe speler: {STRING}. @@ -4102,6 +4102,7 @@ STR_5799 :{SMALLFONT}{BLACK}Voorkomt dat de remmen van attracties kapot gaan, STR_5800 :{SMALLFONT}{BLACK}Voorkomt dat attracties kapot gaan. STR_5801 :Bevuiling voorkomen STR_5802 :{SMALLFONT}{BLACK}Voorkomt dat bezoekers braken of afval op de grond gooien. +STR_5803 :{SMALLFONT}{BLACK}Geselecteerd kaartelement draaien ############# diff --git a/data/language/french.txt b/data/language/french.txt index 2766946146..ad1257b05f 100644 --- a/data/language/french.txt +++ b/data/language/french.txt @@ -4063,7 +4063,7 @@ STR_5755 :Mauvaise version du programme STR_5756 :Mauvais mot de passe STR_5757 :Serveur plein STR_5758 :{OUTLINE}{GREEN}{STRING} a rejoint la partie -STR_5759 :Téléchargement de la carte... ({INT32} / {INT32}) +STR_5759 :Téléchargement de la carte... ({INT32} / {INT32} Kio) STR_5760 :Dollars de Hong Kong (HK$) STR_5761 :Nouveau Dollar Taïwanais (NT$) STR_5762 :Yuan Chinois (CN{YEN}) @@ -4105,6 +4105,8 @@ STR_5797 :{SMALLFONT}{BLACK}Désactive les changements de météo et reste à STR_5798 :{SMALLFONT}{BLACK}Autorise la construction lorsque le jeu est en pause STR_5799 :{SMALLFONT}{BLACK}Empêche les accidents sur les attractions en désactivant les pannes de freins STR_5800 :{SMALLFONT}{BLACK}Empêche les attractions de tomber en panne +STR_5801 :Désactiver déchets +STR_5802 :{SMALLFONT}{BLACK}Empêche les visiteurs de jeter leurs détritus et de vomir par terre ############# # Scenarios # diff --git a/data/language/korean.txt b/data/language/korean.txt index 19f4176b4e..5e363911c0 100644 --- a/data/language/korean.txt +++ b/data/language/korean.txt @@ -4058,7 +4058,7 @@ STR_5751 :데이터 없음 STR_5752 :{OUTLINE}{RED}{STRING} 님 퇴장 STR_5753 :{OUTLINE}{RED}{STRING} 님 퇴장 ({STRING}) STR_5754 :올바르지 않은 플레이어 이름 -STR_5755 :소프트웨어 버전이 맞지 않습니다 +STR_5755 :소프트웨어 버전이 맞지 않습니다 (서버는 {STRING} 버전을 사용합니다) STR_5756 :비밀번호가 맞지 않습니다 STR_5757 :서버 제한 인원이 꽉 찼습니다 STR_5758 :{OUTLINE}{GREEN}{STRING} 님 입장 @@ -4104,6 +4104,9 @@ STR_5797 :{SMALLFONT}{BLACK}날씨를 선택한 날씨로 고정하고 바뀌 STR_5798 :{SMALLFONT}{BLACK}일시정지 상태에서 건설을 허용합니다. STR_5799 :{SMALLFONT}{BLACK}브레이크 실패로 인한 고장과 충돌이 일어나지 않게 만듭니다. STR_5800 :{SMALLFONT}{BLACK}놀이기구가 고장나지 않게 만듭니다. +STR_5801 :구토와 쓰레기 버림 끄기 +STR_5802 :{SMALLFONT}{BLACK}손님들이 구토를 하거나 쓰레기를 버리지 않습니다. +STR_5803 :{SMALLFONT}{BLACK}선택한 맵 요소를 회전시킵니다. ############# # Scenarios # diff --git a/data/language/spanish_sp.txt b/data/language/spanish_sp.txt index 65e27ab210..8749073f58 100644 --- a/data/language/spanish_sp.txt +++ b/data/language/spanish_sp.txt @@ -4059,7 +4059,7 @@ STR_5751 :Sin Datos STR_5752 :{OUTLINE}{RED}{STRING} se ha desconectado STR_5753 :{OUTLINE}{RED}{STRING} se ha desconectado ({STRING}) STR_5754 :Nombre Jugador Incorrecto -STR_5755 :Ver. de Software incorrecto +STR_5755 :Versión de Software Incorrecto (Version del servidor {STRING}) STR_5756 :Contraseña Incorrecta STR_5757 :Servidor Lleno STR_5758 :{OUTLINE}{GREEN}{STRING} se ha unido al juego @@ -4105,10 +4105,13 @@ STR_5797 :{SMALLFONT}{BLACK}Deshabilita el cambio climático y mantiene el cl STR_5798 :{SMALLFONT}{BLACK}Permite hacer acciones de construcción en el modo de pausa. STR_5799 :{SMALLFONT}{BLACK}Deshabilita las averías y accidentes a causa de la falla de frenos. STR_5800 :{SMALLFONT}{BLACK}Evita que las atracciones se averíen. +STR_5801 :Desactivar basura +STR_5802 :{SMALLFONT}{BLACK}Evita que los visitantes tiren basura o vomiten en los senderos. +STR_5803 :{SMALLFONT}{BLACK}Rotar el elemento del mapa seleccionado. -############# -# Scenarios # -############# +############## +# Escenarios # +############## ## RCT Original diff --git a/data/language/swedish.txt b/data/language/swedish.txt index e7da9b8ea9..ea0c77a29a 100644 --- a/data/language/swedish.txt +++ b/data/language/swedish.txt @@ -4062,7 +4062,7 @@ STR_5751 :Ingen Data STR_5752 :{OUTLINE}{RED}{STRING} har lämnat STR_5753 :{OUTLINE}{RED}{STRING} har lämnat ({STRING}) STR_5754 :Ogiltigt Spelar Namn -STR_5755 :Fel Version av OpenRCT +STR_5755 :Fel Version av OpenRCT (Servern använder {STRING}) STR_5756 :Fel Lösenord STR_5757 :Servern är Full STR_5758 :{OUTLINE}{GREEN}{STRING} har anslutit till spelet @@ -4108,6 +4108,9 @@ STR_5797 :{SMALLFONT}{BLACK}Avaktiverar väderändringar och{NEWLINE}behålle STR_5798 :{SMALLFONT}{BLACK}Tillåter byggnationer när spelet är pausat STR_5799 :{SMALLFONT}{BLACK}Avaktiverar haveriet bromsfel så åkturernas vagnar inte krockar med varandra STR_5800 :{SMALLFONT}{BLACK}Hindrar karuseller från att gå sönder +STR_5801 :Avaktivera nedskräpning +STR_5802 :{SMALLFONT}{BLACK}Stoppar gästerna från att skräpa ner och kräkas i parken +STR_5803 :{SMALLFONT}{BLACK}Rotera valda element ############# # Scenarion #