From 9e6df440b5804543df02aa615afd4d5dd22057f4 Mon Sep 17 00:00:00 2001 From: OpenRCT2 git bot Date: Thu, 19 May 2016 04:00:20 +0000 Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop. --- data/language/cs-CZ.txt | 4 ++-- data/language/en-US.txt | 35 ----------------------------------- data/language/es-ES.txt | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/data/language/cs-CZ.txt b/data/language/cs-CZ.txt index d0342361a3..2d5d52a875 100644 --- a/data/language/cs-CZ.txt +++ b/data/language/cs-CZ.txt @@ -3168,7 +3168,7 @@ STR_3156 : STR_3157 :map STR_3158 :graph STR_3159 :list -STR_3160 : +STR_3160 :Vyberte počet koleček za jednu jízdu STR_3161 : STR_3162 :Nepodařilo se alokovat dostatek paměti STR_3163 :Instaluji nová data: @@ -11110,4 +11110,4 @@ STR_DTLS :Obrovský každoroční hudební festival se bude konat na vašem p STR_SCNR :Rock 'n' Roll - Rock 'n' Roll STR_PARK :Rock 'n' Roll Revival -STR_DTLS :Tento stárnoucí zábavní park už viděl lepší dny. Pomozte majiteli dát parku retro rock 'n' roll vzhled a udělat z něho vyhledávané místo. \ No newline at end of file +STR_DTLS :Tento stárnoucí zábavní park už viděl lepší dny. Pomozte majiteli dát parku retro rock 'n' roll vzhled a udělat z něho vyhledávané místo. diff --git a/data/language/en-US.txt b/data/language/en-US.txt index 6408e872b8..6330750d68 100644 --- a/data/language/en-US.txt +++ b/data/language/en-US.txt @@ -839,16 +839,8 @@ STR_0834 :{SMALLFONT}{BLACK}Disk and game options STR_0835 :Game initialization failed STR_0836 :Unable to start game in a minimized state STR_0837 :Unable to initialize graphics system -STR_0838 : STR_0839 :{UINT16} x {UINT16} STR_0840 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{UINT16} x {UINT16} -# The following six strings were used for display resolutions, but have been replaced. -STR_0841 : -STR_0842 : -STR_0843 : -STR_0844 : -STR_0845 : -STR_0846 : STR_0847 :About 'OpenRCT2' STR_0848 :RollerCoaster Tycoon 2 STR_0849 :{WINDOW_COLOUR_2}Version 2.01.028 @@ -1894,10 +1886,6 @@ STR_1888 :{WINDOW_COLOUR_2}Time since last inspection: {BLACK}more than 4 hou STR_1889 :{WINDOW_COLOUR_2}Down-Time: {MOVE_X}{255}{BLACK}{COMMA16}% STR_1890 :{SMALLFONT}{BLACK}Select how often a mechanic should check this ride STR_1891 :No {STRINGID} in park yet! -# The following two strings were used to display an error when the disc was missing. -# This has been replaced in OpenRCT2. -STR_1892 : -STR_1893 : STR_1894 :{WINDOW_COLOUR_2}{STRINGID} sold: {BLACK}{COMMA32} STR_1895 :{SMALLFONT}{BLACK}Build new ride/attraction STR_1896 :{WINDOW_COLOUR_2}Expenditure/Income @@ -2294,7 +2282,6 @@ STR_2286 :Designing STR_2287 :Completing design STR_2288 :Unknown STR_2289 :{STRINGID} {STRINGID} -STR_2290 : STR_2291 :Select scenario for new game STR_2292 :{WINDOW_COLOUR_2}Rides been on: STR_2293 :{BLACK} Nothing @@ -2321,10 +2308,6 @@ STR_2313 :{WINDOW_COLOUR_2}Nausea rating: {BLACK}{COMMA2DP32} (approx.) STR_2314 :{WINDOW_COLOUR_2}Ride length: {BLACK}{STRINGID} STR_2315 :{WINDOW_COLOUR_2}Cost: {BLACK}around {CURRENCY} STR_2316 :{WINDOW_COLOUR_2}Space required: {BLACK}{COMMA16} x {COMMA16} blocks -STR_2317 : -STR_2318 : -STR_2319 : -STR_2320 : STR_2321 :{WINDOW_COLOUR_2}Number of rides/attractions: {BLACK}{COMMA16} STR_2322 :{WINDOW_COLOUR_2}Staff: {BLACK}{COMMA16} STR_2323 :{WINDOW_COLOUR_2}Park size: {BLACK}{COMMA32}m{SQUARED} @@ -2441,12 +2424,6 @@ STR_2433 :{BLACK}Vouchers for free {STRINGID} STR_2434 :{BLACK}Advertising campaign for {STRINGID} STR_2435 :{BLACK}Advertising campaign for {STRINGID} STR_2436 :1 week -STR_2437 : -STR_2438 : -STR_2439 : -STR_2440 : -STR_2441 : -STR_2442 : STR_2443 :{WINDOW_COLOUR_2}Cost per week: {BLACK}{CURRENCY2DP} STR_2444 :{WINDOW_COLOUR_2}Total cost: {BLACK}{CURRENCY2DP} STR_2445 :Start this marketing campaign @@ -2687,8 +2664,6 @@ STR_2678 :??? STR_2679 :??? STR_2680 :All research complete STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by {CURRENCY} -STR_2682 : -STR_2683 : STR_2684 :{SMALLFONT}{BLACK}Large group of guests arrive STR_2685 :Simplex Noise Parameters STR_2686 :{WINDOW_COLOUR_2}Low: @@ -2768,10 +2743,7 @@ STR_2757 :Force Sun STR_2758 :Force Thunder STR_2759 :Zero Clearance STR_2760 :+{CURRENCY} -STR_2761 : -STR_2762 : STR_2763 :??? -STR_2764 : STR_2765 :Large Tram STR_2766 :Win scenario STR_2767 :Freeze Climate @@ -2978,8 +2950,6 @@ STR_2965 :{WINDOW_COLOUR_2} STR_2966 : STR_2967 : STR_2968 : -STR_2969 : -STR_2970 : STR_2971 :Main color scheme STR_2972 :Alternative color scheme 1 STR_2973 :Alternative color scheme 2 @@ -3169,8 +3139,6 @@ STR_3156 : STR_3157 :map STR_3158 :graph STR_3159 :list -STR_3160 : -STR_3161 : STR_3162 :Unable to allocate enough memory STR_3163 :Installing new data: STR_3164 :{BLACK}{COMMA16} selected (maximum {COMMA16}) @@ -3346,7 +3314,6 @@ STR_3333 :Export plug-in objects with saved games STR_3334 :{SMALLFONT}{BLACK}Select whether to save any additional plug-in object data required (add-in data not supplied with the main product) in saved game or scenario files, allowing them to be loaded by someone who doesn't have the additional object data STR_3335 :Roller Coaster Designer - Select Ride Types & Vehicles STR_3336 :Track Designs Manager - Select Ride Type -STR_3337 : STR_3338 :{BLACK}Custom-designed layout STR_3339 :{BLACK}{COMMA16} design available, or custom-designed layout STR_3340 :{BLACK}{COMMA16} designs available, or custom-designed layout @@ -3371,8 +3338,6 @@ STR_3358 :Can't delete track design... STR_3359 :{BLACK}No track designs of this type STR_3360 :Warning! STR_3361 :Too many track designs of this type - Some will not be listed. -STR_3362 : -STR_3363 : STR_3364 :Advanced STR_3365 :{SMALLFONT}{BLACK}Allow selection of individual items of scenery in addition to scenery groups STR_3366 :{BLACK}= Ride diff --git a/data/language/es-ES.txt b/data/language/es-ES.txt index 529abf72ce..c7282e33a7 100644 --- a/data/language/es-ES.txt +++ b/data/language/es-ES.txt @@ -3166,7 +3166,7 @@ STR_3156 : STR_3157 :mapa STR_3158 :gráfica STR_3159 :lista -STR_3160 : +STR_3160 :{SMALLFONT}{BLACK}Selecciona el número de circuitos por paseo. STR_3161 : STR_3162 :No se puede asignar memoria suficiente STR_3163 :Instalar nuevo dato: