From 6068b361bca716fddd3bedea3618d49de5ed9d5f Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 16 Oct 2015 04:00:16 +0100 Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop. --- data/language/dutch.txt | 1 + data/language/english_us.txt | 3 +++ data/language/german.txt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/data/language/dutch.txt b/data/language/dutch.txt index 8b8f574a71..a0a63f2432 100644 --- a/data/language/dutch.txt +++ b/data/language/dutch.txt @@ -3887,6 +3887,7 @@ STR_5551 :Jaar/dag/maand STR_5552 :{POP16}{POP16}Jaar {COMMA16}, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH} STR_5553 :Spel pauzeren als de Steam-overlay open staat STR_5554 :{SMALLFONT}{BLACK}Overgangen met omringend land gladstrijken +STR_5555 :Voertuigen van andere baantypen tonen ############# # Scenarios # diff --git a/data/language/english_us.txt b/data/language/english_us.txt index f120dbced0..3525b557ff 100644 --- a/data/language/english_us.txt +++ b/data/language/english_us.txt @@ -3893,6 +3893,9 @@ STR_5549 :Year/Month/Day STR_5550 :{POP16}{POP16}Year {COMMA16}, {PUSH16}{PUSH16}{MONTH} {PUSH16}{PUSH16}{STRINGID} STR_5551 :Year/Day/Month STR_5552 :{POP16}{POP16}Year {COMMA16}, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH} +STR_5553 :Pause game when Steam overlay is open +STR_5554 :{SMALLFONT}{BLACK}Enable mountain tool +STR_5555 :Show vehicles from other track types ######### # Rides # diff --git a/data/language/german.txt b/data/language/german.txt index 2cc63e1dfb..ecd0c51591 100644 --- a/data/language/german.txt +++ b/data/language/german.txt @@ -3887,3 +3887,5 @@ STR_5550 :{POP16}{POP16}Jahr {COMMA16}, {PUSH16}{PUSH16}{MONTH} {PUSH16}{PUSH STR_5551 :Jahr/Tag/Monat STR_5552 :{POP16}{POP16}Jahr {COMMA16}, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH} STR_5553 :Spiel bei geöffnetem Steam Overlay pausieren +STR_5554 :{SMALLFONT}{BLACK}Gebirgswerkzeug aktivieren +STR_5555 :Fahrzeuge anderer Streckentyp. anzeigen