Merge Localisation/master into OpenRCT2/develop.

This commit is contained in:
Ted John 2015-09-27 04:00:16 +01:00
parent 490836aff5
commit 4643881389
2 changed files with 12 additions and 2 deletions

View File

@ -3492,7 +3492,7 @@ STR_5156 :{SMALLFONT}{BLACK}Maakt het mogelijk om de meeste attractietypes te
STR_5157 :Alle prijzen ontgrendelen
STR_5158 :Terug naar het hoofdmenu
STR_5159 :OpenRCT2 afsluiten
STR_5160 :{MONTH} {STRINGID}, jaar {COMMA16}
STR_5160 :{POP16}{MONTH} {PUSH16}{PUSH16}{STRINGID}, jaar {POP16}{COMMA16}
STR_5161 :Datumnotatie:
STR_5162 :Dag/maand/jaar
STR_5163 :Maand/dag/jaar
@ -3880,6 +3880,11 @@ STR_5544 :{SMALLFONT}{BLACK}Helder rood
STR_5545 :{SMALLFONT}{BLACK}Donkerroze
STR_5546 :{SMALLFONT}{BLACK}Helder roze
STR_5547 :{SMALLFONT}{BLACK}Lichtroze
STR_5548 :Alle bedrijfsmodi tonen
STR_5549 :Jaar/maand/dag
STR_5550 :{POP16}{POP16}Jaar {COMMA16}, {PUSH16}{PUSH16}{MONTH} {PUSH16}{PUSH16}{STRINGID}
STR_5551 :Jaar/dag/maand
STR_5552 :{POP16}{POP16}Jaar {COMMA16}, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH}
#############
# Scenarios #

View File

@ -3500,7 +3500,7 @@ STR_5156 :{SMALLFONT}{BLACK}Allows testing of most ride types even when the t
STR_5157 :Unlock all prices
STR_5158 :Quit to menu
STR_5159 :Exit OpenRCT2
STR_5160 :{MONTH} {STRINGID}, Year {COMMA16}
STR_5160 :{POP16}{MONTH} {PUSH16}{PUSH16}{STRINGID}, Year {POP16}{COMMA16}
STR_5161 :Date Format:
STR_5162 :Day/Month/Year
STR_5163 :Month/Day/Year
@ -3888,6 +3888,11 @@ STR_5544 :{SMALLFONT}{BLACK}Bright red
STR_5545 :{SMALLFONT}{BLACK}Dark pink
STR_5546 :{SMALLFONT}{BLACK}Bright pink
STR_5547 :{SMALLFONT}{BLACK}Light pink
STR_5548 :Show all operating modes
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}
#########
# Rides #