From f8def6184bdc4c992dbcf9f27cdcbdaf511a8322 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 5 Jun 2014 17:14:16 +0000 Subject: [PATCH 01/20] (svn r26629) -Fix [FS#6012]: If the video driver fails to supply a list of resolutions, display an error message. --- src/lang/english.txt | 1 + src/settings_gui.cpp | 4 ++++ src/widgets/dropdown.cpp | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/lang/english.txt b/src/lang/english.txt index 3a71d92dd8..7787d0842a 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -969,6 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Select t STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} corrupted file{P "" s} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Additional information about the base music set +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Failed to retrieve a list of supported resolutions STR_ERROR_FULLSCREEN_FAILED :{WHITE}Fullscreen mode failed # Custom currency window diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 5cac722232..ccc8ff8e67 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -268,6 +268,8 @@ struct GameOptionsWindow : Window { } case WID_GO_RESOLUTION_DROPDOWN: // Setup resolution dropdown + if (_num_resolutions == 0) break; + list = new DropDownList(); *selected_index = GetCurRes(); for (int i = 0; i < _num_resolutions; i++) { @@ -433,6 +435,8 @@ struct GameOptionsWindow : Window { DropDownList *list = this->BuildDropDownList(widget, &selected); if (list != NULL) { ShowDropDownList(this, list, selected, widget); + } else { + if (widget == WID_GO_RESOLUTION_DROPDOWN) ShowErrorMessage(STR_ERROR_RESOLUTION_LIST_FAILED, INVALID_STRING_ID, WL_ERROR); } break; } diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index d919eff7cc..1f32b778eb 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -116,6 +116,8 @@ struct DropdownWindow : Window { DropdownWindow(Window *parent, const DropDownList *list, int selected, int button, bool instant_close, const Point &position, const Dimension &size, Colours wi_colour, bool scroll) : Window(&_dropdown_desc) { + assert(list->Length() > 0); + this->position = position; this->CreateNestedTree(); From ac043348977d6a1ce6c8b359923fd2e13bfa5f28 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 5 Jun 2014 17:45:20 +0000 Subject: [PATCH 02/20] (svn r26630) -Update from WebTranslator v3.0: hebrew - 20 changes by oofnik gaelic - 2 changes by GunChleoc --- src/lang/gaelic.txt | 9 +++++++-- src/lang/hebrew.txt | 27 +++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index d8f819f0dc..6116e5ff5d 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -1138,11 +1138,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Catalanach STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Fèin-shàbhaladh STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Tagh dè cho tric ’s a thèid an geama fèin-shàbhaladh +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Dheth STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Gach mìos STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Gach 3s mìos STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :Gach 6mh mìos STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :Gach bliadhna +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}Cànan STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Tagh cànan an eadar-aghaidh a chleachdas tu @@ -1269,7 +1271,7 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Roghainnean na STR_CONFIG_SETTING_RESTRICT_CATEGORY :{BLACK}Roinn-seòrsa: STR_CONFIG_SETTING_RESTRICT_TYPE :{BLACK}Seòrsa: -STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Cuingichidh seo an liosta gu h-ìosal gus nach tèid a shealltainn ach roghainnean air an atharrachadh +STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Cuingichidh seo an liosta gu h-ìosal le criathradh ro-shocraichte STR_CONFIG_SETTING_RESTRICT_BASIC :Roghainnean bunasach STR_CONFIG_SETTING_RESTRICT_ADVANCED :Roghainnean adhartach STR_CONFIG_SETTING_RESTRICT_ALL :Roghainnean an eòlaiche / na h-uile roghainn @@ -1454,7 +1456,7 @@ STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Astar as motha eadar an oir is fìneadairean-ola: {STRING} STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Cha tèid fìneadairean-ola a thogail ach faisg air crìochan a' mhapa, seo an oirthir le mapaichean eilein STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Àirde an loidhne sneachda: {STRING} -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Garbhachd a' chrutha-tìre (TerraGenesis a-mhàin): {STRING} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Garbhachd a' chrutha-tìre: {STRING} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Glè rèidh STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Rèidh STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Garbh @@ -1517,6 +1519,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Dheth STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Sgroladh le briogadh clì: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Cuir an comas gun tèid am mapa a sgroladh le slaodadh le putan clì na luchaige. Tha seo feumail gu h-àraidh nuair a chleachdas tu sgrìn-shuathaidh airson sgroladh + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Fòrmat cinn-latha {STRING} airson ainmean nan geamannan air an sàbhaladh STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Fòrmat a' chinn-latha ann an ainmean faidhle nan geamannan air an sàbhaladh STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :fada (31d Dùbh 2008) @@ -2983,6 +2986,8 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Cha deach STR_NEWGRF_SETTINGS_DISABLED :{RED}À comas STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Neo-chòrdail ris an tionndadh seo dhe OpenTTD +# NewGRF save preset window + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Atharraich paramadairean NewGRF STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Dùin diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 90972780e8..dd958a2f02 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -950,11 +950,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :רומאית STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}שמירה אוטומטית STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}בחר פרק זמן בין שמירות אוטומטיות +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :כבוי STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :מידי חודש STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :כל 3 חודשים STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :כל 6 חודשים STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :כל 12 חודשים +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}שפה STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}בחר את שפת הממשק @@ -1081,7 +1083,7 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :הגדרת חב STR_CONFIG_SETTING_RESTRICT_CATEGORY :{BLACK}קטגוריה: STR_CONFIG_SETTING_RESTRICT_TYPE :{BLACK}סוג: -STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}מגביל את הרשימה להלן כך שתציג רק הגדרות שהשתנו +STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}מגביל את הרשימה להלן תוך שימוש בסינון שהוגדר מראש. STR_CONFIG_SETTING_RESTRICT_BASIC :הגדרות בסיסיות STR_CONFIG_SETTING_RESTRICT_ADVANCED :הגדרות מתקדמות STR_CONFIG_SETTING_RESTRICT_ALL :הגדרות מומחה / כל ההגדרות @@ -1261,20 +1263,26 @@ STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :עובי קוו STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :עובי הקו בגרפים. קו דק ניתן לקריאה באופן מדויק יותר, אולם קל יותר לראות קו עבה ולהבחין בין הצבעים של קוים עבים STR_CONFIG_SETTING_LAND_GENERATOR :יוצר אדמה: {STRING} +STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT :המחולל המקורי מבוסס על הגרפיקה הבסיסית, ויוצר פני שטח אחידים. בורא הקרקע מבוסס על אלגוריתם רעש פרלין עם אפשרויות עריכה עדינות STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL :מקורי STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :בורא הקרקע STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :מרחק מירבי מן הקצה עבור מזקקות נפט: {STRING} STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :מזקקות נפט נבנות רק בקרבת גבול המפה, כלומר חוף הים עבור מפות בצורת אי STR_CONFIG_SETTING_SNOWLINE_HEIGHT :גובה קו השלג: {STRING} -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :רמת חספוס השטח (בבורא האדמה בלבד) : {STRING} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :רמת חספוס השטח: {STRING} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :חלק מאוד STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :חלק STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :מחוספס STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :מחוספס מאוד +STR_CONFIG_SETTING_RIVER_AMOUNT :כמות הנהרות: {STRING} +STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT :בחר את כמות הנהרות STR_CONFIG_SETTING_TREE_PLACER :אלגוריתם של נוטע העצים: {STRING} +STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT :בחר את הפיזור של העצים על המפה: 'מקורי' שותל עצים בצורה אחידה, 'משופר' שותל אותם בקבוצות STR_CONFIG_SETTING_TREE_PLACER_NONE :בכלל לא STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL :מקורי STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :משופר +STR_CONFIG_SETTING_ROAD_SIDE :כלי רכב: {STRING} +STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT :בחר את צד הנסיעה STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :סיבוב מפת גבהים: {STRING} STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :נגד כיוון השעון STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE :בכיוון השעון @@ -1329,6 +1337,9 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :כבוי STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :גלילה בלחיצה שמאלית: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :אפשר גלילת המפה באמצעות גרירתה עם כפתור העכבר השמאלי. אפשרות זו שימושית במיוחד בעת שימוש במסך מגע לצורך גלילה +STR_CONFIG_SETTING_AUTOSAVE :שמירה אוטומטית: {STRING} +STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :בחר פרק זמן בין שמירות אוטומטיות + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :השתמש במבנה התאריך {STRING} בשביל שמות קבצי השמירה. STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :פורמט התאריך בשמות קבצים של משחקים שמורים STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :ארוך (31 בדצמבר 2008) @@ -2719,6 +2730,8 @@ STR_NEWGRF_SETTINGS_MOVEUP :{BLACK}העבר STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}מעביר את הקובץ שנבחר כלפי מעלה ברשימה STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}העבר למטה STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}מעביר את הקובץ שנבחר כלפי מטה ברשימה +STR_NEWGRF_SETTINGS_UPGRADE :{BLACK}עדכן +STR_NEWGRF_SETTINGS_UPGRADE_TOOLTIP :{BLACK}עדכן קבצי NewGRF שלהם הגרסה המותקנת חדשה יותר STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK} רשימת קבצי שדרוג גראפי מותקנים STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}קבע ערכים @@ -2743,6 +2756,16 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}לא נמ STR_NEWGRF_SETTINGS_DISABLED :{RED}מושתק STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}אינו תואם גרסא זו של OpenTTD +# NewGRF save preset window +STR_SAVE_PRESET_CAPTION :{WHITE}שמור סביבה גראפית +STR_SAVE_PRESET_LIST_TOOLTIP :{BLACK}הצג את כל הסביבות הגראפיות, בחר אחת כדי להעתיק את שמה לשמירה +STR_SAVE_PRESET_TITLE :{BLACK}הכנס שם לסביבה הגראפית +STR_SAVE_PRESET_EDITBOX_TOOLTIP :{BLACK}השם הנבחר לשמירת הסביבה הגראפית +STR_SAVE_PRESET_CANCEL :{BLACK}ביטול +STR_SAVE_PRESET_CANCEL_TOOLTIP :{BLACK}אל תשנה את הסביבה הגראפית +STR_SAVE_PRESET_SAVE :{BLACK}שמור +STR_SAVE_PRESET_SAVE_TOOLTIP :{BLACK}שמור את הסביבה הגראפית עם השם שנבחר + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}שנה/י פרמטרים של NewGRF STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}סגור From 00b254a9b37ebb2316774819a21ea709052dfdf0 Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 6 Jun 2014 17:45:44 +0000 Subject: [PATCH 03/20] (svn r26631) -Update from WebTranslator v3.0: catalan - 57 changes by juanjo english_AU - 1 changes by mrtux german - 1 changes by planetmaker hebrew - 24 changes by oofnik italian - 1 changes by lorenzodv russian - 1 changes by Lone_Wolf --- src/lang/catalan.txt | 113 ++++++++++++++++++++-------------------- src/lang/english_AU.txt | 1 + src/lang/german.txt | 1 + src/lang/hebrew.txt | 48 ++++++++--------- src/lang/italian.txt | 1 + src/lang/russian.txt | 1 + 6 files changed, 85 insertions(+), 80 deletions(-) diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index ba34038c8d..f12d2b61e8 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -192,37 +192,37 @@ STR_COLOUR_GREY :{G=Masculin}Gri STR_COLOUR_WHITE :{G=Masculin}Blanc # Units used in OpenTTD -STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph -STR_UNITS_VELOCITY_METRIC :{COMMA} km/h -STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mph +STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h +STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s -STR_UNITS_POWER_IMPERIAL :{COMMA}cv -STR_UNITS_POWER_METRIC :{COMMA}cv -STR_UNITS_POWER_SI :{COMMA}kW +STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}cv +STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv +STR_UNITS_POWER_SI :{COMMA}{NBSP}kW -STR_UNITS_WEIGHT_SHORT_IMPERIAL :{COMMA}t -STR_UNITS_WEIGHT_SHORT_METRIC :{COMMA}t -STR_UNITS_WEIGHT_SHORT_SI :{COMMA}kg +STR_UNITS_WEIGHT_SHORT_IMPERIAL :{COMMA}{NBSP}t +STR_UNITS_WEIGHT_SHORT_METRIC :{COMMA}{NBSP}t +STR_UNITS_WEIGHT_SHORT_SI :{COMMA}{NBSP}kg -STR_UNITS_WEIGHT_LONG_IMPERIAL :{COMMA} tones{P "" s} -STR_UNITS_WEIGHT_LONG_METRIC :{G=Femenin}{COMMA} ton{P a es} -STR_UNITS_WEIGHT_LONG_SI :{COMMA} kg +STR_UNITS_WEIGHT_LONG_IMPERIAL :{COMMA}{NBSP}ton{P a es} +STR_UNITS_WEIGHT_LONG_METRIC :{G=Femenin}{COMMA}{NBSP}ton{P a es} +STR_UNITS_WEIGHT_LONG_SI :{COMMA}{NBSP}quilogram{P "" s} -STR_UNITS_VOLUME_SHORT_IMPERIAL :{COMMA}gal -STR_UNITS_VOLUME_SHORT_METRIC :{COMMA}l -STR_UNITS_VOLUME_SHORT_SI :{G=Masculin}{COMMA}m³ +STR_UNITS_VOLUME_SHORT_IMPERIAL :{COMMA}{NBSP}gal +STR_UNITS_VOLUME_SHORT_METRIC :{COMMA}{NBSP}L +STR_UNITS_VOLUME_SHORT_SI :{G=Masculin}{COMMA}{NBSP}m³ -STR_UNITS_VOLUME_LONG_IMPERIAL :{COMMA} galons{P "" s} -STR_UNITS_VOLUME_LONG_METRIC :{G=Masculin}{COMMA} litre{P "" s} -STR_UNITS_VOLUME_LONG_SI :{G=Masculin}{COMMA} m³ +STR_UNITS_VOLUME_LONG_IMPERIAL :{COMMA}{NBSP}gal{P ó ons} +STR_UNITS_VOLUME_LONG_METRIC :{G=Masculin}{COMMA}{NBSP}litre{P "" s} +STR_UNITS_VOLUME_LONG_SI :{G=Masculin}{COMMA}{NBSP}metre{P "" s}{NBSP}cúbic{P "" s} -STR_UNITS_FORCE_IMPERIAL :{COMMA} lbf -STR_UNITS_FORCE_METRIC :{COMMA} kgf -STR_UNITS_FORCE_SI :{G=Masculin}{COMMA} kN +STR_UNITS_FORCE_IMPERIAL :{COMMA}{NBSP}lbf +STR_UNITS_FORCE_METRIC :{COMMA}{NBSP}kgf +STR_UNITS_FORCE_SI :{G=Masculin}{COMMA}{NBSP}kN -STR_UNITS_HEIGHT_IMPERIAL :{COMMA} ft -STR_UNITS_HEIGHT_METRIC :{COMMA} m -STR_UNITS_HEIGHT_SI :{G=Masculin}{COMMA} m +STR_UNITS_HEIGHT_IMPERIAL :{COMMA}{NBSP}ft +STR_UNITS_HEIGHT_METRIC :{COMMA}{NBSP}m +STR_UNITS_HEIGHT_SI :{G=Masculin}{COMMA}{NBSP}m # Common window strings STR_LIST_FILTER_TITLE :{BLACK}Cadena de filtre: @@ -410,7 +410,7 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tarifes de paga ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Taula de la Lliga d'Empreses +STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Taula de la lliga d'empreses STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detall de ratis de rendiment STR_GRAPH_MENU_HIGHSCORE :Taula de rècords ############ range ends here @@ -472,37 +472,37 @@ STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Commuta el colo ############ range ends here ############ range for days starts (also used for the place in the highscore window) -STR_ORDINAL_NUMBER_1ST :1 -STR_ORDINAL_NUMBER_2ND :2 -STR_ORDINAL_NUMBER_3RD :3 -STR_ORDINAL_NUMBER_4TH :4 -STR_ORDINAL_NUMBER_5TH :5 -STR_ORDINAL_NUMBER_6TH :6 -STR_ORDINAL_NUMBER_7TH :7 -STR_ORDINAL_NUMBER_8TH :8 -STR_ORDINAL_NUMBER_9TH :9 -STR_ORDINAL_NUMBER_10TH :10 -STR_ORDINAL_NUMBER_11TH :11 -STR_ORDINAL_NUMBER_12TH :12 -STR_ORDINAL_NUMBER_13TH :13 -STR_ORDINAL_NUMBER_14TH :14 -STR_ORDINAL_NUMBER_15TH :15 -STR_ORDINAL_NUMBER_16TH :16 -STR_ORDINAL_NUMBER_17TH :17 -STR_ORDINAL_NUMBER_18TH :18 -STR_ORDINAL_NUMBER_19TH :19 -STR_ORDINAL_NUMBER_20TH :20 -STR_ORDINAL_NUMBER_21ST :21 -STR_ORDINAL_NUMBER_22ND :22 -STR_ORDINAL_NUMBER_23RD :23 -STR_ORDINAL_NUMBER_24TH :24 -STR_ORDINAL_NUMBER_25TH :25 -STR_ORDINAL_NUMBER_26TH :26 -STR_ORDINAL_NUMBER_27TH :27 -STR_ORDINAL_NUMBER_28TH :28 -STR_ORDINAL_NUMBER_29TH :29 -STR_ORDINAL_NUMBER_30TH :30 -STR_ORDINAL_NUMBER_31ST :31 +STR_ORDINAL_NUMBER_1ST :1r +STR_ORDINAL_NUMBER_2ND :2n +STR_ORDINAL_NUMBER_3RD :3r +STR_ORDINAL_NUMBER_4TH :4t +STR_ORDINAL_NUMBER_5TH :5è +STR_ORDINAL_NUMBER_6TH :6è +STR_ORDINAL_NUMBER_7TH :7è +STR_ORDINAL_NUMBER_8TH :8è +STR_ORDINAL_NUMBER_9TH :9è +STR_ORDINAL_NUMBER_10TH :10è +STR_ORDINAL_NUMBER_11TH :11è +STR_ORDINAL_NUMBER_12TH :12è +STR_ORDINAL_NUMBER_13TH :13è +STR_ORDINAL_NUMBER_14TH :14è +STR_ORDINAL_NUMBER_15TH :15è +STR_ORDINAL_NUMBER_16TH :16è +STR_ORDINAL_NUMBER_17TH :17è +STR_ORDINAL_NUMBER_18TH :18è +STR_ORDINAL_NUMBER_19TH :19è +STR_ORDINAL_NUMBER_20TH :20è +STR_ORDINAL_NUMBER_21ST :21è +STR_ORDINAL_NUMBER_22ND :22è +STR_ORDINAL_NUMBER_23RD :23è +STR_ORDINAL_NUMBER_24TH :24è +STR_ORDINAL_NUMBER_25TH :25è +STR_ORDINAL_NUMBER_26TH :26è +STR_ORDINAL_NUMBER_27TH :27è +STR_ORDINAL_NUMBER_28TH :28è +STR_ORDINAL_NUMBER_29TH :29è +STR_ORDINAL_NUMBER_30TH :30è +STR_ORDINAL_NUMBER_31ST :31è ############ range for days ends ############ range for months starts @@ -970,6 +970,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Seleccio STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} fitxer{P "" s} corromput{P "" s} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Informació adicional sobre el conjunt de músiques base +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}No s'ha pogut obtenir la llista de resolucions suportades STR_ERROR_FULLSCREEN_FAILED :{WHITE}El mode en pantalla completa ha fallat # Custom currency window diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index c4b8a7377f..a01829c1df 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -969,6 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Select t STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} corrupted file{P "" s} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Additional information about the base music set +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Failed to retrieve a list of supported resolutions STR_ERROR_FULLSCREEN_FAILED :{WHITE}Fullscreen mode failed # Custom currency window diff --git a/src/lang/german.txt b/src/lang/german.txt index f437578329..e0a93a63da 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -970,6 +970,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Ein Musi STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} fehlerhafte Datei{P "" en} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Zusätzliche Informationen über das Musikset +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Eine Liste unterstützter Auflösungen konnte nicht ermittelt werden STR_ERROR_FULLSCREEN_FAILED :{WHITE}Vollbildmodus nicht möglich # Custom currency window diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index dd958a2f02..c8b1604c09 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1092,11 +1092,11 @@ STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :הגדרות ב STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT :{BLACK}מגביל את הרשימה הבאה להגדרות מסוימות STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL :כל ההגדרות -STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :הגדרות משתמש(לא נמצא בשמורים; משפיע על כל המשחקים) -STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :הגדרות משחק (נמצא בשמורים; משפיע רק על משחקים חדשים) -STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :הגדרות משחק (נמצא בשמורים; משפיע רק על משחק נוכחי) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :הגדרות חברה (נמצא בשמורים; משפיע רק על משחקים חדשים) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :הגדרות חברה (נמצא בשמורים; משפיע רק על חברה נוכחית) +STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :הגדרות משתמש (לא מאוחסנות במשחקים שמורים; משפיעות על כל המשחקים) +STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :הגדרות משחק (מאוחסנות במשחקים שמורים; משפיעות רק על משחקים חדשים) +STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :הגדרות משחק (מאוחסנות במשחק שמור; משפיעות רק על משחק נוכחי) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :הגדרות חברה (מאוחסנות במשחקים שמורים; משפיעות רק על משחקים חדשים) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :הגדרות חברה (מאוחסנות במשחק שמור; משפיעות רק על חברה נוכחית) STR_CONFIG_SETTING_CATEGORY_HIDES :{BLACK}הצג את תוצאות החיפוש בהגדרת {SILVER}הקטגוריה {} {BLACK} ל{WHITE}{STRING} STR_CONFIG_SETTING_TYPE_HIDES :{BLACK}הצג את תוצאות החיפוש בהגדרת {SILVER}הסוג {} {BLACK}ל{WHITE}כל סוגי ההגדרות STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES :{BLACK}הצג את תוצאות החיפוש בהגדרת{SILVER}הקטגוריה{} {BLACK}ל{WHITE}{STRING} {BLACK}וגם את {SILVER}הסוג {BLACK}ל{WHITE}כל סוגי ההגדרות @@ -1141,7 +1141,7 @@ STR_CONFIG_SETTING_DISASTERS_HELPTEXT :אפשר/מנע STR_CONFIG_SETTING_CITY_APPROVAL :יחס מועצת העיר כלפי שינוי מבנה אזורי: {STRING} STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :בחר באיזו מידה רעש ונזק סביבתי ע"י חברות משפיעים על הדירוג העירוני שלהן ופעולות בנייה עתידיות באזור -STR_CONFIG_SETTING_AUTOSLOPE :{STRING} :'אפשר יצירת מילוי עפר תחת מבנים, פסי רכבת וכו +STR_CONFIG_SETTING_AUTOSLOPE :אפשר יצירת מילוי עפר תחת מבנים, פסי רכבת וכו': {STRING} STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT :אפשר שינוי פני השטח מתחת לבניינים ולמסילות ללא הסרתם STR_CONFIG_SETTING_CATCHMENT :אפשר לאזורי אגירת מים להיראות יותר ריאליסטיים: {STRING} STR_CONFIG_SETTING_CATCHMENT_HELPTEXT :אזורי אגירה בגדלים שונים עבור סוגים שונים של תחנות ונמלי תעופה @@ -1262,7 +1262,7 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :הצג את א STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :עובי קווים בגרפים: {STRING} STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :עובי הקו בגרפים. קו דק ניתן לקריאה באופן מדויק יותר, אולם קל יותר לראות קו עבה ולהבחין בין הצבעים של קוים עבים -STR_CONFIG_SETTING_LAND_GENERATOR :יוצר אדמה: {STRING} +STR_CONFIG_SETTING_LAND_GENERATOR :מחולל פני שטח: {STRING} STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT :המחולל המקורי מבוסס על הגרפיקה הבסיסית, ויוצר פני שטח אחידים. בורא הקרקע מבוסס על אלגוריתם רעש פרלין עם אפשרויות עריכה עדינות STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL :מקורי STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :בורא הקרקע @@ -1290,7 +1290,7 @@ STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT :{STRING} :עו STR_CONFIG_SETTING_EDGES_NOT_EMPTY :{WHITE}לפחות משבצת אחת בקצה הצפוני אינה ריקה STR_CONFIG_SETTING_EDGES_NOT_WATER :{WHITE}לפחות משבצת אחת באחד הקצוות אינה מכוסה מים -STR_CONFIG_SETTING_STATION_SPREAD :התפרסות תחנה מירבית: {STRING} +STR_CONFIG_SETTING_STATION_SPREAD :פריסה מירבית לתחנה: {STRING} STR_CONFIG_SETTING_STATION_SPREAD_HELPTEXT :שטח מירבי עליו יכולים להתפרס חלקיה השונים של תחנה בודדת. יש לשים לב כי ערכים גבוהים יאטו את המשחק STR_CONFIG_SETTING_SERVICEATHELIPAD :{STRING}טיפול אוטומטי במסוקים במנחת STR_CONFIG_SETTING_SERVICEATHELIPAD_HELPTEXT :תחזק מסוקים אחרי כל נחיתה, אפילו אם אין מוסך בנמל התעופה @@ -1307,7 +1307,7 @@ STR_CONFIG_SETTING_SMOOTH_SCROLLING :{STRING} :גל STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :שלוט כיצד התצוגה הראשית נגללת למיקום מסוים כאשר מקליקים על המפה הקטנה אן כאשר נותנים הוראה לגלול לעצם מסוים על גבי המפה. אם מאופשר, חלון התצוגה נגלל באופן חלק, אם מבוטל הוא מוקפץ ישירות אל נקודת המטרה STR_CONFIG_SETTING_MEASURE_TOOLTIP :{STRING} :'הצג מידות בעת בניית כבישים/מסילות וכיוב STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT :הצג מרחק במשבצות והבדלי גבהים בעת גרירה תוך כדי פעולות בנייה -STR_CONFIG_SETTING_LIVERIES :{STRING} :הצג את צבעי החברה +STR_CONFIG_SETTING_LIVERIES :הצג צבעים מיוחדים לכלי רכב: {STRING} STR_CONFIG_SETTING_LIVERIES_HELPTEXT :שלוט בשימוש בצבעים ייחודיים לסוגי כלי רכב (בניגוד לצבעים ייחודיים לחברה) STR_CONFIG_SETTING_LIVERIES_NONE :לא STR_CONFIG_SETTING_LIVERIES_OWN :החברה שלי @@ -1354,7 +1354,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :שום פעול STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :כל הפעולות שאינן פעולות בנייה STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING :כל הפעולות שאינן משנות את פני השטח STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS :כל הפעולות -STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :השתמש ברשימת כלי הרכב המתקדמת: {STRING} +STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :השתמש בקבוצות ברשימת כלי הרכב: {STRING} STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT :אפשר שימוש ברשימות כלי הרכב המתקדמות לצורך חלוקת כלי רכב לקבוצות STR_CONFIG_SETTING_LOADING_INDICATORS :{STRING} :הצג מצביעי הטענה STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT :בחר האם מדדי טעינה יוצגו מעל רכבים בעת טעינתם או פריקתם @@ -1369,7 +1369,7 @@ STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT :סוג מסיל STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST :הראשון הזמין STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST :האחרון הזמין STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED :הנפוץ ביותר -STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION :{STRING} :הדגש מסלולים שבשימוש +STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION :הדגש מסלולים שבשימוש: {STRING} STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION_HELPTEXT :תן צבע שונה למסילות שמורות כדי לסייע בבעיות עם רכבות המסרבות להיכנס לגושים מבוססי מסלול STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :{STRING}: שמור על כלי הבנייה פעילים לאחר השימוש STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :השאר את כלי הבנייה עבור גשרים, מנהרות וכו' פתוחים אחרי השימוש @@ -1395,13 +1395,13 @@ STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT :השמע קול STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :מנע בניית תשתיות כאשר אין כלי רכב מתאימים זמינים: {STRING} STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :כאשר מאופשר, תשתיות זמינות רק כאשר ישנם גם כלי רכב זמינים, דבר המונע בזבוז זמן וכסף על תשתיות בלתי שמישות -STR_CONFIG_SETTING_MAX_TRAINS :{STRING} :מספר רכבות מירבי לשחקן +STR_CONFIG_SETTING_MAX_TRAINS :מספר רכבות מירבי לשחקן: {STRING} STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :מספר מירבי של רכבות בהן חברה יכולה להחזיק -STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :{STRING} :מספר משאיות/אוטובוסים מירבי לשחקן +STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :מספר משאיות/אוטובוסים מירבי לשחקן: {STRING} STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :מספר מירבי של רכבי כביש בהם חברה יכולה להחזיק -STR_CONFIG_SETTING_MAX_AIRCRAFT :{STRING} :מספר כלי טייס מירבי לשחקן +STR_CONFIG_SETTING_MAX_AIRCRAFT :מספר כלי טייס מירבי לשחקן: {STRING} STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :מספר מירבי של מטוסים בהם חברה יכולה להחזיק -STR_CONFIG_SETTING_MAX_SHIPS :{STRING} :מספר כלי שייט מירבי לשחקן +STR_CONFIG_SETTING_MAX_SHIPS :מספר כלי שייט מירבי לשחקן: {STRING} STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :מספר מירבי של אוניות בהן חברה יכולה להחזיק STR_CONFIG_SETTING_AI_BUILDS_TRAINS :מנע הפעלת רכבות ע”י שחקני המחשב: {STRING} @@ -1901,13 +1901,13 @@ STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}קבע STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}הגן על המשחק שלך עם סיסמה אם אתה לא רוצה שהוא יהיה זמין לכולם STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} לקוח{P "" "ות"} -STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}מקסימום לקוחות: +STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}מספר מקסימלי של לקוחות: STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK} :מספר משתתפים מירבי STR_NETWORK_START_SERVER_COMPANIES_SELECT :{BLACK}{NUM} חבר{P "ה" "ות"} -STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES :{BLACK}מקסימום חברות: +STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES :{BLACK}מספר מקסימלי של חברות: STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP :{BLACK}הגבל את השרת למספר מסויים של חברות STR_NETWORK_START_SERVER_SPECTATORS_SELECT :{BLACK}{NUM} צופ{P "ה" "ים"} -STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS :{BLACK} :מספר צופים מירבי +STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS :{BLACK}מספר צופים מירבי: STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP :{BLACK}הגבלת השרת למספר צופים מסויים STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN :{BLACK}שפת דיבור: STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP :{BLACK}שחקנים אחרים ידעו איו שפה מדוברת בשרת @@ -2650,7 +2650,7 @@ STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK} :מספ STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}גובה קו השלג STR_MAPGEN_SNOW_LINE_UP :{BLACK}הגבה את קו השלג STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}הנמך את קו השלג -STR_MAPGEN_LAND_GENERATOR :{BLACK} :יצירת קרקע +STR_MAPGEN_LAND_GENERATOR :{BLACK} :מחולל פני שטח STR_MAPGEN_TREE_PLACER :{BLACK}אלגוריתם העצים: STR_MAPGEN_TERRAIN_TYPE :{BLACK} :סוג הקרקע STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK} :כמות ימים/אגמים @@ -3251,7 +3251,7 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES :רכבים לא STR_GROUP_DEFAULT_SHIPS :כלי שייט לא משוייכים STR_GROUP_DEFAULT_AIRCRAFTS :כלי טייס לא משוייכים -STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}קבוצות כלים – לחץ על קבוצה לצפייה בכל הכלים השייכים אליה +STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}קבוצות – לחץ על קבוצה לצפייה בכל הכלים השייכים אליה. גרור כדי לסדר הירארכיה. STR_GROUP_CREATE_TOOLTIP :{BLACK}לחץ ליצירת קבוצה חדשה STR_GROUP_DELETE_TOOLTIP :{BLACK}מחק את הקבוצה שנבחרה STR_GROUP_RENAME_TOOLTIP :{BLACK}שנה את שם הקבוצה @@ -3642,8 +3642,8 @@ STR_ORDER_TOOLTIP_UNLOAD :{BLACK}שנה STR_ORDER_REFIT :{BLACK}התאם מחדש STR_ORDER_REFIT_TOOLTIP :{BLACK}בחר את סוג המיטען אליו יותאם הכלי ביעד זה -STR_ORDER_REFIT_AUTO :{BLACK}אבזור מחדש אוטומטי -STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}בחרלאיזה סוג מטען לאבזר מחדש בפקודה זו. הקלק בשילוב לחיצה על מקש Ctrl כדי להסיר את הוראת האבזור מחדש. אבזור מחדש יתרחש רק אם כלי הרכב מאפשר זאת +STR_ORDER_REFIT_AUTO :{BLACK}אבזור מחדש בתחנה +STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}בחרלאיזה סוג מטען לאבזר מחדש בפקודה זו. Ctrl+לחיצה כדי להסיר את הוראת האבזור מחדש. אבזור מחדש יתרחש רק אם כלי הרכב מאפשר זאת STR_ORDER_DROP_REFIT_AUTO :מטען קבוע STR_ORDER_DROP_REFIT_AUTO_ANY :מטען זמין @@ -3741,8 +3741,8 @@ STR_ORDER_UNLOAD_REFIT :(פרוק וק STR_ORDER_UNLOAD_FULL_LOAD_REFIT :(פרוק והמתן למטען מלא עם אבזור מחדש אוטומטי ל-{STRING}) STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT :(פרוק והמתן למטען מלא כלשהו עם אבזור מחדש אוטומטי ל-{STRING}) STR_ORDER_TRANSFER_REFIT :(העבר וקח מטען עם אבזור מחדש אוטומטי ל-{STRING}) -STR_ORDER_TRANSFER_FULL_LOAD_REFIT :(העבר ומתן למטען מלא עם אבזור מחדש אוטומטי ל-{STRING}) -STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT :(העבר ומתן למטען מלא כלשהו עם אבזור מחדש אוטומטי ל-{STRING}) +STR_ORDER_TRANSFER_FULL_LOAD_REFIT :(העבר והמתן למטען מלא עם אבזור מחדש אוטומטי ל-{STRING}) +STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT :(העבר והמתן למטען מלא כלשהו עם אבזור מחדש אוטומטי ל-{STRING}) STR_ORDER_NO_UNLOAD_REFIT :(ללא פריקה וקח מטען עם אבזור מחדש אוטומטי ל-{STRING}) STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT :(ללא פריקה והמתן למטען מלא עם אבזור מחדש אוטומטי ל-{STRING}) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT :(ללא פריקה והמתן למטען מלא כלשהו עם אבזור מחדש אוטומטי ל-{STRING}) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 49ccef2a2e..fc277d4f46 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -971,6 +971,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Selezion STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} file corrott{P o i} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Informazioni aggiuntive sul pacchetto musicale di base +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Errore nel recupero della lista delle risoluzioni supportate STR_ERROR_FULLSCREEN_FAILED :{WHITE}Attivazione modalità schermo intero non riuscita # Custom currency window diff --git a/src/lang/russian.txt b/src/lang/russian.txt index f6211e339e..230251b295 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1115,6 +1115,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Выбе STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} повреждённы{P й х х} файл{P 0 "" а ов} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Дополнительная информация о наборе базовой музыки +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Не удалось получить список поддерживаемых разрешений экрана STR_ERROR_FULLSCREEN_FAILED :{WHITE}Сбой полноэкранного режима # Custom currency window From f9dd8b57a41eb264c8a3223024978426d8c62ccf Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 7 Jun 2014 10:42:17 +0000 Subject: [PATCH 04/20] (svn r26632) -Fix [FS#6037]: Incorrect usage of string commands in the order GUI. --- src/lang/english.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 7787d0842a..bbb6a5b6dc 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3771,7 +3771,7 @@ STR_ORDER_REFIT_ORDER :(Refit to {STRI STR_ORDER_REFIT_STOP_ORDER :(Refit to {STRING} and stop) STR_ORDER_STOP_ORDER :(Stop) -STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} +STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING1} STR_ORDER_IMPLICIT :(Implicit) From 941c57cb07891ee0aed03d9921db14b91dcc97e1 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 7 Jun 2014 17:45:14 +0000 Subject: [PATCH 05/20] (svn r26633) -Update from WebTranslator v3.0: french - 1 changes by glx korean - 1 changes by telk5093 --- src/lang/french.txt | 1 + src/lang/korean.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lang/french.txt b/src/lang/french.txt index f9e7cb388b..9260673044 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -970,6 +970,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Sélecti STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} fichier{P "" s} corrompu{P "" s} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Informations additionnelles sur la musique de base +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Échec de la récupération de la liste des résolutions prises en charge STR_ERROR_FULLSCREEN_FAILED :{WHITE}Échec du mode plein écran # Custom currency window diff --git a/src/lang/korean.txt b/src/lang/korean.txt index d6809bb759..3a1b2d26bb 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -970,6 +970,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}사용 STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM}개의 파일이 손상되었습니다. STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}기본 배경 음악 세트에 대한 추가 정보를 봅니다. +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}지원되는 해상도 목록을 불러오는데 실패하였습니다. STR_ERROR_FULLSCREEN_FAILED :{WHITE}풀스크린 모드 실패 # Custom currency window From 9649cd8bea571a32315edca17fc1ed64f9fcdfaa Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 8 Jun 2014 15:49:54 +0000 Subject: [PATCH 06/20] (svn r26634) -Fix: 'Load' button was not properly enabled/disabled for old savegames without NewGRF information. --- src/fios_gui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index 5c91ec77d7..14c335e946 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -535,7 +535,7 @@ public: if (_saveload_mode == SLD_LOAD_HEIGHTMAP) { delete this; ShowHeightmapLoad(); - } else if (_load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()) { + } else if (!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()) { _switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD_GAME; ClearErrorMessages(); delete this; @@ -552,7 +552,7 @@ public: case WID_SL_MISSING_NEWGRFS: if (!_network_available) { ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR); - } else { + } else if (_load_check_data.HasNewGrfs()) { #if defined(ENABLE_NETWORK) ShowMissingContentWindow(_load_check_data.grfconfig); #endif @@ -693,7 +693,7 @@ public: } if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) { this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON, - this->selected == NULL || _load_check_data.HasErrors() || !(_load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs())); + this->selected == NULL || _load_check_data.HasErrors() || !(!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs())); this->SetWidgetDisabledState(WID_SL_NEWGRF_INFO, !_load_check_data.HasNewGrfs()); this->SetWidgetDisabledState(WID_SL_MISSING_NEWGRFS, From 608a8ce8a1acf80b922f53502c179bc45b8bbf9a Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 8 Jun 2014 17:45:10 +0000 Subject: [PATCH 07/20] (svn r26635) -Update from WebTranslator v3.0: finnish - 2 changes by jpx_ --- src/lang/finnish.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 0f6b7b9924..12a688305a 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -969,6 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Valitse STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} korruptoitun{P ut utta} tiedosto{P "" a} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Lisätietoja musiikkipaketista +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Tuettujen näyttötarkkuuksien hakeminen epäonnistui STR_ERROR_FULLSCREEN_FAILED :{WHITE}Täyskuvatila ei toimi # Custom currency window @@ -4032,7 +4033,7 @@ STR_WARNING_FALLBACK_SOUNDSET :{WHITE}Vain til # Screenshot related messages STR_WARNING_SCREENSHOT_SIZE_CAPTION :{WHITE}Suuri kuvankaappaus -STR_WARNING_SCREENSHOT_SIZE_MESSAGE :{YELLOW}Kuvankaappauksen resoluutio tulee olemaan {COMMA} x {COMMA} pikseliä. Kuvankaappauksen ottaminen voi kestää jonkin aikaa. Haluatko jatkaa? +STR_WARNING_SCREENSHOT_SIZE_MESSAGE :{YELLOW}Kuvankaappauksen tarkkuus tulee olemaan {COMMA} x {COMMA} pikseliä. Kuvankaappauksen ottaminen voi kestää jonkin aikaa. Haluatko jatkaa? STR_MESSAGE_SCREENSHOT_SUCCESSFULLY :{WHITE}Kuvakaappaus tallennettu nimellä '{STRING}'. STR_ERROR_SCREENSHOT_FAILED :{WHITE}Kuvakaappaus epäonnistui! From 489f88fa02c4d6d3be5c52c1d160fef471ae04e7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 9 Jun 2014 17:42:48 +0000 Subject: [PATCH 08/20] (svn r26636) -Fix [FS#6026-ish]: (memory) size of variables saved for disaster vehicles was not correct in saveload description --- src/saveload/vehicle_sl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 059015be29..453210baaa 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -839,8 +839,10 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_CONDVAR(Vehicle, age, SLE_INT32, 31, SL_MAX_VERSION), SLE_VAR(Vehicle, tick_counter, SLE_UINT8), - SLE_VAR(DisasterVehicle, image_override, SLE_UINT16), - SLE_VAR(DisasterVehicle, big_ufo_destroyer_target, SLE_UINT16), + SLE_CONDVAR(DisasterVehicle, image_override, SLE_FILE_U16 | SLE_VAR_U32, 0, 190), + SLE_CONDVAR(DisasterVehicle, image_override, SLE_UINT32, 191, SL_MAX_VERSION), + SLE_CONDVAR(DisasterVehicle, big_ufo_destroyer_target, SLE_FILE_U16 | SLE_VAR_U32, 0, 190), + SLE_CONDVAR(DisasterVehicle, big_ufo_destroyer_target, SLE_UINT32, 191, SL_MAX_VERSION), SLE_CONDNULL(16, 2, 143), // old reserved space From 5cfa181420954233966acd34a29ce17319302786 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 9 Jun 2014 17:43:59 +0000 Subject: [PATCH 09/20] (svn r26637) -Fix [FS#6038]: segmentation fault when encountering a .obg/.obs/.obm with empty string/zero length/ MD5 checksums --- src/base_media_func.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base_media_func.h b/src/base_media_func.h index 650506f903..e3678d5a15 100644 --- a/src/base_media_func.h +++ b/src/base_media_func.h @@ -100,7 +100,7 @@ bool BaseSet::FillSetDetails(IniFile *ini, const /* Then find the MD5 checksum */ item = md5s->GetItem(filename, false); - if (item == NULL) { + if (item == NULL || item->value == NULL) { DEBUG(grf, 0, "No MD5 checksum specified for: %s (in %s)", filename, full_filename); return false; } From 6cdd172027f788fc440d507a3b5f6d89f61ff3b8 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 9 Jun 2014 17:45:16 +0000 Subject: [PATCH 10/20] (svn r26638) -Update from WebTranslator v3.0: english_US - 1 changes by Supercheese --- src/lang/english_US.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 83735ccf67..796c564e74 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -969,6 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Select t STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} corrupted file{P "" s} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Additional information about the base music set +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Failed to retrieve a list of supported resolutions STR_ERROR_FULLSCREEN_FAILED :{WHITE}Fullscreen mode failed # Custom currency window From ef0bff5ac3e9d00026f7032a609afe389c5e9a18 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 10 Jun 2014 16:29:03 +0000 Subject: [PATCH 11/20] (svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI. --- src/timetable_gui.cpp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 2c6a22c5d4..ffea9a8642 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -55,18 +55,6 @@ void SetTimetableParams(int param1, int param2, Ticks ticks) } } -/** - * Sets the arrival or departure string and parameters. - * @param param1 the first DParam to fill - * @param param2 the second DParam to fill - * @param ticks the number of ticks to 'draw' - */ -static void SetArrivalDepartParams(int param1, int param2, Ticks ticks) -{ - SetDParam(param1, STR_JUST_DATE_TINY); - SetDParam(param2, _date + (ticks / DAY_TICKS)); -} - /** * Check whether it is possible to determine how long the order takes. * @param order the order to check. @@ -462,18 +450,20 @@ struct TimetableWindow : Window { if (arr_dep[i / 2].arrival != INVALID_TICKS) { DrawString(abbr_left, abbr_right, y, STR_TIMETABLE_ARRIVAL_ABBREVIATION, i == selected ? TC_WHITE : TC_BLACK); if (this->show_expected && i / 2 == earlyID) { - SetArrivalDepartParams(0, 1, arr_dep[i / 2].arrival); - DrawString(time_left, time_right, y, STR_GREEN_STRING, i == selected ? TC_WHITE : TC_BLACK); + SetDParam(0, _date + arr_dep[i / 2].arrival / DAY_TICKS); + DrawString(time_left, time_right, y, STR_JUST_DATE_TINY, TC_GREEN); } else { - SetArrivalDepartParams(0, 1, arr_dep[i / 2].arrival + offset); - DrawString(time_left, time_right, y, show_late ? STR_RED_STRING : STR_JUST_STRING, i == selected ? TC_WHITE : TC_BLACK); + SetDParam(0, _date + (arr_dep[i / 2].arrival + offset) / DAY_TICKS); + DrawString(time_left, time_right, y, STR_JUST_DATE_TINY, + show_late ? TC_RED : i == selected ? TC_WHITE : TC_BLACK); } } } else { if (arr_dep[i / 2].departure != INVALID_TICKS) { DrawString(abbr_left, abbr_right, y, STR_TIMETABLE_DEPARTURE_ABBREVIATION, i == selected ? TC_WHITE : TC_BLACK); - SetArrivalDepartParams(0, 1, arr_dep[i/2].departure + offset); - DrawString(time_left, time_right, y, show_late ? STR_RED_STRING : STR_JUST_STRING, i == selected ? TC_WHITE : TC_BLACK); + SetDParam(0, _date + (arr_dep[i/2].departure + offset) / DAY_TICKS); + DrawString(time_left, time_right, y, STR_JUST_DATE_TINY, + show_late ? TC_RED : i == selected ? TC_WHITE : TC_BLACK); } } y += FONT_HEIGHT_NORMAL; From 7b3ead329b057991092bc6a4f0464f05b2127d93 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 10 Jun 2014 16:37:25 +0000 Subject: [PATCH 12/20] (svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours. --- src/autoreplace_gui.cpp | 17 ++++++++--------- src/industry_gui.cpp | 9 +++------ src/newgrf_gui.cpp | 5 ++--- src/object_gui.cpp | 3 +-- src/rail_gui.cpp | 7 +++---- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index c53df993f3..e6ce64cfa7 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -278,10 +278,8 @@ public: } case WID_RV_INFO_TAB: { - SetDParam(0, STR_REPLACE_NOT_REPLACING); - Dimension d = GetStringBoundingBox(STR_BLACK_STRING); - SetDParam(0, STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED); - d = maxdim(d, GetStringBoundingBox(STR_BLACK_STRING)); + Dimension d = GetStringBoundingBox(STR_REPLACE_NOT_REPLACING); + d = maxdim(d, GetStringBoundingBox(STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED)); d.width += WD_FRAMETEXT_LEFT + WD_FRAMETEXT_RIGHT; d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; *size = maxdim(*size, d); @@ -353,20 +351,21 @@ public: switch (widget) { case WID_RV_INFO_TAB: { const Company *c = Company::Get(_local_company); + StringID str; if (this->sel_engine[0] != INVALID_ENGINE) { if (!EngineHasReplacementForCompany(c, this->sel_engine[0], this->sel_group)) { - SetDParam(0, STR_REPLACE_NOT_REPLACING); + str = STR_REPLACE_NOT_REPLACING; } else { bool when_old = false; EngineID e = EngineReplacementForCompany(c, this->sel_engine[0], this->sel_group, &when_old); - SetDParam(0, when_old ? STR_REPLACE_REPLACING_WHEN_OLD : STR_ENGINE_NAME); - SetDParam(1, e); + str = when_old ? STR_REPLACE_REPLACING_WHEN_OLD : STR_ENGINE_NAME; + SetDParam(0, e); } } else { - SetDParam(0, STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED); + str = STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED; } - DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, r.top + WD_FRAMERECT_TOP, STR_BLACK_STRING, TC_FROMSTRING, SA_HOR_CENTER); + DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, r.top + WD_FRAMERECT_TOP, str, TC_BLACK, SA_HOR_CENTER); break; } diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index bcda8bd5c9..88cb29c745 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -119,12 +119,10 @@ static int CDECL IndustryTypeNameSorter(const IndustryType *a, const IndustryTyp static char industry_name[2][64]; const IndustrySpec *indsp1 = GetIndustrySpec(*a); - SetDParam(0, indsp1->name); - GetString(industry_name[0], STR_JUST_STRING, lastof(industry_name[0])); + GetString(industry_name[0], indsp1->name, lastof(industry_name[0])); const IndustrySpec *indsp2 = GetIndustrySpec(*b); - SetDParam(0, indsp2->name); - GetString(industry_name[1], STR_JUST_STRING, lastof(industry_name[1])); + GetString(industry_name[1], indsp2->name, lastof(industry_name[1])); int r = strnatcmp(industry_name[0], industry_name[1]); // Sort by name (natural sorting). @@ -1671,8 +1669,7 @@ struct CargoesField { ypos += (normal_height - FONT_HEIGHT_NORMAL) / 2; if (this->u.industry.ind_type < NUM_INDUSTRYTYPES) { const IndustrySpec *indsp = GetIndustrySpec(this->u.industry.ind_type); - SetDParam(0, indsp->name); - DrawString(xpos, xpos2, ypos, STR_JUST_STRING, TC_WHITE, SA_HOR_CENTER); + DrawString(xpos, xpos2, ypos, indsp->name, TC_WHITE, SA_HOR_CENTER); /* Draw the industry legend. */ int blob_left, blob_right; diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index 7c6d6ab9e3..b211c1cb45 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -137,9 +137,8 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint right, uint /* Draw GRF info if it exists */ if (!StrEmpty(c->GetDescription())) { - SetDParam(0, STR_JUST_RAW_STRING); - SetDParamStr(1, c->GetDescription()); - y = DrawStringMultiLine(x, right, y, bottom, STR_BLACK_STRING); + SetDParamStr(0, c->GetDescription()); + y = DrawStringMultiLine(x, right, y, bottom, STR_BLACK_RAW_STRING); } else { y = DrawStringMultiLine(x, right, y, bottom, STR_NEWGRF_SETTINGS_NO_INFO); } diff --git a/src/object_gui.cpp b/src/object_gui.cpp index f0dbd0dc25..c550418869 100644 --- a/src/object_gui.cpp +++ b/src/object_gui.cpp @@ -211,8 +211,7 @@ public: ObjectClass *objclass = ObjectClass::Get((ObjectClassID)i); if (objclass->GetUISpecCount() == 0) continue; if (!this->vscroll->IsVisible(pos++)) continue; - SetDParam(0, objclass->name); - DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, STR_JUST_STRING, + DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, objclass->name, ((int)i == _selected_object_class) ? TC_WHITE : TC_BLACK); y += this->line_height; } diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index d07bb5520c..1907c66174 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1040,8 +1040,7 @@ public: Dimension d = {0, 0}; for (uint i = 0; i < StationClass::GetClassCount(); i++) { if (i == STAT_CLASS_WAYP) continue; - SetDParam(0, StationClass::Get((StationClassID)i)->name); - d = maxdim(d, GetStringBoundingBox(STR_BLACK_STRING)); + d = maxdim(d, GetStringBoundingBox(StationClass::Get((StationClassID)i)->name)); } size->width = max(size->width, d.width + padding.width); this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM; @@ -1119,8 +1118,8 @@ public: for (uint i = 0; i < StationClass::GetClassCount(); i++) { if (i == STAT_CLASS_WAYP) continue; if (this->vscroll->IsVisible(statclass)) { - SetDParam(0, StationClass::Get((StationClassID)i)->name); - DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, row * this->line_height + r.top + WD_MATRIX_TOP, STR_JUST_STRING, + DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, row * this->line_height + r.top + WD_MATRIX_TOP, + StationClass::Get((StationClassID)i)->name, (StationClassID)i == _railstation.station_class ? TC_WHITE : TC_BLACK); row++; } From 9d996d2c094354ddbdbb93cb6c089e2fee68bf30 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 10 Jun 2014 16:39:20 +0000 Subject: [PATCH 13/20] (svn r26641) -Cleanup: Remove some unused strings. --- src/lang/afrikaans.txt | 3 --- src/lang/arabic_egypt.txt | 3 --- src/lang/basque.txt | 3 --- src/lang/belarusian.txt | 3 --- src/lang/brazilian_portuguese.txt | 3 --- src/lang/bulgarian.txt | 3 --- src/lang/catalan.txt | 3 --- src/lang/croatian.txt | 3 --- src/lang/czech.txt | 3 --- src/lang/danish.txt | 3 --- src/lang/dutch.txt | 3 --- src/lang/english.txt | 3 --- src/lang/english_AU.txt | 3 --- src/lang/english_US.txt | 3 --- src/lang/esperanto.txt | 3 --- src/lang/estonian.txt | 3 --- src/lang/faroese.txt | 3 --- src/lang/finnish.txt | 3 --- src/lang/french.txt | 3 --- src/lang/gaelic.txt | 3 --- src/lang/galician.txt | 3 --- src/lang/german.txt | 3 --- src/lang/greek.txt | 3 --- src/lang/hebrew.txt | 3 --- src/lang/hungarian.txt | 3 --- src/lang/icelandic.txt | 3 --- src/lang/indonesian.txt | 3 --- src/lang/irish.txt | 3 --- src/lang/italian.txt | 3 --- src/lang/japanese.txt | 3 --- src/lang/korean.txt | 3 --- src/lang/latvian.txt | 3 --- src/lang/lithuanian.txt | 3 --- src/lang/luxembourgish.txt | 3 --- src/lang/malay.txt | 3 --- src/lang/norwegian_bokmal.txt | 3 --- src/lang/norwegian_nynorsk.txt | 3 --- src/lang/polish.txt | 3 --- src/lang/portuguese.txt | 3 --- src/lang/romanian.txt | 3 --- src/lang/russian.txt | 3 --- src/lang/serbian.txt | 3 --- src/lang/simplified_chinese.txt | 3 --- src/lang/slovak.txt | 3 --- src/lang/slovenian.txt | 3 --- src/lang/spanish.txt | 3 --- src/lang/swedish.txt | 3 --- src/lang/tamil.txt | 3 --- src/lang/thai.txt | 3 --- src/lang/traditional_chinese.txt | 3 --- src/lang/turkish.txt | 3 --- src/lang/ukrainian.txt | 3 --- src/lang/unfinished/chuvash.txt | 2 -- src/lang/unfinished/frisian.txt | 3 --- src/lang/unfinished/ido.txt | 3 --- src/lang/unfinished/macedonian.txt | 3 --- src/lang/unfinished/maltese.txt | 2 -- src/lang/unfinished/marathi.txt | 2 -- src/lang/unfinished/persian.txt | 3 --- src/lang/unfinished/urdu.txt | 3 --- src/lang/vietnamese.txt | 3 --- src/lang/welsh.txt | 3 --- 62 files changed, 183 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index af767fa7eb..f7675cbcc5 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3011,7 +3011,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Geen vra # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Wagtend: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} vanaf {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} gereserveer vir oplaai) @@ -4819,9 +4818,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index ddb0188dff..8e7ded6d29 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2600,7 +2600,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}لا ي # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}انتظار: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} نهاية الطريق في {STATION}) @@ -4308,9 +4307,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 3790452246..ed6042f59a 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -2921,7 +2921,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Ez dago # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Itxaroten: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} {STATION}tik garraiatua) @@ -4713,9 +4712,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 1a413fe814..aa050de82f 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -3344,7 +3344,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}На с # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Чакае: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} транзітам з {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} зарэзэрвавана для грузу) @@ -5295,9 +5294,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 4ab3b06582..8442467199 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3024,7 +3024,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Não há # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Aguardando: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} vindo de {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservado para carregamento) @@ -4835,9 +4834,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index bd190c0302..0564f72f01 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2957,7 +2957,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Няма # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Чакат: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} на път от {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} запазени за товарене) @@ -4742,9 +4741,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index f12d2b61e8..aaae9de856 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3059,7 +3059,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}No hi ha # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Esperant: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} des de {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservat per carregar) @@ -4874,9 +4873,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index ba78f3a221..1804665284 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3153,7 +3153,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nijedna # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Čekanje: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} iz {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervirano za ukrcaj) @@ -5005,9 +5004,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 71cf60849f..ca1ab8ba4f 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3150,7 +3150,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nečeká # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Čeká tu: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} z {NBSP}{STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervováno pro naložení) @@ -5095,9 +5094,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index ee751e5435..07c012acfa 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3006,7 +3006,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Der vent # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Venter: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} undervejs fra {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} forbeholdt lastning) @@ -4814,9 +4813,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 33eeff4bbf..5eb7702960 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3040,7 +3040,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Er wacht # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Wachtend: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} van {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} gereserveerd voor laden) @@ -4855,9 +4854,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/english.txt b/src/lang/english.txt index bbb6a5b6dc..1faa6697c2 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3058,7 +3058,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}No cargo # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Waiting: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} from {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reserved for loading) @@ -4873,9 +4872,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{RAW_STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING1}{WHITE} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index a01829c1df..bb36b671a8 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -3058,7 +3058,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}No cargo # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Waiting: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} from {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reserved for loading) @@ -4873,9 +4872,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 796c564e74..5a224e9f2e 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3058,7 +3058,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}No cargo # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Waiting: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} from {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reserved for loading) @@ -4873,9 +4872,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index e433c680f0..c9deb8055a 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2525,7 +2525,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nenia ŝ # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Atendas: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} survoje de {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervita por ŝarĝu) @@ -4218,9 +4217,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 5f3c9965a2..c98d75adee 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3067,7 +3067,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Veoseid # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Ootel: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} jaamast «{STATION}») STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} kinni laadimiseks) @@ -4875,9 +4874,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 5bd1b5424e..74aaf47f7e 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -2738,7 +2738,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Eingin f # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Bíðar: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} frá {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} umbiði til lessing) @@ -4423,9 +4422,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 12a688305a..c4f7f23b4d 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3058,7 +3058,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Minkää # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Lähdössä: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} asemalta {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} varattu ladattavaksi) @@ -4873,9 +4872,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/french.txt b/src/lang/french.txt index 9260673044..4c4fc713bc 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3059,7 +3059,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Pas de m # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}En attente{NBSP}: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} venant de {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} réservé au chargement) @@ -4874,9 +4873,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 6116e5ff5d..41768c6dcc 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -3245,7 +3245,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Chan eil # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}A' feitheamh: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} bho {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} glèidhte airson luchdadh) @@ -5213,9 +5212,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index ed103e9fca..8efd7b9c1e 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2986,7 +2986,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Non qued # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Agardando: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} en ruta dende {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservado para cargar) @@ -4790,9 +4789,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/german.txt b/src/lang/german.txt index e0a93a63da..723e660f91 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3059,7 +3059,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Keine Fr # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Es warten: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} von {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reserviert zum Beladen) @@ -4874,9 +4873,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/greek.txt b/src/lang/greek.txt index ca2916cf8f..8d322688f6 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3028,7 +3028,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Κανέ # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Αναμονή: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} από μεταφορά από τον σταθμό {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} {P προορίζεται προορίζωνται} για φόρτωση @@ -4820,9 +4819,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index c8b1604c09..882f076066 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3011,7 +3011,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}שום # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}ממתינים: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} בדרך מ{STATION}) @@ -4801,9 +4800,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 0ccfa2a12e..41cb06431d 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3088,7 +3088,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Semmilye # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Várakozik: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} ideszállítva {STATION} állomásról) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} lefoglalva berakodáshoz) @@ -4944,9 +4943,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 10c0684650..d1e864865d 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2899,7 +2899,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Enginn f # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Bíður: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} frá {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} frátekin fyrir hleðslu) @@ -4679,9 +4678,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 35e25e5f91..593060919d 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3011,7 +3011,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Tidak ad # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Menunggu: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} dari {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} direservasi untuk memuat) @@ -4822,9 +4821,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/irish.txt b/src/lang/irish.txt index b92a9393be..a112821900 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -2533,7 +2533,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Níl las # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Ag fanacht: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} ar an mbealach ó {STATION}) @@ -4218,9 +4217,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index fc277d4f46..06f470805b 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3088,7 +3088,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Non c'è # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}In attesa: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} {G "da " dall' "dalla "}{STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} riservati per il caricamento) @@ -4903,9 +4902,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 2788ca97af..3f951d2633 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3024,7 +3024,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}積込 # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}積込待ち: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}(うち、{1:STATION}からの転送{0:CARGO_SHORT}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT}が積込予約済み) @@ -4839,9 +4838,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 3a1b2d26bb..4eae8f9e0b 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3059,7 +3059,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}화물 # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}대기: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({1:STATION}에서 온 {0:CARGO_SHORT}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} 적재 예정) @@ -4874,9 +4873,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index f978cecc25..f9689170b1 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -2954,7 +2954,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Neviena # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Gaida: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} no {STATION}) @@ -4750,9 +4749,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 42f7037a99..73c53c7e46 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3243,7 +3243,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Jokių k # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Laukia: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} pakeliui iš „{STATION}“) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervuota krovai) @@ -5379,9 +5378,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index b787ccffd8..d03b5f460d 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3024,7 +3024,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Kéng Lu # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Um waarden: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} ënnerwee vun {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservéiert fir gelueden ze ginn) @@ -4839,9 +4838,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 05fde86428..66505a3856 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -2727,7 +2727,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Tiada ka # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Menunggu: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} dalam perjalanan daripada {STATION}) @@ -4476,9 +4475,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 61e92241df..db8eaf96d2 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3026,7 +3026,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Ingen va # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Venter: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} på vei fra {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservert for lasting) @@ -4841,9 +4840,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 9a601f217c..a9b84eeaec 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2934,7 +2934,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Inga var # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Ventar: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} på veg frå {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservert for lasting) @@ -4742,9 +4741,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 3e654886c6..2b551b976c 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3404,7 +3404,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nie ma # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Czeka: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} z {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} zarezerwowane do załadunku) @@ -5262,9 +5261,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 47437999f0..f39cee01d1 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3011,7 +3011,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nenhuma # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Em espera: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} de {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservado para carregamento) @@ -4819,9 +4818,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index ca0c15464d..cc372e27bc 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2987,7 +2987,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nu este # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}În aşteptare: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} pe drum de la {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervat pentru încărcare) @@ -4791,9 +4790,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 230251b295..893416019c 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3238,7 +3238,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}На с # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Ожидает: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} транзитом из {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} зарезервировано для погрузки) @@ -5100,9 +5099,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 588dba5ca8..cd4f984704 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3105,7 +3105,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Ni jedna # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Čeka: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} na putu iz {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervisan za utovar) @@ -4927,9 +4926,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 98c4d5e19f..ceff70c472 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3053,7 +3053,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}选择 # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}等待：{WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} 转运自 {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} 等待装货) @@ -4867,9 +4866,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index efeb9bd02e..93f7a6e822 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3112,7 +3112,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nečaká # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Čaká: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} z {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervované pre nakladanie) @@ -4927,9 +4926,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 386c647c85..bfd69e87bb 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3156,7 +3156,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Noben to # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Čaka: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} na poti iz {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} rezervirano za nalaganje @@ -5009,9 +5008,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index c2b76035ac..bff3fd81fd 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3046,7 +3046,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Ningún # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Esperando: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} en ruta desde {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservado para cargar) @@ -4861,9 +4860,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 27bc518eb0..5cd18727a8 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3011,7 +3011,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Ingen so # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Väntar: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} från {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reserverat för lastning) @@ -4820,9 +4819,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 7a5bd8481b..ba3e508398 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -2683,7 +2683,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}எந # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}காத்திருக்கிறது: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} {STATION} இலிருந்து வந்துக்கொண்டிருக்கிறது) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} ஏற்றுவதற்காக ஒதுக்கப்பட்டுள்ளது) @@ -4432,9 +4431,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 5aaffb14b0..bde1d27835 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -3002,7 +3002,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}ไม # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}กำลังรอ: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} จาก {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} สำรองไว้สำหรับการขนถ่าย) @@ -4810,9 +4809,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index c6d46e817f..c208c03af0 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3012,7 +3012,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}無任 # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}等候：{WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} 來自 {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}(已預留裝載{CARGO_SHORT}) @@ -4820,9 +4819,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 9b39aa045c..31773b122b 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3012,7 +3012,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Hiç kar # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Bekleyen: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} {STATION}'dan) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} yükleme için rezerve edilmiş) @@ -4833,9 +4832,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 28e74dc4e1..a48df46401 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3123,7 +3123,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Звід # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Чекає: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} з {STATION}) @@ -4950,9 +4949,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index 9074acd6ef..015cedfae1 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -1474,9 +1474,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index f203b1f14e..6a8199e5f0 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -2548,7 +2548,6 @@ STR_STATION_LIST_NONE :{YELLOW}- Gjin # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Wachtsjend: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} ûnderweis fan {STATION} ôf) @@ -3775,9 +3774,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 46bdf0bb1a..c426a91bdd 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -868,7 +868,6 @@ STR_STATION_LIST_WAYPOINT :{YELLOW}{WAYPOI # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Vartabas: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Aceptas: {WHITE}{CARGO_LIST} @@ -1351,9 +1350,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 193f94a752..0ff28ac977 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -1323,7 +1323,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Не ч # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Чекање: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} пренасочено од {STATION}) @@ -1911,9 +1910,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index 76e46ac409..15efeed94c 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -1392,9 +1392,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 1a84043c54..7d711e77d6 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -1800,9 +1800,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 97677068d7..5a8c7d7b94 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -2737,7 +2737,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}هیچ # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}در انتظار: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} منشعب شده از {STATION}) @@ -4025,9 +4024,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 541171f97e..7f1c40a060 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -2219,7 +2219,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}کسی # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}منتظر: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} سے براستہ ہے {STATION}) @@ -2867,9 +2866,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 80f7202586..780cccfcaa 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3010,7 +3010,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Không c # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Đang chờ: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} trung chuyển từ {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} đã được trống để dỡ hàng) @@ -4818,9 +4817,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index fddadc8bcd..b450cb8401 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3024,7 +3024,6 @@ STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Nid oes # Station view window STR_STATION_VIEW_CAPTION :{WHITE}{STATION} {STATION_FEATURES} -STR_STATION_VIEW_WAITING_TITLE :{BLACK}Disgwyl: {WHITE}{STRING} STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_LONG} STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} o {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} wedi ei gadw ar gyfer llwytho) @@ -4839,9 +4838,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_GREEN_STRING :{GREEN}{STRING} STR_ORANGE_STRING :{ORANGE}{STRING} -STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} STR_ORANGE_STRING1_WHITE :{ORANGE}{STRING}{WHITE} From 64923692c654527a37811587db32e7c549b1f65b Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 10 Jun 2014 16:48:24 +0000 Subject: [PATCH 14/20] (svn r26642) -Fix [FS#6037-ish]: More strings with incorrect sub-string parameters. --- src/lang/english.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 1faa6697c2..1c07a86ff3 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1208,7 +1208,7 @@ STR_CONFIG_SETTING_PLANE_CRASHES_HELPTEXT :Set the chance STR_CONFIG_SETTING_PLANE_CRASHES_NONE :None STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED :Reduced STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL :Normal -STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :Allow drive-through road stops on town owned roads: {STRING} +STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :Allow drive-through road stops on town owned roads: {STRING2} STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT :Allow construction of drive-through road stops on town-owned roads STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :Allow drive-through road stops on roads owned by competitors: {STRING2} STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT :Allow construction of drive-through road stops on roads owned by other companies @@ -3998,9 +3998,9 @@ STR_MESSAGE_ESTIMATED_INCOME :{WHITE}Estimate STR_ERROR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished! STR_ERROR_AUTOSAVE_FAILED :{WHITE}Autosave failed STR_ERROR_UNABLE_TO_READ_DRIVE :{BLACK}Unable to read drive -STR_ERROR_GAME_SAVE_FAILED :{WHITE}Game Save Failed{}{STRING} +STR_ERROR_GAME_SAVE_FAILED :{WHITE}Game Save Failed{}{STRING1} STR_ERROR_UNABLE_TO_DELETE_FILE :{WHITE}Unable to delete file -STR_ERROR_GAME_LOAD_FAILED :{WHITE}Game Load Failed{}{STRING} +STR_ERROR_GAME_LOAD_FAILED :{WHITE}Game Load Failed{}{STRING1} STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Internal error: {RAW_STRING} STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME :Broken savegame - {RAW_STRING} STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Savegame is made with newer version From cf098ef1a0b78bd3ce7ed44aee18b23aa2285ec8 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 10 Jun 2014 17:45:30 +0000 Subject: [PATCH 15/20] (svn r26643) -Update from WebTranslator v3.0: croatian - 1 changes by VoyagerOne --- src/lang/croatian.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 1804665284..b61cb553f5 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1065,6 +1065,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Odaberi STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} neispravn{P a e ih} datotek{P a e a} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Dodatne informacije o setu osnovne glazbe +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Povlačenje liste podržanih rezolucija nije uspjelo STR_ERROR_FULLSCREEN_FAILED :{WHITE}Neuspješan prelazak na prikaz na cijelom ekranu # Custom currency window From 3c02d8ffac8b0c4119142afe48c946d78ddaff4b Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 11 Jun 2014 17:45:30 +0000 Subject: [PATCH 16/20] (svn r26644) -Update from WebTranslator v3.0: dutch - 14 changes by habell vietnamese - 16 changes by nglekhoi --- src/lang/dutch.txt | 20 +++++++++++++++++++- src/lang/vietnamese.txt | 32 +++++++++++++++++++++----------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 5eb7702960..faaefa086c 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -937,11 +937,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Catalaans STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatisch opslaan STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Kies interval tussen automatisch opgeslagen spellen +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Uit STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Iedere maand STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Iedere 3 maanden STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :Iedere 6 maanden STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :Iedere 12 maanden +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}Taal STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Selecteer de interfacetaal @@ -967,6 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Kies de STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} corrupt{P "" e} bestand{P "" en} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Aanvullende informatie over the basisset voor muziek +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Mislukt om een ​​lijst met ondersteunde resoluties op te halen STR_ERROR_FULLSCREEN_FAILED :{WHITE}Modus voor volledig scherm is mislukt # Custom currency window @@ -1261,7 +1264,7 @@ STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Maximum afstand STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Olieraffinaderijen worden alleen gebouwd nabij de kaart grens, dat is aan de kust van eiland kaarten STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Sneeuwhoogte: {STRING} STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT :Instellen op welke hoogte de sneeuw begint in sub-arctische landschap. Sneeuw heeft ook invloed op de industrie generatie en stadsgroei eisen -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Ruwheid van het terrein (alleen TerraGenesis) : {STRING} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Ruwheid van het terrein: {STRING} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT :(Alleen TerraGenesis) Kies de frequentie van de heuvels: Gladde landschappen hebben minder, meer wijdverspreide heuvels. Ruwe landschappen hebben veel heuvels, die repetitief kunnen lijken STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Erg glad STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Glad @@ -1332,6 +1335,9 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Uit STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Scrollen met linkermuisknop: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Schakel scrollen met de linkermuis knop in door te slepen. Dit is vooral handig bij het gebruik van een touch-screen voor scrollen +STR_CONFIG_SETTING_AUTOSAVE :Automatisch opslaan: {STRING} +STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Kies interval tussen automatische spelopslag + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Gebruik {STRING} datumformaat voor naamgeving van opgeslagen spellen STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Formaat van de datum in op te slaan spel bestandsnamen STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :lang (31e dec 2008) @@ -2759,6 +2765,8 @@ STR_NEWGRF_SETTINGS_MOVEUP :{BLACK}Naar bov STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar boven in de lijst STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Naar beneden STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar beneden in de lijst +STR_NEWGRF_SETTINGS_UPGRADE :{BLACK}Opwaarderen +STR_NEWGRF_SETTINGS_UPGRADE_TOOLTIP :{BLACK}Opwaarderen van NewGRF bestanden waar je een nieuwere versie van hebt geïnstalleerd STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Een lijst van de NewGRF-bestanden die zijn geïnstalleerd. STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Stel parameters in @@ -2783,6 +2791,16 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Bestand ni STR_NEWGRF_SETTINGS_DISABLED :{RED}Uitgeschakeld STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Niet compatibel met deze versie van OpenTTD +# NewGRF save preset window +STR_SAVE_PRESET_CAPTION :{WHITE}Preset opslaan +STR_SAVE_PRESET_LIST_TOOLTIP :{BLACK}Lijst met beschikbare presets, Kies er één om deze te kopiëren naar de opslagnaam hieronder +STR_SAVE_PRESET_TITLE :{BLACK}Voer een naam in voor de preset +STR_SAVE_PRESET_EDITBOX_TOOLTIP :{BLACK}Nu gekozen naam voor de preset opslag +STR_SAVE_PRESET_CANCEL :{BLACK}Annuleren +STR_SAVE_PRESET_CANCEL_TOOLTIP :{BLACK}Preset niet wijzigen +STR_SAVE_PRESET_SAVE :{BLACK}Opslaan +STR_SAVE_PRESET_SAVE_TOOLTIP :{BLACK}Sla de huidige preset op naar de nu gekozen naam + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}NewGRF parameters wijzigen STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Sluiten diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 780cccfcaa..379664a3cf 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -936,11 +936,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Catalan STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Lưu tự động STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Lựa chọn khoảng thời gian tự động lưu +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Tắt STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Hàng tháng STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Hàng quý STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :Hàng nửa năm STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :Hàng năm +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}Ngôn ngữ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Lựa chọn sử dụng ngôn ngữ giao diện @@ -966,6 +968,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Chọn g STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} file bị hỏng STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Thông tin thêm về gói nhạc chuẩn +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Không thể lấy danh sách độ phân giải được hỗ trợ STR_ERROR_FULLSCREEN_FAILED :{WHITE}Thất bại khi bật chế độ fullscreen # Custom currency window @@ -1067,7 +1070,7 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Thiết lập c STR_CONFIG_SETTING_RESTRICT_CATEGORY :{BLACK}Phân loại: STR_CONFIG_SETTING_RESTRICT_TYPE :{BLACK}Kiểu: -STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Chỉ hiển thị danh sách các thiết lập đã bị thay đổi +STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Giới hạn danh sách bên dưới bằng những bộ lọc định sẵn STR_CONFIG_SETTING_RESTRICT_BASIC :Tùy chọn cơ bản STR_CONFIG_SETTING_RESTRICT_ADVANCED :Tùy chọn nâng cao STR_CONFIG_SETTING_RESTRICT_ALL :Thiết lập chuyên gia/tất cả thiết lập @@ -1252,7 +1255,7 @@ STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Khoảng cách tối đa từ lề bản đồ tới nhà máy lọc dầu: {STRING} STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Nhà máy hóa dầu chỉ có thể xây gần rìa bản đồ, tương ứng là ven biển với những bản đồ dạng đảo STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Độ cao tuyết phủ: {STRING} -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Độ gồ ghề của địa chất (cho TerraGenesis) : {STRING} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Độ gồ ghề của địa chất: {STRING} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Rất Phẳng STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Phẳng STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Gồ Ghề @@ -1315,6 +1318,9 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Tắt STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Cuộn chuột trái: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Cho phép cuộn bản đồ bằng cách kéo với nút trái chuột. Tùy chọn này sẽ hữu ích khi dùng màn hình cảm ứng +STR_CONFIG_SETTING_AUTOSAVE :Tự động save: {STRING} +STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Chọn chu kỳ giữa mỗi lần tự động save + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Sử dụng định dạng ngày {STRING} cho tên file lưu ván chơi. STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Định dạng ngày trong tên file lưu STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :đầy đủ (31 T12 2008) @@ -1329,7 +1335,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :không có thao STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :tất cả những thao tác phi xây dựng STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING :tất cả ngoại trừ chỉnh sửa địa hình STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS :tất cả thao tác -STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :Danh sách phương tiện nâng cao: {STRING} +STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :Gom nhóm trong danh sách phương tiện: {STRING} STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT :Cho phép sử dụng danh mục nâng cao các loại phương tiện để nhóm chúng lại STR_CONFIG_SETTING_LOADING_INDICATORS :Hiển thị quá trình nạp hàng: {STRING} STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT :Lựa chọn liệu có chỉ thị tỉ lệ bốc xếp hiển thị khi bốc xếp hàng @@ -1370,13 +1376,13 @@ STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT :Phát các âm STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :Tắt việc xây dựng hạ tầng nếu không có phương tiện thích hợp nào sẵn có: {STRING} STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :Khi bật, thì cơ sở hạ tầng chỉ sẵn có nếu loại phương tiện tương ứng cũng sẵn có, giúp cho việc tránh xây nhầm hạ tầng không thích hợp -STR_CONFIG_SETTING_MAX_TRAINS :Số tàu hỏa tối đa mỗi người chơi: {STRING} +STR_CONFIG_SETTING_MAX_TRAINS :Số tàu hỏa tối đa mỗi công ty: {STRING} STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :Số lượng tối đa tàu hỏa mà mỗi công ty có thể có -STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Số xe ôtô tối đa mỗi người chơi: {STRING} +STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Số xe ôtô tối đa mỗi công ty: {STRING} STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :Số lượng ôtô tối đa mà một công ty có thể có -STR_CONFIG_SETTING_MAX_AIRCRAFT :Số máy bay tối đa mỗi người chơi: {STRING} +STR_CONFIG_SETTING_MAX_AIRCRAFT :Số máy bay tối đa mỗi công ty: {STRING} STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :Số lượng máy bay tối đa mà một công ty có thể có -STR_CONFIG_SETTING_MAX_SHIPS :Số tàu thủy tối đa mỗi người chơi: {STRING} +STR_CONFIG_SETTING_MAX_SHIPS :Số tàu thủy tối đa mỗi công ty: {STRING} STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Số lượng tàu thủy tối đa mà một công ty có thể có STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Nhân vật máy không được mua tàu hoả: {STRING} @@ -1557,7 +1563,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT :Thư tín có t STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED :Chế độ phân phối đối với hàng hóa đóng két: {STRING} STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT :Hàng hóa được đóng két là gói hàng có giá trong địa hình nhiệt đới, kim cương trong hoang mạc, vàng trong địa hình vùng cực lạnh. NewGRF có thể khác. Bạn nên đặt là bất đối xứng hoặc bằng tay nếu ở địa hình cực lạnh, vì ngân hàng sẽ không gửi vàng trở lại mỏ vàng. Với địa hình nhiệt đới hoặc hoang mạc thì có thể chọn đối xứng bởi các ngân hàng có thể gửi hai chiều với nhau. STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT :Chế độ phân phối đối với các loại hàng hóa mặc định: {STRING} -STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT :"đối xứng" là sẽ có lượng hàng từ A đến B sẽ giống lượng từ B đến A. "bất đối xứng" là tùy ý hàng hóa có thể gửi theo chiều bất kỳ. "bằng tay" là sẽ không phân phối tự động mà bạn sẽ phải chỉ ra. Bạn nên đặt là "bất đối xứng" hoặc "bằng tay". +STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT :"bất đối xứng" là khối lượng hàng hóa tùy ý có thể gửi theo chiều bất kỳ. "bằng tay" là sẽ không phân phối tự động mà bạn sẽ phải chỉ ra. STR_CONFIG_SETTING_LINKGRAPH_ACCURACY :Độ chính xác phân phối: {STRING} STR_CONFIG_SETTING_LINKGRAPH_ACCURACY_HELPTEXT :Mức chính xác tính toán đồ thị, nếu giá trị càng cao càng tốn CPU và trò chơi có thể chậm phản ứng, tuy nhiên giá trị thấp sẽ khiến việc phân phối sẽ giảm sự chính xác và bạn sẽ thấy sự khác biệt là hàng hóa không gửi đến chỗ cần đến. STR_CONFIG_SETTING_DEMAND_DISTANCE :Ảnh hưởng bởi khoảng cách đến nhu cầu gửi: {STRING} @@ -1604,14 +1610,14 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metric (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Tiêu Chuẩn Đo Lường -STR_CONFIG_SETTING_SOUND :{ORANGE}Hiệu ứng âm thanh +STR_CONFIG_SETTING_SOUND :{ORANGE}Âm thanh STR_CONFIG_SETTING_INTERFACE :{ORANGE}Giao Diện STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Xây Dựng STR_CONFIG_SETTING_VEHICLES :{ORANGE}Phương Tiện STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Tìm đường STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Đô thị STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Nhà máy -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Phân Bổ Hàng Hóa +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Phân bổ hàng hóa STR_CONFIG_SETTING_AI :{ORANGE}Đối Thủ STR_CONFIG_SETTING_AI_NPC :{ORANGE}Nhân vật máy @@ -2729,6 +2735,8 @@ STR_NEWGRF_SETTINGS_MOVEUP :{BLACK}Dịch l STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}Dịch NewGRF file lên phía trên STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Chuyển xuống STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Chuyển NewGRF file xuống dưới +STR_NEWGRF_SETTINGS_UPGRADE :{BLACK}Nâng cấp +STR_NEWGRF_SETTINGS_UPGRADE_TOOLTIP :{BLACK}Nâng cấp những file NewGRF nếu bạn đã cài phiên bản mới STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Danh sách file NewGRF đã cài đặt. STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Đặt tham số @@ -2753,6 +2761,8 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}File hợp STR_NEWGRF_SETTINGS_DISABLED :{RED}Tắt STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Không tương thích với phiên bản OpenTTD này. +# NewGRF save preset window + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Thay Đổi Tham Số NewGRF STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Đóng @@ -3253,7 +3263,7 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES :Xe ôtô chưa STR_GROUP_DEFAULT_SHIPS :Tày thuỷ chưa lập nhóm STR_GROUP_DEFAULT_AIRCRAFTS :Máy bay chưa lập nhóm -STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Nhóm - chọn nhóm để hiển thị các phương tiện thuộc nhóm +STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Nhóm - chọn nhóm để hiển thị các phương tiện thuộc nhóm. Kéo thả nhóm để sắp xếp lại danh sách. STR_GROUP_CREATE_TOOLTIP :{BLACK}Ấn vào để tạo nhóm STR_GROUP_DELETE_TOOLTIP :{BLACK}Xoá nhóm đã chọn STR_GROUP_RENAME_TOOLTIP :{BLACK}Đổi tên nhóm From 3a49a63dd1d3d55e8d4d7c38897f042100615ab9 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 11 Jun 2014 17:49:16 +0000 Subject: [PATCH 17/20] (svn r26645) -Fix: pointless zero-width character in string --- src/lang/dutch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index faaefa086c..26f27cf0c8 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -969,7 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Kies de STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} corrupt{P "" e} bestand{P "" en} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Aanvullende informatie over the basisset voor muziek -STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Mislukt om een ​​lijst met ondersteunde resoluties op te halen +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Mislukt om een lijst met ondersteunde resoluties op te halen STR_ERROR_FULLSCREEN_FAILED :{WHITE}Modus voor volledig scherm is mislukt # Custom currency window From ef2caa02b26f2b2c9b25bfc3522413ae924e139e Mon Sep 17 00:00:00 2001 From: fonsinchen Date: Sat, 14 Jun 2014 13:35:39 +0000 Subject: [PATCH 18/20] (svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size. --- src/linkgraph/demands.cpp | 3 +- src/linkgraph/linkgraph.cpp | 30 +++++-------------- src/linkgraph/linkgraph.h | 28 +++++++++++------- src/linkgraph/mcf.cpp | 3 +- src/saveload/linkgraph_sl.cpp | 54 ++++++++++++++++++++++++++--------- src/saveload/saveload.cpp | 3 +- src/station_cmd.cpp | 2 +- 7 files changed, 71 insertions(+), 52 deletions(-) diff --git a/src/linkgraph/demands.cpp b/src/linkgraph/demands.cpp index c16288123c..2c88778ab6 100644 --- a/src/linkgraph/demands.cpp +++ b/src/linkgraph/demands.cpp @@ -210,7 +210,8 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler) /* Scale the distance by mod_dist around max_distance */ int32 distance = this->max_distance - (this->max_distance - - (int32)job[from_id][to_id].Distance()) * this->mod_dist / 100; + (int32)DistanceMaxPlusManhattan(job[from_id].XY(), job[to_id].XY())) * + this->mod_dist / 100; /* Scale the accuracy by distance around accuracy / 2 */ int32 divisor = this->accuracy * (this->mod_dist - 50) / 100 + diff --git a/src/linkgraph/linkgraph.cpp b/src/linkgraph/linkgraph.cpp index 01b3d1ee2f..50945d361f 100644 --- a/src/linkgraph/linkgraph.cpp +++ b/src/linkgraph/linkgraph.cpp @@ -21,11 +21,13 @@ INSTANTIATE_POOL_METHODS(LinkGraph) /** * Create a node or clear it. + * @param xy Location of the associated station. * @param st ID of the associated station. * @param demand Demand for cargo at the station. */ -inline void LinkGraph::BaseNode::Init(StationID st, uint demand) +inline void LinkGraph::BaseNode::Init(TileIndex xy, StationID st, uint demand) { + this->xy = xy; this->supply = 0; this->demand = demand; this->station = st; @@ -34,11 +36,9 @@ inline void LinkGraph::BaseNode::Init(StationID st, uint demand) /** * Create an edge. - * @param distance Length of the link as manhattan distance. */ -inline void LinkGraph::BaseEdge::Init(uint distance) +inline void LinkGraph::BaseEdge::Init() { - this->distance = distance; this->capacity = 0; this->usage = 0; this->last_unrestricted_update = INVALID_DATE; @@ -146,21 +146,6 @@ void LinkGraph::RemoveNode(NodeID id) * been copied around in the loop above. */ } -/** - * Update distances between the given node and all others. - * @param id Node that changed position. - * @param xy New position of the node. - */ -void LinkGraph::UpdateDistances(NodeID id, TileIndex xy) -{ - assert(id < this->Size()); - for (NodeID other = 0; other < this->Size(); ++other) { - if (other == id) continue; - this->edges[id][other].distance = this->edges[other][id].distance = - DistanceMaxPlusManhattan(xy, Station::Get(this->nodes[other].station)->xy); - } -} - /** * Add a node to the component and create empty edges associated with it. Set * the station's last_component to this component. Calculate the distances to all @@ -180,7 +165,7 @@ NodeID LinkGraph::AddNode(const Station *st) this->edges.Resize(new_node + 1U, max(new_node + 1U, this->edges.Height())); - this->nodes[new_node].Init(st->index, + this->nodes[new_node].Init(st->xy, st->index, HasBit(good.status, GoodsEntry::GES_ACCEPTANCE)); BaseEdge *new_edges = this->edges[new_node]; @@ -189,9 +174,8 @@ NodeID LinkGraph::AddNode(const Station *st) new_edges[new_node].next_edge = INVALID_NODE; for (NodeID i = 0; i <= new_node; ++i) { - uint distance = DistanceMaxPlusManhattan(st->xy, Station::Get(this->nodes[i].station)->xy); - new_edges[i].Init(distance); - this->edges[i][new_node].Init(distance); + new_edges[i].Init(); + this->edges[i][new_node].Init(); } return new_node; } diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h index 7aaa1901de..799f22c780 100644 --- a/src/linkgraph/linkgraph.h +++ b/src/linkgraph/linkgraph.h @@ -49,8 +49,9 @@ public: uint supply; ///< Supply at the station. uint demand; ///< Acceptance at the station. StationID station; ///< Station ID. + TileIndex xy; ///< Location of the station referred to by the node. Date last_update; ///< When the supply was last updated. - void Init(StationID st = INVALID_STATION, uint demand = 0); + void Init(TileIndex xy = INVALID_TILE, StationID st = INVALID_STATION, uint demand = 0); }; /** @@ -60,13 +61,12 @@ public: * the column as next_edge. */ struct BaseEdge { - uint distance; ///< Length of the link. uint capacity; ///< Capacity of the link. uint usage; ///< Usage of the link. Date last_unrestricted_update; ///< When the unrestricted part of the link was last updated. Date last_restricted_update; ///< When the restricted part of the link was last updated. NodeID next_edge; ///< Destination of next valid edge starting at the same source node. - void Init(uint distance = 0); + void Init(); }; /** @@ -98,12 +98,6 @@ public: */ uint Usage() const { return this->edge.usage; } - /** - * Get edge's distance. - * @return Distance. - */ - uint Distance() const { return this->edge.distance; } - /** * Get the date of the last update to the edge's unrestricted capacity. * @return Last update. @@ -169,6 +163,12 @@ public: * @return Last update. */ Date LastUpdate() const { return this->node.last_update; } + + /** + * Get the location of the station associated with the node. + * @return Location of the station. + */ + TileIndex XY() const { return this->node.xy; } }; /** @@ -412,6 +412,15 @@ public: this->node.last_update = _date; } + /** + * Update the node's location on the map. + * @param xy New location. + */ + void UpdateLocation(TileIndex xy) + { + this->node.xy = xy; + } + /** * Set the node's demand. * @param demand New demand for the node. @@ -513,7 +522,6 @@ public: NodeID AddNode(const Station *st); void RemoveNode(NodeID id); - void UpdateDistances(NodeID id, TileIndex xy); protected: friend class LinkGraph::ConstNode; diff --git a/src/linkgraph/mcf.cpp b/src/linkgraph/mcf.cpp index 3163ec9e39..81d4d6d38e 100644 --- a/src/linkgraph/mcf.cpp +++ b/src/linkgraph/mcf.cpp @@ -259,7 +259,6 @@ void MultiCommodityFlow::Dijkstra(NodeID source_node, PathVector &paths) for (NodeID to = iter.Next(); to != INVALID_NODE; to = iter.Next()) { if (to == from) continue; // Not a real edge but a consumption sign. Edge edge = this->job[from][to]; - assert(edge.Distance() < UINT_MAX); uint capacity = edge.Capacity(); if (this->max_saturation != UINT_MAX) { capacity *= this->max_saturation; @@ -267,7 +266,7 @@ void MultiCommodityFlow::Dijkstra(NodeID source_node, PathVector &paths) if (capacity == 0) capacity = 1; } /* punish in-between stops a little */ - uint distance = edge.Distance() + 1; + uint distance = DistanceMaxPlusManhattan(this->job[from].XY(), this->job[to].XY()) + 1; Tannotation *dest = static_cast(paths[to]); if (dest->IsBetter(source, capacity, capacity - edge.Flow(), distance)) { annos.erase(dest); diff --git a/src/saveload/linkgraph_sl.cpp b/src/saveload/linkgraph_sl.cpp index 4988eb2ed7..20a3f44982 100644 --- a/src/saveload/linkgraph_sl.cpp +++ b/src/saveload/linkgraph_sl.cpp @@ -109,24 +109,25 @@ const SaveLoad *GetLinkGraphScheduleDesc() * SaveLoad desc for a link graph node. */ static const SaveLoad _node_desc[] = { - SLE_VAR(Node, supply, SLE_UINT32), - SLE_VAR(Node, demand, SLE_UINT32), - SLE_VAR(Node, station, SLE_UINT16), - SLE_VAR(Node, last_update, SLE_INT32), - SLE_END() + SLE_CONDVAR(Node, xy, SLE_UINT32, 191, SL_MAX_VERSION), + SLE_VAR(Node, supply, SLE_UINT32), + SLE_VAR(Node, demand, SLE_UINT32), + SLE_VAR(Node, station, SLE_UINT16), + SLE_VAR(Node, last_update, SLE_INT32), + SLE_END() }; /** * SaveLoad desc for a link graph edge. */ static const SaveLoad _edge_desc[] = { - SLE_VAR(Edge, distance, SLE_UINT32), - SLE_VAR(Edge, capacity, SLE_UINT32), - SLE_VAR(Edge, usage, SLE_UINT32), - SLE_VAR(Edge, last_unrestricted_update, SLE_INT32), - SLE_CONDVAR(Edge, last_restricted_update, SLE_INT32, 187, SL_MAX_VERSION), - SLE_VAR(Edge, next_edge, SLE_UINT16), - SLE_END() + SLE_CONDNULL(4, 0, 190), // distance + SLE_VAR(Edge, capacity, SLE_UINT32), + SLE_VAR(Edge, usage, SLE_UINT32), + SLE_VAR(Edge, last_unrestricted_update, SLE_INT32), + SLE_CONDVAR(Edge, last_restricted_update, SLE_INT32, 187, SL_MAX_VERSION), + SLE_VAR(Edge, next_edge, SLE_UINT16), + SLE_END() }; /** @@ -139,8 +140,16 @@ void SaveLoad_LinkGraph(LinkGraph &lg) for (NodeID from = 0; from < size; ++from) { Node *node = &lg.nodes[from]; SlObject(node, _node_desc); - for (NodeID to = 0; to < size; ++to) { - SlObject(&lg.edges[from][to], _edge_desc); + if (IsSavegameVersionBefore(191)) { + /* We used to save the full matrix ... */ + for (NodeID to = 0; to < size; ++to) { + SlObject(&lg.edges[from][to], _edge_desc); + } + } else { + /* ... but as that wasted a lot of space we save a sparse matrix now. */ + for (NodeID to = from; to != INVALID_NODE; to = lg.edges[from][to].next_edge) { + SlObject(&lg.edges[from][to], _edge_desc); + } } } } @@ -220,6 +229,23 @@ static void Load_LGRS() */ void AfterLoadLinkGraphs() { + if (IsSavegameVersionBefore(191)) { + LinkGraph *lg; + FOR_ALL_LINK_GRAPHS(lg) { + for (NodeID node_id = 0; node_id < lg->Size(); ++node_id) { + (*lg)[node_id].UpdateLocation(Station::Get((*lg)[node_id].Station())->xy); + } + } + + LinkGraphJob *lgj; + FOR_ALL_LINK_GRAPH_JOBS(lgj) { + lg = &(const_cast(lgj->Graph())); + for (NodeID node_id = 0; node_id < lg->Size(); ++node_id) { + (*lg)[node_id].UpdateLocation(Station::Get((*lg)[node_id].Station())->xy); + } + } + } + LinkGraphSchedule::Instance()->SpawnAll(); } diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index f3d2f62053..958ed46aca 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -258,8 +258,9 @@ * 188 26169 1.4.x * 189 26450 * 190 26547 + * 191 26646 */ -extern const uint16 SAVEGAME_VERSION = 190; ///< Current savegame version of OpenTTD. +extern const uint16 SAVEGAME_VERSION = 191; ///< Current savegame version of OpenTTD. SavegameType _savegame_type; ///< type of savegame we are loading diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 99bb4225ed..91d65ad878 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -649,7 +649,7 @@ static void UpdateStationSignCoord(BaseStation *st) for (CargoID c = 0; c < NUM_CARGO; ++c) { LinkGraphID lg = full_station->goods[c].link_graph; if (!LinkGraph::IsValidID(lg)) continue; - LinkGraph::Get(lg)->UpdateDistances(full_station->goods[c].node, st->xy); + (*LinkGraph::Get(lg))[full_station->goods[c].node].UpdateLocation(st->xy); } } From cc3627ad007220b661d28fa83eb68bac613a1953 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 14 Jun 2014 17:46:15 +0000 Subject: [PATCH 19/20] (svn r26647) -Update from WebTranslator v3.0: polish - 11 changes by wojteks86 slovak - 6 changes by Milsa welsh - 21 changes by kazzie --- src/lang/polish.txt | 27 ++++++++++++++++----------- src/lang/slovak.txt | 6 ++++++ src/lang/welsh.txt | 27 ++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 2b551b976c..d96b7680fd 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1317,11 +1317,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Katalońskie STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autozapis STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Wybierz okres pomiędzy autozapisami +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Wył. STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Co 1 miesiąc STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Co 3 miesiące STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :Co 6 miesięcy STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :Co 12 miesięcy +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}Język STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Wybierz język interfejsu @@ -1506,7 +1508,7 @@ STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Ustaw katastrof STR_CONFIG_SETTING_CITY_APPROVAL :Nastawienie władz miasta do przekształcania terenu: {STRING} STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Wybierz jak bardzo hałas i niszczenie środowiska przez firmy wpływa na ich ocenę przez miasto i dalsze konstrukcje na ich obszarze -STR_CONFIG_SETTING_AUTOSLOPE :Pozwól na zmiany terenu pod budynkami, torami itp. (autoslope): {STRING} +STR_CONFIG_SETTING_AUTOSLOPE :Pozwól na zmiany terenu pod budynkami, torami itp.: {STRING} STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT :Pozwalaj na modyfikowanie terenu pod budynkami i torami bez usuwania ich STR_CONFIG_SETTING_CATCHMENT :Pozwól na bardziej realistyczny zasięg obejmowania: {STRING} STR_CONFIG_SETTING_CATCHMENT_HELPTEXT :Używaj różnych rozmiarów pokrywania obszaru dla różnych typów stacji i lotnisk @@ -1633,7 +1635,7 @@ STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Maksymalna odległość od krawędzi dla rafinerii: {STRING} STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Rafinerie są budowane tylko w pobliżu krawędzi map, to znaczy na wybrzeżach dla map wyspiarskich STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Wysokość granicy wiecznych śniegów: {STRING} -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Wyboistość terenu (w TerraGenesis) : {STRING} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Wyboistość terenu: {STRING} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Bardzo łagodny STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Łagodny STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Wyboisty @@ -1696,6 +1698,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Wyłączona STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Przewijanie lewym przyciskiem myszy: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Włącz przewijanie mapy przeciąganiem lewym przyciskiem myszki. Jest to przydatne podczas używania ekranu dotykowego do przewijania + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Użyj {STRING} formatu daty dla nazw zapisów gry STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Format daty w nazwach plików zapisu gry STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :długiego (31 grudnia 2008) @@ -1755,9 +1758,9 @@ STR_CONFIG_SETTING_MAX_TRAINS :Maks. liczba po STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :Maksymalna ilość pociągów, jakie firma może posiadać STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Maks. liczba samochodów na firmę: {STRING} STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :Maksymalna ilość pojazdów drogowych, jakie firma może posiadać -STR_CONFIG_SETTING_MAX_AIRCRAFT :Maks. liczba samolotów na firmę: {STRING} +STR_CONFIG_SETTING_MAX_AIRCRAFT :Maksymalna liczba samolotów na firmę: {STRING} STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :Maksymalna ilość maszyn latających, jakie firma może posiadać -STR_CONFIG_SETTING_MAX_SHIPS :Maks. liczba statków na firmę: {STRING} +STR_CONFIG_SETTING_MAX_SHIPS :Maksymalna liczba statków na firmę: {STRING} STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Maksymalna ilość statków, jakie firma może posiadać STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Pociągi niedostępne dla komputera: {STRING} @@ -1986,7 +1989,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalizacja STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Efekty dźwiękowe +STR_CONFIG_SETTING_SOUND :{ORANGE}Dźwięk STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfejs STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Ogólne STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Widok @@ -2004,7 +2007,7 @@ STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Środow STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Władze lokalne STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Miasta STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Przedsiębiorstwa -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Dystrybucja Ładunku (Cargo Distribution) +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Dystrybucja towarów STR_CONFIG_SETTING_AI :{ORANGE}Rywale STR_CONFIG_SETTING_AI_NPC :{ORANGE}Gracze komputerowi @@ -2284,13 +2287,13 @@ STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Zabezpie STR_NETWORK_START_SERVER_UNADVERTISED :Nie STR_NETWORK_START_SERVER_ADVERTISED :Tak STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" ów ów} -STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Dopuszczalna ilość klientów: +STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Dopuszczalna liczba klientów: STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Ustaw maksymalną liczbę klientów. Nie wszystkie pola muszą być wypełnione. STR_NETWORK_START_SERVER_COMPANIES_SELECT :{BLACK}{NUM} firm{P a y ""} -STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES :{BLACK}Maksymalna ilość firm: +STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES :{BLACK}Maksymalna liczba firm: STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP :{BLACK}Ogranicz serwer do określonej ilości firm STR_NETWORK_START_SERVER_SPECTATORS_SELECT :{BLACK}{NUM} widz{P "" ów ów} -STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS :{BLACK}Maksymalna ilość widzów: +STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS :{BLACK}Maksymalna liczba widzów: STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP :{BLACK}Ogranicz serwer do określonej ilości widzów STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN :{BLACK}Używany język: STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP :{BLACK}Inni gracze będą poinformowani jaki język jest używany na serwerze @@ -3147,6 +3150,8 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Nie znalez STR_NEWGRF_SETTINGS_DISABLED :{RED}Niedostępny STR_NEWGRF_SETTINGS_INCOMPATIBLE :{G=n}{RED}Niekompatybilne z tą wersją OpenTTD +# NewGRF save preset window + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Zmień parametry NewGRF STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Zamknij @@ -3498,7 +3503,7 @@ STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURREN STR_FINANCES_TOTAL_CAPTION :{WHITE}Łącznie: STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Bilans bankowy STR_FINANCES_LOAN_TITLE :{WHITE}Pożyczka -STR_FINANCES_MAX_LOAN :{WHITE}Maks. pożyczka: {BLACK}{CURRENCY_LONG} +STR_FINANCES_MAX_LOAN :{WHITE}Maksymalna pożyczka: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Pożyczka {CURRENCY_LONG} STR_FINANCES_BORROW_TOOLTIP :{BLACK}Zwiększ wielkość pożyczki. Ctrl+Klik spłaca maksymalną możliwą kwotę pożyczki @@ -4179,7 +4184,7 @@ STR_TIMETABLE_TOOLTIP :{BLACK}Rozkład STR_TIMETABLE_NO_TRAVEL :Nie podróżuje STR_TIMETABLE_NOT_TIMETABLEABLE :Podróż (automatycznie; zaplanowana przez następny ręczny rozkaz) STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Przejazd (bez ustalonego czasu) -STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :Podróżuj z maksymalną prędkością {2:VELOCITY} (poza rozkładem) +STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :Podróżuj (poza rozkładem) z maksymalną prędkością {2:VELOCITY} STR_TIMETABLE_TRAVEL_FOR :Przejazd przez {STRING} STR_TIMETABLE_TRAVEL_FOR_SPEED :Podróżuj przez {STRING} z maksymalną prędkością {VELOCITY} STR_TIMETABLE_TRAVEL_FOR_ESTIMATED :Przejazd przez {STRING} (poza rozkładem) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 93f7a6e822..a7bbadd466 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1037,6 +1037,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Zvoľte STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} poškoden{P ý é ých} súbor{P "" y ov} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Dodatočné informácie o základnej sade hudby +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Nepodarilo sa načítať zoznam podporovaných rozlíšení STR_ERROR_FULLSCREEN_FAILED :{WHITE}Zobrazovanie na celú obrazovku zlyhalo # Custom currency window @@ -2852,8 +2853,13 @@ STR_NEWGRF_SETTINGS_DISABLED :{RED}Nedostupn STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Nekompatibilné s touto verziou OpenTTD # NewGRF save preset window +STR_SAVE_PRESET_CAPTION :{WHITE}Uložiť predvoľby +STR_SAVE_PRESET_TITLE :{BLACK}Zadajte názov pre predvoľby +STR_SAVE_PRESET_EDITBOX_TOOLTIP :{BLACK}Aktuálne vybraný názov pre uloženie predvolieb STR_SAVE_PRESET_CANCEL :{BLACK}Zrušiť +STR_SAVE_PRESET_CANCEL_TOOLTIP :{BLACK}Nemeniť predvoľby STR_SAVE_PRESET_SAVE :{BLACK}Uložiť +STR_SAVE_PRESET_SAVE_TOOLTIP :{BLACK}Uložiť predvoľby do práve vybraného názvu # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Zmeniť NewGRF parametre diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index b450cb8401..8cb7ede26f 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -937,11 +937,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Catalanaidd STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Awtogadw STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Dewiswch pa mor aml y dylid awtogadw gemau +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Diffodd Awtogadw STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Bob mis STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Bob 3 mis STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :Bob 6 mis STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :Bob 12 mis +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}Iaith STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Dewiswch yr iaith rhyngwyneb i'w defnyddio @@ -967,6 +969,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Dewisiwc STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} ffeil llygredig STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Gwybodaeth bellach am y set gerddoriaeth sylfaenol +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Methu nôl rhestr o cydraniadau cydnaws STR_ERROR_FULLSCREEN_FAILED :{WHITE}Methodd y modd sgrin llawn # Custom currency window @@ -1253,15 +1256,22 @@ STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Pellter uchafsymol o'r ochr ar gyfer Purfeydd olew: {STRING} STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :Codir purfeydd olew ger ymylon y map yn unig, h.y. ar yr arfordir mewn mapiau ynys STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Uchder Llinell Eira: {STRING} -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Garwder y tirwedd (TerraGenesis yn unig) : {STRING} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Garwder y tirwedd: {STRING} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Llyfn Iawn STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Llyfn STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Garw STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Garw Iawn +STR_CONFIG_SETTING_VARIETY :Dosraniad amrywiaeth: {STRING} +STR_CONFIG_SETTING_VARIETY_HELPTEXT :(TerraGenesis yn unig) Rheoli a yw'r map yn cynnwys ardaloedd mynyddig a gwastad. Gan fod hyn yn gwneud y map yn fwy gwastad, dylid addasu gosodiadau eraill at mynyddig +STR_CONFIG_SETTING_RIVER_AMOUNT :Nifer afonydd: {STRING} +STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT :Dewis sawl afon i'w creu STR_CONFIG_SETTING_TREE_PLACER :Algorithm gosod coed: {STRING} +STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT :Dewis dosraniad coed ar y map: mae 'Gwreiddiol' yn plannu coed mewn dosraniad unffurf, a 'Gwell' yn eu plannu mewn grwpiau STR_CONFIG_SETTING_TREE_PLACER_NONE :Dim STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL :Gwreiddiol STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :Gwell +STR_CONFIG_SETTING_ROAD_SIDE :Cerbydau ffordd: {STRING} +STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT :Dewis yr ochr gyrru STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :Tro Map Uchder: {STRING} STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Gwrthglocwedd STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE :Clocwedd @@ -1316,6 +1326,9 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :I ffwrdd STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Sgrolio Clic-chwith: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Galluogi sgrolio ar y map drwy ei lusgo gyda botwm chwith y llygoden. Mae hyn yn arbennig o ddefnyddiol pan yn defnyddio sgrin-gyffwrdd ar gyfer sgrolio +STR_CONFIG_SETTING_AUTOSAVE :Awtogadw: {STRING} +STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Dewis pa mor aml y dylid awtogadw gemau + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Defnyddio'r fformat dyddiad {STRING} ar gyfer enwau gemau wedi'u cadw STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Fformat y dyddiad mewn enwau ffeiliau cadw STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :hir (31ain Rhag 2008) @@ -2743,6 +2756,8 @@ STR_NEWGRF_SETTINGS_MOVEUP :{BLACK}Symud i STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}Symud y ffeil NewGRF sydd wedi'i ddewis i fyny'r rhestr STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Symud i Lawr STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Symud y ffeil NewGRF sydd wedi'i ddewis i lawr y rhestr +STR_NEWGRF_SETTINGS_UPGRADE :{BLACK}Uwchraddio +STR_NEWGRF_SETTINGS_UPGRADE_TOOLTIP :{BLACK}Uwchraddio ffeiliau NewGRF lle fo gennych fersiwn diweddarach wedi ei lwytho STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Rhestr o bob ffeil NewGRF sydd wedi'u gosod STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Gosod paramedrau @@ -2767,6 +2782,16 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Ni ddargan STR_NEWGRF_SETTINGS_DISABLED :{RED}Analluogwyd STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Anghydnaws gyda'r fersiwn yma o OpenTTD +# NewGRF save preset window +STR_SAVE_PRESET_CAPTION :{WHITE}Cadw rhagosodiad +STR_SAVE_PRESET_LIST_TOOLTIP :{BLACK}Rhestr o ragosodiadau ar gael, Dewiswch un i'w gopïo i'r enw cadw isod +STR_SAVE_PRESET_TITLE :{BLACK}Rhowch enw ar gyfer y rhagosodiad +STR_SAVE_PRESET_EDITBOX_TOOLTIP :{BLACK}Enw a ddewiswyd ar gyfer cadw'r rhagosodiad +STR_SAVE_PRESET_CANCEL :{BLACK}Canslo +STR_SAVE_PRESET_CANCEL_TOOLTIP :{BLACK}Peidio newid y rhagosodiad +STR_SAVE_PRESET_SAVE :{BLACK}Cadw +STR_SAVE_PRESET_SAVE_TOOLTIP :{BLACK}Cadw'r rhagosodiad i'r enw a ddewiswyd + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Newid paramedrau NewGRF STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Cau From 21704f4531509f692ea5def6fae34e01f8c518a0 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 15 Jun 2014 17:45:41 +0000 Subject: [PATCH 20/20] (svn r26648) -Update from WebTranslator v3.0: czech - 1 changes by Eskymak estonian - 5 changes by taavi --- src/lang/czech.txt | 1 + src/lang/estonian.txt | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index ca1ab8ba4f..d8ce946858 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1056,6 +1056,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Vyberte STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} poškozen{P ý é é} soubor{P "" y y} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Další informace o základním hudebním setu +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Nepodařilo se získat seznam podporovaných rozlišení STR_ERROR_FULLSCREEN_FAILED :{WHITE}Selhalo přepnutí na celou obrazovku # Custom currency window diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index c98d75adee..041517d4ad 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -993,11 +993,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Katalaani STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Isesalvestamine STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Vali automaatselt mängu salvestamise vahemik +############ start of autosave dropdown STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Väljas STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Iga kuu STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Iga 3 kuu tagant STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS :Iga 6 kuu tagant STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS :Iga 12 kuu tagant +############ end of autosave dropdown STR_GAME_OPTIONS_LANGUAGE :{BLACK}Keel STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Valib kasutajaliideses kasutatava keele @@ -1023,6 +1025,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Valib al STR_GAME_OPTIONS_BASE_MUSIC_STATUS :{RED}{NUM} viga{P "ne" "sed"} fail{P "" "id"} STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Rohkem teavet alusmuusika kogu kohta +STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Ei õnnestunud tuvastada toetatud resulutsioone STR_ERROR_FULLSCREEN_FAILED :{WHITE}Täisekraanrežiim ebaõnnestus # Custom currency window @@ -1372,6 +1375,9 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Väljas STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Vaate liigutamine vasaku hiireklahviga: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Lubab kaardi liigutamise vasaku hiireklahvi abil. See lihtsustab mängimist puutetundlikul ekraanil +STR_CONFIG_SETTING_AUTOSAVE :Automaatne salvestamine: {STRING} +STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Vali automaatse salvestamise intervall + STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Salvestatud mängu nimes kasutatakse {STRING} kuupäevavormingut STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Kuupäeva vorming salvestatud mängu nimes STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :pikka (31. dets 2008) @@ -1949,6 +1955,7 @@ STR_NETWORK_START_SERVER_UNADVERTISED :Jah STR_NETWORK_START_SERVER_ADVERTISED :Jah STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" i} STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Kliente kuni: +STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS.in :sees STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Määrab klientide arvule ülempiiri. Kõiki vabu kohti ei pea täitma STR_NETWORK_START_SERVER_COMPANIES_SELECT :{BLACK}{NUM} ettevõte{P "" t} STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES :{BLACK}Ettevõtteid kuni: @@ -2786,6 +2793,7 @@ STR_NEWGRF_SETTINGS_MOVEUP :{BLACK}Liiguta STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}NewGRF-faili liigutamine loendis üles. STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Liiguta alla STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}NewGRF-faili liigutamine loendis alla +STR_NEWGRF_SETTINGS_UPGRADE_TOOLTIP :{BLACK}Uuenda NewGRF faile mille uuema versiooni oled installinud STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Nimekiri installitud NewGRF failidest STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Vali parameetrid @@ -2810,6 +2818,8 @@ STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Sobivat fa STR_NEWGRF_SETTINGS_DISABLED :{RED}Väljas STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Mitteühilduv selle OpenTTD versiooniga +# NewGRF save preset window + # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Muuda NewGRF parameetreid STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Sulge