From 2fcb215abb018d669375b2db6475ecace45016dd Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 9 Oct 2017 17:45:39 +0000 Subject: [PATCH 01/58] (svn r27925) -Update from Eints: malay: 5 changes by rionix88 --- src/lang/malay.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 427788ddee..8d7d0850c1 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -202,6 +202,7 @@ STR_UNITS_POWER_SI :{COMMA}kW STR_UNITS_WEIGHT_SHORT_METRIC :{COMMA}t STR_UNITS_WEIGHT_SHORT_SI :{COMMA}kg +STR_UNITS_WEIGHT_LONG_IMPERIAL :{COMMA}{NBSP}tan{P "" s} STR_UNITS_WEIGHT_LONG_METRIC :{COMMA} tan STR_UNITS_WEIGHT_LONG_SI :{COMMA} kg @@ -1218,6 +1219,7 @@ STR_CONFIG_SETTING_WARN_INCOME_LESS :Beri amaran jik STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :Kenderaan tidak akan tamat tempohnya: {STRING} STR_CONFIG_SETTING_AUTORENEW_VEHICLE :Gunakan pembaharuan automatik apabila kenderaan usang : {STRING} STR_CONFIG_SETTING_AUTORENEW_MONEY :Wang minimum yang diperlukan untuk pembaharuan automatik: {STRING} +STR_CONFIG_SETTING_ERRMSG_DURATION :Jangkamasa mesej ralat: {STRING} STR_CONFIG_SETTING_POPULATION_IN_LABEL :Tunjukkan jumlah penduduk dalam label nama bandar: {STRING} STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Ketebalan garisan di dalam graf: {STRING} @@ -1325,6 +1327,7 @@ STR_CONFIG_SETTING_AI_PROFILE_MEDIUM :Sederhana STR_CONFIG_SETTING_AI_PROFILE_HARD :Sukar STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :Benarkan Kepintaran Tiruan dalam permainan pemain berbilang: {STRING} +STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT :Benarkan AI komputer menyertai permainan berbilang pemain STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES :#opcodes sebelum skrip adalah digantung: {STRING} STR_CONFIG_SETTING_SERVINT_ISPERCENT :Tempoh waktu servis dalam peratusan: {STRING} @@ -2003,6 +2006,7 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ghaibkan # Linkgraph legend window # Linkgraph legend window and linkgraph legend in smallmap +STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}tepu # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Serlahan kawasan liputan @@ -2802,6 +2806,7 @@ STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Menerima STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Penarafan STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Tunjukkan penarafan stesen +STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Bekalan bulanan dan penarafan tempatan: From 81c1e14eddf0609c28bb38a7c7b66ddeac8e7ac4 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 12 Oct 2017 17:45:42 +0000 Subject: [PATCH 02/58] (svn r27926) -Update from Eints: slovenian: 2 changes by Necrolyte polish: 12 changes by McZapkie hebrew: 34 changes by dnd_man --- src/lang/hebrew.txt | 56 +++++++++++++++++++++++++----------------- src/lang/polish.txt | 24 +++++++++--------- src/lang/slovenian.txt | 2 ++ 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index aa596d784f..a129f91dbd 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1755,7 +1755,7 @@ STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}הגדר STR_INTRO_NEWGRF_SETTINGS :{BLACK}(NewGRF)הגדרות שדרוג גראפי STR_INTRO_ONLINE_CONTENT :{BLACK} בדוק תוכן מקוון STR_INTRO_SCRIPT_SETTINGS :{BLACK}הגדרות סקריפטים של משחק/שחקני מחשב -STR_INTRO_QUIT :{BLACK}צא +STR_INTRO_QUIT :{BLACK}יציאה STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}התחל משחק חדש. Ctrl+לחיצה מדלג על תצורת מפה STR_INTRO_TOOLTIP_LOAD_GAME :{BLACK}טען משחק שמור @@ -1777,6 +1777,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK} חפש STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK} הצג הגדרות סקריפטים של משחק/שחקני מחשב STR_INTRO_TOOLTIP_QUIT :{BLACK}צא מ-'OpenTTD' +STR_INTRO_BASESET :{BLACK}חסרים {NUM} ספרייט עבור גרפיקות הבסיס שנבחרו. אנא בדוק עדכונים לערכה זו. STR_INTRO_TRANSLATION :{BLACK}בתרגום זה חסרים {P 0 "מחרוזת " ""}{NUM}{P "" " מחרוזות"}. אנא עזור לשפר את OpenTTD ע"י הצטרפות כמתרגם. קרא בקובץ readme.txt לפרטים. # Quit window @@ -2618,29 +2619,29 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS :שדות STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND :אדמה מכוסה בשלג STR_LAI_CLEAR_DESCRIPTION_DESERT :מדבר -STR_LAI_RAIL_DESCRIPTION_TRACK :מסילת ברזל מסילה -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :מסילת ברזל מסילה עם רמזורים חוסמים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :מסילת ברזל מסילה עם רמזורים מקדימים +STR_LAI_RAIL_DESCRIPTION_TRACK :מסילת ברזל +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :מסילת ברזל עם רמזורים חוסמים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :מסילת ברזל עם רמזורים מקדימים STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :מסילת ברזל מסילה עם רמזורי יציאה -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :מסילת ברזל מסילה עם רמזורים משולבים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :מסילת ברזל מסילה עם רמזורי נתיב -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :מסילת ברזל מסילה עם רמזורי נתיב חד-סטריים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :מסילת ברזל עם רמזורים משולבים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :מסילת ברזל עם רמזורי נתיב +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :מסילת ברזל עם רמזורי נתיב חד-סטריים STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :מסילת ברזל מסילה עם רמזורים חוסמים ומקדימים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :מסילת ברזל מסילה עם רמזורים חוסמים ורמזורי יציאה -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :מסילת ברזל מסילה עם רמזורים חוסמים ורמזורים משולבים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :מסילת ברזל מסילה עם רמזורים חוסמים ורמזורי נתיב -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :מסילת ברזל מסילה עם רמזורים חוסמים ורמזורי נתיב חד-סטריים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :מסילת ברזל מסילה עם רמזורים מקדימים ורמזורי יציאה -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :מסילת ברזל מסילה עם רמזורים מקדימים ורמזורים משולבים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :מסילת ברזל עם רמזורים חוסמים ורמזורי יציאה +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :מסילת ברזל עם רמזורים חוסמים ורמזורים משולבים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :מסילת ברזל עם רמזורים חוסמים ורמזורי נתיב +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :מסילת ברזל עם רמזורים חוסמים ורמזורי נתיב חד-סטריים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :מסילת ברזל עם רמזורים מקדימים ורמזורי יציאה +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :מסילת ברזל עם רמזורים מקדימים ורמזורים משולבים STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :מסילת ברזל מסילה עם רמזורים מקדימים ורמזורי נתיב -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :מסילת ברזל מסילה עם רמזורים מקדימים ורמזורי נתיב חד-סטריים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :מסילת ברזל מסילה עם רמזורי יציאה ורמזורים משולבים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :מסילת ברזל מסילה עם רמזורי יציאה ורמזורי נתיב -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :מסילת ברזל מסילה עם רמזורי יציאה ורמזורי נתיב חד-סטריים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :מסילת ברזל מסילה עם רמזורים משולבים ורמזורי נתיב -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :מסילת ברזל מסילה עם רמזורים משולבים ורמזורי נתיב חד-סטריים -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :מסילת ברזל מסילה עם רמזורי נתיב ורמזורי נתיב חד-סטריים -STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :מסילת ברזל מוסך רכבות +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :מסילת ברזל עם רמזורים מקדימים ורמזורי נתיב חד-סטריים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :מסילת ברזל עם רמזורי יציאה ורמזורים משולבים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :מסילת ברזל עם רמזורי יציאה ורמזורי נתיב +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :מסילת ברזל עם רמזורי יציאה ורמזורי נתיב חד-סטריים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :מסילת ברזל עם רמזורים משולבים ורמזורי נתיב +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :מסילת ברזל עם רמזורים משולבים ורמזורי נתיב חד-סטריים +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :מסילת ברזל עם רמזורי נתיב ורמזורי נתיב חד-סטריים +STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :מוסך רכבות STR_LAI_ROAD_DESCRIPTION_ROAD :כביש STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS :כביש עם תאורת רחוב @@ -2702,7 +2703,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :שטח בבעל # About OpenTTD window STR_ABOUT_OPENTTD :{WHITE}OpenTTD אודות -STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}כל הזכויות שמורות , {COPYRIGHT}1995 כריס סויר - {NBSP}זכויות יוצרים מקוריות +STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}כל הזכויות שמורות , {COPYRIGHT}1995 כריס סויר - זכויות יוצרים מקוריות STR_ABOUT_VERSION :{BLACK}{REV} גירסה , OpenTTD STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 The OpenTTD team @@ -3312,6 +3313,8 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{YELLOW}{5:STRI STR_INDUSTRY_VIEW_REQUIRES :{BLACK}דורש STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}ממתין +STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{YELLOW}{1:STRING}{0:STRING}{BLACK} :מייצר @@ -3380,8 +3383,10 @@ STR_GROUP_REMOVE_ALL_VEHICLES :הסר את כ STR_GROUP_RENAME_CAPTION :{BLACK}שנה שם קבוצה +STR_GROUP_PROFIT_THIS_YEAR :רווח בשנה זו: STR_GROUP_PROFIT_LAST_YEAR :רווח שנה שעברה: STR_GROUP_OCCUPANCY :שימוש נוכחי: +STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :רכבות חדשות @@ -3549,6 +3554,10 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :קטר פס מ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}{1:WEIGHT_SHORT} :משקל {NBSP}{0:CURRENCY_LONG} :מחיר{} {NBSP}{3:POWER} :עצמת מנוע {NBSP}{2:VELOCITY} :מהירות {NBSP}{}{5:CARGO_LONG} : קיבולת {NBSP} לשנה {NBSP}{4:CURRENCY_LONG} :עלות תפעולית STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}עלות: {CURRENCY_LONG} משקל: {WEIGHT_SHORT}{}מהירות: {VELOCITY} הספק: {POWER} מקסימלי T.E.: {6:FORCE}{}עלות תפעולית: {4:CURRENCY_LONG}/לשנה{}קיבולת: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}עלות: {CURRENCY_LONG} מהירות מקסימלית: {VELOCITY}{}קיבולת: {CARGO_LONG}{}הוצאה שוטפת: {CURRENCY_LONG}/לשנה +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST :{BLACK}עלות: {CURRENCY_LONG} מהירות מקסימלית: {VELOCITY}{}סוג כלי טיס: {STRING}{}קיבולת: {CARGO_LONG}, {CARGO_LONG}{}עלות תפעולית: {CURRENCY_LONG}/שנה +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}עלות: {CURRENCY_LONG} מהירות מקסימלית: {VELOCITY}{}סוג כלי טיס: {STRING}{}קיבולת: {CARGO_LONG}{}עלות תפעולית: {CURRENCY_LONG}/שנה +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}עלות: {CURRENCY_LONG} מהירות מקסימלית: {VELOCITY}{}סוג כלי טיס: {STRING} טווח: {COMMA} משבצות{}קיבולת: {CARGO_LONG}, {CARGO_LONG}{}עלות תפעולית: {CURRENCY_LONG}/שנה +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_RUNCOST :{BLACK}עלות: {CURRENCY_LONG} מהירות מקסימלית: {VELOCITY}{}סוג כלי טיס: {STRING} טווח: {COMMA} משבצות{}קיבולת: {CARGO_LONG}{}עלות תפעולית: {CURRENCY_LONG}/שנה # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}החלף {STRING} - {STRING} @@ -3578,6 +3587,7 @@ STR_REPLACE_HELP_STOP_BUTTON :{BLACK}לחץ STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}החלף בין חלונות החלפת קרון וקטר STR_REPLACE_ENGINES :מנועים/קטרים STR_REPLACE_WAGONS :קרונות +STR_REPLACE_ALL_RAILTYPE :כלל הרכבות STR_REPLACE_HELP_RAILTYPE :{BLACK}בחר את סוג המסילה עבורה ברצונך להחליף קטרים STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK} מציג אילו קטרים מוחלפים זה בזה @@ -3670,6 +3680,8 @@ STR_VEHICLE_INFO_AGE :({1:COMMA}) ש STR_VEHICLE_INFO_AGE_RED :{RED}({1:COMMA}) שנים {NBSP}{0:COMMA} STR_VEHICLE_INFO_MAX_SPEED :{BLACK}מהירות מקסימלית: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}מהירות מקס.: {LTBLUE}{VELOCITY} {BLACK}סוג כלי טיס: {LTBLUE}{STRING} +STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE :{BLACK}מהירות מקסימלית: {LTBLUE}{VELOCITY} {BLACK}סוג כלי טיס: {LTBLUE}{STRING} {BLACK}טווח: {LTBLUE}{COMMA} משבצות STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}משקל: {LTBLUE}{WEIGHT_SHORT} {BLACK}הספק: {LTBLUE}{POWER}{BLACK} מהירות מקסימלית: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}משקל: {LTBLUE}{WEIGHT_SHORT} {BLACK}הספק: {LTBLUE}{POWER}{BLACK} מהירות מקסימלית: {LTBLUE}{VELOCITY} {BLACK}T.E. מקסימלי: {LTBLUE}{FORCE} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 28049b85d7..2720818545 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -702,7 +702,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Wyświet STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Wyświetl listę stacji firmy STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES :{BLACK}Wyświetl informacje finansowe firmy STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL :{BLACK}Wyświetl informacje ogólne firmy -STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK :{BLACK}Pokaż okno opowieści +STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK :{BLACK}Pokaż dziennik STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST :{BLACK}Pokaż listę celów STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Wyświetl wykresy STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Wyświetl ranking firm @@ -3416,7 +3416,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{YELLOW}Kup roc STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE :{YELLOW}Daj łapówkę lokalnym władzom, powiększ swoją ocenę, ryzykując poważne kary w razie złapania.{}Koszt: {CURRENCY_LONG} # Goal window -STR_GOALS_CAPTION :{WHITE}{COMPANY} Cele +STR_GOALS_CAPTION :{WHITE}Cele firmy {COMPANY} STR_GOALS_SPECTATOR_CAPTION :{WHITE}Cele globalne STR_GOALS_GLOBAL_TITLE :{BLACK}Cele globalne: STR_GOALS_TEXT :{ORANGE}{STRING} @@ -3464,8 +3464,8 @@ STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Klik na usłudze żeby wyśrodkować widok na fabrykę/miasto. Ctrl+klik otwiera nowy podgląd na pozycji fabryki/miasta # Story book window -STR_STORY_BOOK_CAPTION :{WHITE}Album Historii Firmy {COMPANY} -STR_STORY_BOOK_SPECTATOR_CAPTION :{WHITE}Globalne okno opowieści +STR_STORY_BOOK_CAPTION :{WHITE}Dziennik Historii Firmy {COMPANY} +STR_STORY_BOOK_SPECTATOR_CAPTION :{WHITE}Ogólny przewodnik STR_STORY_BOOK_TITLE :{YELLOW}{STRING} STR_STORY_BOOK_GENERIC_PAGE_ITEM :Strona {NUM} STR_STORY_BOOK_SEL_PAGE_TOOLTIP :{BLACK}Skocz na właściwą stronę wybierając ją z listy. @@ -4196,7 +4196,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS :mniejszy lub r STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN :większy niż STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS :większy lub równy STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE :prawda -STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :fałsz +STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :nie prawda STR_ORDER_CONDITIONAL_VALUE_TOOLTIP :{BLACK}Wartość do porównania z danymi pojazdu STR_ORDER_CONDITIONAL_VALUE_CAPT :{WHITE}Podaj wartość do porównania @@ -4226,10 +4226,10 @@ STR_ORDER_GO_NON_STOP_TO_WAYPOINT :Idź bezpośred STR_ORDER_SERVICE_AT :Serwisuj w STR_ORDER_SERVICE_NON_STOP_AT :Serwisuj non-stop w -STR_ORDER_NEAREST_DEPOT :najbliższych -STR_ORDER_NEAREST_HANGAR :najbliższy hangar -STR_ORDER_TRAIN_DEPOT :Warsztatów -STR_ORDER_ROAD_VEHICLE_DEPOT :Zajezdni samochodowej +STR_ORDER_NEAREST_DEPOT :najbliższego +STR_ORDER_NEAREST_HANGAR :najbliższego hangaru +STR_ORDER_TRAIN_DEPOT :serwisu w warsztatach +STR_ORDER_ROAD_VEHICLE_DEPOT :serwisu w zajezdni STR_ORDER_SHIP_DEPOT :Doku STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT :{STRING} {STRING} {STRING} STR_ORDER_GO_TO_DEPOT_FORMAT :{STRING} {DEPOT} @@ -4281,7 +4281,7 @@ STR_ORDER_OUT_OF_RANGE :{RED} (Kolejny STR_ORDER_CONDITIONAL_UNCONDITIONAL :Skocz do rozkazu {COMMA} STR_ORDER_CONDITIONAL_NUM :Skocz do rozkazu {COMMA} kiedy {STRING} {STRING} {COMMA} -STR_ORDER_CONDITIONAL_TRUE_FALSE :Skocz do rozkazu {COMMA} kiedy {STRING} {STRING} +STR_ORDER_CONDITIONAL_TRUE_FALSE :Skocz do rozkazu {0:COMMA} kiedy {2:STRING} że {1:STRING} STR_INVALID_ORDER :{RED} (Błędne polecenie) @@ -5302,8 +5302,8 @@ STR_FORMAT_WAYPOINT_NAME_SERIAL :Post. {TOWN} #{ STR_FORMAT_DEPOT_NAME_TRAIN :Warsztaty {TOWN} STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL :Warsztaty {TOWN} #{COMMA} -STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE :Zajezdnia samochodowa {TOWN} -STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL :Zajezdnia samochodowa {TOWN} #{COMMA} +STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE :Zajezdnia {TOWN} +STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL :Zajezdnia {TOWN} #{COMMA} STR_FORMAT_DEPOT_NAME_SHIP :Stocznia {TOWN} STR_FORMAT_DEPOT_NAME_SHIP_SERIAL :Stocznia {TOWN} #{COMMA} STR_FORMAT_DEPOT_NAME_AIRCRAFT :Hangar {STATION} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 5f1598beb6..b89bb03510 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1525,6 +1525,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Izklop STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Premik slike z levim klikom: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Omogoči pomik pogleda z levim klikom miške in vlečenjem. Primerno za dotične zaslone. +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Zapri okno z desnim klikom: {STRING} STR_CONFIG_SETTING_AUTOSAVE :Samodejno shrani: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Izberi časovni interval samodejnega shranjevanja igre @@ -3679,6 +3680,7 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :magnetna lokomo STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Cena: {CURRENCY_LONG} Teža: {WEIGHT_SHORT}{}Hitrost: {VELOCITY} Moč: {POWER}{}Cena delovanja: {CURRENCY_LONG}/leto{}Zmogljivost: {CARGO_LONG} STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Cena: {CURRENCY_LONG} Teža: {WEIGHT_SHORT}{}Hitrost: {VELOCITY} Moč: {POWER} Max. T.E.: {6:FORCE}{}Stroški: {4:CURRENCY_LONG}/yr{}Zmogljivost: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Cena: {CURRENCY_LONG} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO_LONG}{}Cena delovanja: {CURRENCY_LONG}/leto +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}Cena: {CURRENCY_LONG} Max. hitrost: {VELOCITY}{}Vrsta letala: {STRING}{}Zmogljivost: {CARGO_LONG}{}Stroški obratovanja: {CURRENCY_LONG}/leto # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}Zamenjaj {STRING} - {STRING} From 461b43e649eadb8df79c46a77db45d8b39e1a881 Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 13 Oct 2017 17:45:40 +0000 Subject: [PATCH 03/58] (svn r27927) -Update from Eints: french: 6 changes by glx --- src/lang/french.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lang/french.txt b/src/lang/french.txt index 3b74d392b4..65fba11c27 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1373,6 +1373,8 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Désactivé STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Défilement par clic gauche{NBSP}: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Active le défilement de la carte en la glissant avec le bouton gauche de la souris. C'est surtout utile pour les écrans tactiles +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Fermer une fenêtre en cliquant droit{NBSP}: {STRING} +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Fermer une fenêtre en cliquant droit à l’intérieur de celle-ci. Désactive l'infobulle sur clic droit{NBSP}! STR_CONFIG_SETTING_AUTOSAVE :Sauvegarde automatique{NBSP}: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Sélectionner l'intervalle de temps entre les sauvegardes automatiques @@ -3368,6 +3370,10 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Retirer tous le STR_GROUP_RENAME_CAPTION :{BLACK}Renommer un groupe +STR_GROUP_PROFIT_THIS_YEAR :Profit cette année{NBSP}: +STR_GROUP_PROFIT_LAST_YEAR :Profit l'année précédente{NBSP}: +STR_GROUP_OCCUPANCY :Utilisation actuelle{NBSP}: +STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Nouveaux véhicules ferroviaires From ffdcbb8f212b796dc35744201289d22294e14ecb Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 25 Oct 2017 15:38:14 +0000 Subject: [PATCH 04/58] (svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers. -Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain. -Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry. --- src/newgrf_engine.cpp | 24 +++++++----------------- src/newgrf_engine.h | 1 - src/newgrf_house.cpp | 15 +++++++-------- src/newgrf_house.h | 1 - src/newgrf_industries.cpp | 6 ------ src/newgrf_industries.h | 1 - src/newgrf_industrytiles.cpp | 13 ++++++------- src/newgrf_industrytiles.h | 1 - src/newgrf_spritegroup.cpp | 18 +++--------------- src/newgrf_spritegroup.h | 17 +++++++++++++---- src/newgrf_station.cpp | 17 +++++++---------- src/newgrf_station.h | 1 - 12 files changed, 43 insertions(+), 72 deletions(-) diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 8dd8d545a2..94c8df1d13 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -347,21 +347,6 @@ static byte MapAircraftMovementAction(const Aircraft *v) return this->v == NULL ? 0 : this->v->waiting_triggers; } -/* virtual */ void VehicleScopeResolver::SetTriggers(int triggers) const -{ - /* Evil cast to get around const-ness. This used to be achieved by an - * innocent looking function pointer cast... Currently I cannot see a - * way of avoiding this without removing consts deep within gui code. - */ - Vehicle *v = const_cast(this->v); - - /* This function must only be called when processing triggers -- any - * other time is an error. */ - assert(this->ro.trigger != 0); - - if (v != NULL) v->waiting_triggers = triggers; -} - /* virtual */ ScopeResolver *VehicleResolverObject::GetScope(VarSpriteGroupScope scope, byte relative) { @@ -1140,13 +1125,18 @@ static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, byte base_rando assert(v != NULL); VehicleResolverObject object(v->engine_type, v, VehicleResolverObject::WO_CACHED, false, CBID_RANDOM_TRIGGER); - object.trigger = trigger; + object.waiting_triggers = v->waiting_triggers | trigger; + v->waiting_triggers = object.waiting_triggers; // store now for var 5F const SpriteGroup *group = object.Resolve(); if (group == NULL) return; + /* Store remaining triggers. */ + v->waiting_triggers = object.GetRemainingTriggers(); + + /* Rerandomise bits. Scopes other than SELF are invalid for rerandomisation. For bug-to-bug-compatibility with TTDP we ignore the scope. */ byte new_random_bits = Random(); - uint32 reseed = object.GetReseedSum(); // The scope only affects triggers, not the reseeding + uint32 reseed = object.GetReseedSum(); v->random_bits &= ~reseed; v->random_bits |= (first ? new_random_bits : base_random_bits) & reseed; diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h index 3c8108737c..6406b0f4e3 100644 --- a/src/newgrf_engine.h +++ b/src/newgrf_engine.h @@ -33,7 +33,6 @@ struct VehicleScopeResolver : public ScopeResolver { /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; /* virtual */ uint32 GetTriggers() const; - /* virtual */ void SetTriggers(int triggers) const; }; /** Resolver for a vehicle (chain) */ diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index 2bc85f9acb..bcd83f2f19 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -169,12 +169,6 @@ void DecreaseBuildingCount(Town *t, HouseID house_id) return this->not_yet_constructed ? 0 : GetHouseTriggers(this->tile); } -/* virtual */ void HouseScopeResolver::SetTriggers(int triggers) const -{ - assert(!this->not_yet_constructed && IsValidTile(this->tile) && IsTileType(this->tile, MP_HOUSE)); - SetHouseTriggers(this->tile, triggers); -} - static uint32 GetNumHouses(HouseID house_id, const Town *town) { uint8 map_id_count, town_id_count, map_class_count, town_class_count; @@ -613,14 +607,19 @@ static void DoTriggerHouse(TileIndex tile, HouseTrigger trigger, byte base_rando if (hs->grf_prop.spritegroup[0] == NULL) return; HouseResolverObject object(hid, tile, Town::GetByTile(tile), CBID_RANDOM_TRIGGER); - object.trigger = trigger; + object.waiting_triggers = GetHouseTriggers(tile) | trigger; + SetHouseTriggers(tile, object.waiting_triggers); // store now for var 5F const SpriteGroup *group = object.Resolve(); if (group == NULL) return; + /* Store remaining triggers. */ + SetHouseTriggers(tile, object.GetRemainingTriggers()); + + /* Rerandomise bits. Scopes other than SELF are invalid for houses. For bug-to-bug-compatibility with TTDP we ignore the scope. */ byte new_random_bits = Random(); byte random_bits = GetHouseRandomBits(tile); - uint32 reseed = object.GetReseedSum(); // The scope only affects triggers, not the reseeding + uint32 reseed = object.GetReseedSum(); random_bits &= ~reseed; random_bits |= (first ? new_random_bits : base_random) & reseed; SetHouseRandomBits(tile, random_bits); diff --git a/src/newgrf_house.h b/src/newgrf_house.h index 37c1679470..efc0c6cbb3 100644 --- a/src/newgrf_house.h +++ b/src/newgrf_house.h @@ -33,7 +33,6 @@ struct HouseScopeResolver : public ScopeResolver { /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; /* virtual */ uint32 GetTriggers() const; - /* virtual */ void SetTriggers(int triggers) const; }; /** Resolver object to be used for houses (feature 07 spritegroups). */ diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index e8486e7604..f0c8dd3b77 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -383,12 +383,6 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout return this->industry != NULL ? this->industry->random_triggers : 0; } -/* virtual */ void IndustriesScopeResolver::SetTriggers(int triggers) const -{ - assert(this->industry != NULL && this->industry->index != INVALID_INDUSTRY); - this->industry->random_triggers = triggers; -} - /* virtual */ void IndustriesScopeResolver::StorePSA(uint pos, int32 value) { if (this->industry->index == INVALID_INDUSTRY) return; diff --git a/src/newgrf_industries.h b/src/newgrf_industries.h index 94a5021662..45b0333a67 100644 --- a/src/newgrf_industries.h +++ b/src/newgrf_industries.h @@ -26,7 +26,6 @@ struct IndustriesScopeResolver : public ScopeResolver { /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; /* virtual */ uint32 GetTriggers() const; - /* virtual */ void SetTriggers(int triggers) const; /* virtual */ void StorePSA(uint pos, int32 value); }; diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index 90a17550d0..b4b8f77c43 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -117,12 +117,6 @@ uint32 GetRelativePosition(TileIndex tile, TileIndex ind_tile) return GetIndustryTriggers(this->tile); } -/* virtual */ void IndustryTileScopeResolver::SetTriggers(int triggers) const -{ - assert(this->industry != NULL && this->industry->index != INVALID_INDUSTRY && IsValidTile(this->tile) && IsTileType(this->tile, MP_INDUSTRY)); - SetIndustryTriggers(this->tile, triggers); -} - /** * Get the associated NewGRF file from the industry graphics. * @param gfx Graphics to query. @@ -326,11 +320,16 @@ static void DoTriggerIndustryTile(TileIndex tile, IndustryTileTrigger trigger, I if (itspec->grf_prop.spritegroup[0] == NULL) return; IndustryTileResolverObject object(gfx, tile, ind, CBID_RANDOM_TRIGGER); - object.trigger = trigger; + object.waiting_triggers = GetIndustryTriggers(tile) | trigger; + SetIndustryTriggers(tile, object.waiting_triggers); // store now for var 5F const SpriteGroup *group = object.Resolve(); if (group == NULL) return; + /* Store remaining triggers. */ + SetIndustryTriggers(tile, object.GetRemainingTriggers()); + + /* Rerandomise tile bits */ byte new_random_bits = Random(); byte random_bits = GetIndustryRandomBits(tile); random_bits &= ~object.reseed[VSG_SCOPE_SELF]; diff --git a/src/newgrf_industrytiles.h b/src/newgrf_industrytiles.h index 394f75e1c6..2af064054d 100644 --- a/src/newgrf_industrytiles.h +++ b/src/newgrf_industrytiles.h @@ -26,7 +26,6 @@ struct IndustryTileScopeResolver : public ScopeResolver { /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; /* virtual */ uint32 GetTriggers() const; - /* virtual */ void SetTriggers(int triggers) const; }; /** Resolver for industry tiles. */ diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index c6fcd0a9e5..a838a1388d 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -109,12 +109,6 @@ ScopeResolver::~ScopeResolver() {} return 0; } -/** - * Set the triggers. Base class implementation does nothing. - * @param triggers Triggers to set. - */ -/* virtual */ void ScopeResolver::SetTriggers(int triggers) const {} - /** * Get a variable value. Default implementation has no available variables. * @param variable Variable to read @@ -304,21 +298,15 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con const SpriteGroup *RandomizedSpriteGroup::Resolve(ResolverObject &object) const { ScopeResolver *scope = object.GetScope(this->var_scope, this->count); - if (object.trigger != 0) { + if (object.callback == CBID_RANDOM_TRIGGER) { /* Handle triggers */ - /* Magic code that may or may not do the right things... */ - byte waiting_triggers = scope->GetTriggers(); - byte match = this->triggers & (waiting_triggers | object.trigger); + byte match = this->triggers & object.waiting_triggers; bool res = (this->cmp_mode == RSG_CMP_ANY) ? (match != 0) : (match == this->triggers); if (res) { - waiting_triggers &= ~match; + object.used_triggers |= match; object.reseed[this->var_scope] |= (this->num_groups - 1) << this->lowest_randbit; - } else { - waiting_triggers |= object.trigger; } - - scope->SetTriggers(waiting_triggers); } uint32 mask = (this->num_groups - 1) << this->lowest_randbit; diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index 0a7705d667..a0ae6ce511 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -293,7 +293,6 @@ struct ScopeResolver { virtual uint32 GetRandomBits() const; virtual uint32 GetTriggers() const; - virtual void SetTriggers(int triggers) const; virtual uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; virtual void StorePSA(uint reg, int32 value); @@ -315,9 +314,10 @@ struct ResolverObject { uint32 callback_param1; ///< First parameter (var 10) of the callback. uint32 callback_param2; ///< Second parameter (var 18) of the callback. - byte trigger; - uint32 last_value; ///< Result of most recent DeterministicSpriteGroup (including procedure calls) + + uint32 waiting_triggers; ///< Waiting triggers to be used by any rerandomisation. (scope independent) + uint32 used_triggers; ///< Subset of cur_triggers, which actually triggered some rerandomisation. (scope independent) uint32 reseed[VSG_END]; ///< Collects bits to rerandomise while triggering triggers. const GRFFile *grffile; ///< GRFFile the resolved SpriteGroup belongs to @@ -346,6 +346,14 @@ struct ResolverObject { virtual ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0); + /** + * Returns the waiting triggers that did not trigger any rerandomisation. + */ + uint32 GetRemainingTriggers() const + { + return this->waiting_triggers & ~this->used_triggers; + } + /** * Returns the OR-sum of all bits that need reseeding * independent of the scope they were accessed with. @@ -367,7 +375,8 @@ struct ResolverObject { void ResetState() { this->last_value = 0; - this->trigger = 0; + this->waiting_triggers = 0; + this->used_triggers = 0; memset(this->reseed, 0, sizeof(this->reseed)); } }; diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index cd5dad7b47..091182185e 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -235,13 +235,6 @@ static uint32 GetRailContinuationInfo(TileIndex tile) } -/* virtual */ void StationScopeResolver::SetTriggers(int triggers) const -{ - BaseStation *st = const_cast(this->st); - assert(st != NULL); - st->waiting_triggers = triggers; -} - /** * Station variable cache * This caches 'expensive' station variable lookups which iterate over @@ -997,8 +990,9 @@ void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigg } } - /* Convert trigger to bit */ - uint8 trigger_bit = 1 << trigger; + /* Store triggers now for var 5F */ + SetBit(st->waiting_triggers, trigger); + uint32 used_triggers = 0; /* Check all tiles over the station to check if the specindex is still in use */ TILE_AREA_LOOP(tile, area) { @@ -1014,11 +1008,13 @@ void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigg if (cargo_type == CT_INVALID || HasBit(ss->cargo_triggers, cargo_type)) { StationResolverObject object(ss, st, tile, CBID_RANDOM_TRIGGER, 0); - object.trigger = trigger_bit; + object.waiting_triggers = st->waiting_triggers; const SpriteGroup *group = object.Resolve(); if (group == NULL) continue; + used_triggers |= object.used_triggers; + uint32 reseed = object.GetReseedSum(); if (reseed != 0) { whole_reseed |= reseed; @@ -1037,6 +1033,7 @@ void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigg } /* Update whole station random bits */ + st->waiting_triggers &= ~used_triggers; if ((whole_reseed & 0xFFFF) != 0) { st->random_bits &= ~whole_reseed; st->random_bits |= Random() & whole_reseed; diff --git a/src/newgrf_station.h b/src/newgrf_station.h index b9333c1053..f6a39efb15 100644 --- a/src/newgrf_station.h +++ b/src/newgrf_station.h @@ -34,7 +34,6 @@ struct StationScopeResolver : public ScopeResolver { /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetTriggers() const; - /* virtual */ void SetTriggers(int triggers) const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; }; From 6cc55abaf93e6d22e92ac2212b67ae0af52dbc68 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 25 Oct 2017 15:38:19 +0000 Subject: [PATCH 05/58] (svn r27929) -Cleanup: Remove unused Industry::random_triggers --- src/industry.h | 1 - src/newgrf_industries.cpp | 2 +- src/saveload/industry_sl.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/industry.h b/src/industry.h index 5e5d046880..9b185efc4b 100644 --- a/src/industry.h +++ b/src/industry.h @@ -66,7 +66,6 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { Date last_cargo_accepted_at; ///< Last day cargo was accepted by this industry byte selected_layout; ///< Which tile layout was used when creating the industry - byte random_triggers; ///< Triggers for the random uint16 random; ///< Random value used for randomisation of all kinds of things PersistentStorage *psa; ///< Persistent storage for NewGRF industries. diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index f0c8dd3b77..9f227a9f58 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -380,7 +380,7 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout /* virtual */ uint32 IndustriesScopeResolver::GetTriggers() const { - return this->industry != NULL ? this->industry->random_triggers : 0; + return 0; } /* virtual */ void IndustriesScopeResolver::StorePSA(uint pos, int32 value) diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index c5ddadfdd0..b28730e3c3 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -57,7 +57,7 @@ static const SaveLoad _industry_desc[] = { SLEG_CONDARR(_old_ind_persistent_storage.storage, SLE_UINT32, 16, 76, 160), SLE_CONDREF(Industry, psa, REF_STORAGE, 161, SL_MAX_VERSION), - SLE_CONDVAR(Industry, random_triggers, SLE_UINT8, 82, SL_MAX_VERSION), + SLE_CONDNULL(1, 82, 196), // random_triggers SLE_CONDVAR(Industry, random, SLE_UINT16, 82, SL_MAX_VERSION), SLE_CONDNULL(32, 2, 143), // old reserved space From 52394ae5481c4caffb9b4356f01dfe45e3a54eea Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 2 Nov 2017 18:45:39 +0000 Subject: [PATCH 06/58] (svn r27930) -Update from Eints: chinese (simplified): 2 changes by yfdyh000 --- src/lang/simplified_chinese.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index b00dfef89e..21f587aa8d 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3363,6 +3363,7 @@ STR_GROUP_REMOVE_ALL_VEHICLES :移除所有车 STR_GROUP_RENAME_CAPTION :{BLACK}重命名分组 +STR_GROUP_PROFIT_THIS_YEAR :今年利润： STR_GROUP_PROFIT_LAST_YEAR :去年利润 STR_GROUP_OCCUPANCY_VALUE :{NUM}% @@ -3562,6 +3563,7 @@ STR_REPLACE_HELP_STOP_BUTTON :{BLACK}点击 STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}可以切换 机车/挂车 替换项目 STR_REPLACE_ENGINES :机车 STR_REPLACE_WAGONS :挂车 +STR_REPLACE_ALL_RAILTYPE :所有铁路车辆 STR_REPLACE_HELP_RAILTYPE :{BLACK}选择要更新的车辆对应的铁路类型 STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}显示用来替换左侧被选定车辆的新车辆 From a391bc99e7ba79062811389204ae72c960ccee4f Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 18 Nov 2017 18:45:38 +0000 Subject: [PATCH 07/58] (svn r27931) -Update from Eints: portuguese: 7 changes by neuralshock --- src/lang/portuguese.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 8fc61c35ef..fd62809141 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1762,6 +1762,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Verifica STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Mostrar definições de IA e de script de jogo STR_INTRO_TOOLTIP_QUIT :{BLACK}Sair de 'OpenTTD' +STR_INTRO_BASESET :{BLACK}O conjunto de gráficos base seleccionado tem {NUM} sprite{P "" s} em falta. Por favor verifique se existem atualizações para o conjunto. STR_INTRO_TRANSLATION :{BLACK}Faltam {NUM} string{P "" s} nesta tradução. Ajude o OpenTTD em inscrever-se como tradutor. Leia readme.txt para mais detalhes. # Quit window @@ -3293,6 +3294,8 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Necessá STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Necessário: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}a aguardar ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produz: {YELLOW}{STRING}{STRING} @@ -3361,6 +3364,8 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Remover todos o STR_GROUP_RENAME_CAPTION :{BLACK}Renomear um grupo +STR_GROUP_PROFIT_LAST_YEAR :Lucro no último ano: +STR_GROUP_OCCUPANCY :Utilização actual: # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Novos Veículos Ferroviários @@ -3527,6 +3532,7 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :locomotiva magl STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Custo: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade: {VELOCITY} Potência: {POWER}{}Custo de circulação: {CURRENCY_LONG}/ano{}Capacidade: {CARGO_LONG} STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Custo: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade: {VELOCITY} Potência: {POWER} Máx. F.T.: {6:FORCE}{}Custo de circulação: {4:CURRENCY_LONG}/ano{}Capacidade: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Máx. Velocidade: {VELOCITY}{}Capacidade: {CARGO_LONG}{}Custo de circulação: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Vel. Máxima: {VELOCITY}{}Tipo de Aeronave: {STRING} Alcance: {COMMA}{}Capacity: {CARGO_LONG}, {CARGO_LONG}{}Custo de circulação: {CURRENCY_LONG}/yr # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituir {STRING} - {STRING} @@ -3648,6 +3654,7 @@ STR_VEHICLE_INFO_AGE :{COMMA} ano{P " STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} ano{P "" s} ({COMMA}) STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Máx. velocidade: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}Vel. máxima: {LTBLUE}{VELOCITY} {BLACK}Tipo de Aeronave: {LTBLUE}{STRING} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Max. velocidade: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Máx. velocidade: {LTBLUE}{VELOCITY} {BLACK}Máx. E.T.: {LTBLUE}{FORCE} From 3f819029f4a6987d5309580d5e4f31fca3b91fe0 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 25 Nov 2017 16:50:28 +0000 Subject: [PATCH 08/58] (svn r27932) -Fix (r0) [FS#6639]: Forest, candyfloss forest and battery farm skipped the first animation frame. --- src/industry_cmd.cpp | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 8fea6953ae..9c98b120c6 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -491,7 +491,12 @@ static CommandCost ClearTile_Industry(TileIndex tile, DoCommandFlag flags) return CommandCost(EXPENSES_CONSTRUCTION, indspec->GetRemovalCost()); } -static void TransportIndustryGoods(TileIndex tile) +/** + * Move produced cargo from industry to nearby stations. + * @param tile Industry tile + * @return true if any cargo was moved. + */ +static bool TransportIndustryGoods(TileIndex tile) { Industry *i = Industry::GetByTile(tile); const IndustrySpec *indspec = GetIndustrySpec(i->type); @@ -516,16 +521,7 @@ static void TransportIndustryGoods(TileIndex tile) } } - if (moved_cargo && !StartStopIndustryTileAnimation(i, IAT_INDUSTRY_DISTRIBUTES_CARGO)) { - uint newgfx = GetIndustryTileSpec(GetIndustryGfx(tile))->anim_production; - - if (newgfx != INDUSTRYTILE_NOANIM) { - ResetIndustryConstructionStage(tile); - SetIndustryCompleted(tile); - SetIndustryGfx(tile, newgfx); - MarkTileDirtyByTile(tile); - } - } + return moved_cargo; } @@ -810,7 +806,17 @@ static void TileLoop_Industry(TileIndex tile) if (_game_mode == GM_EDITOR) return; - TransportIndustryGoods(tile); + if (TransportIndustryGoods(tile) && !StartStopIndustryTileAnimation(Industry::GetByTile(tile), IAT_INDUSTRY_DISTRIBUTES_CARGO)) { + uint newgfx = GetIndustryTileSpec(GetIndustryGfx(tile))->anim_production; + + if (newgfx != INDUSTRYTILE_NOANIM) { + ResetIndustryConstructionStage(tile); + SetIndustryCompleted(tile); + SetIndustryGfx(tile, newgfx); + MarkTileDirtyByTile(tile); + return; + } + } if (StartStopIndustryTileAnimation(tile, IAT_TILELOOP)) return; From 3d1dd164f0bdd919e9b3494946ad4360f51d5bfc Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 9 Dec 2017 18:45:38 +0000 Subject: [PATCH 09/58] (svn r27933) -Update from Eints: croatian: 26 changes by UnderwaterHesus portuguese (brazilian): 54 changes by Tucalipe --- src/lang/brazilian_portuguese.txt | 87 +++++++++++++++++++------------ src/lang/croatian.txt | 52 +++++++++--------- 2 files changed, 80 insertions(+), 59 deletions(-) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index f5ab33faf5..d655f49dff 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1286,8 +1286,8 @@ STR_CONFIG_SETTING_HOVER_DELAY_VALUE :Aguardar {COMMA STR_CONFIG_SETTING_HOVER_DELAY_DISABLED :Botão direito STR_CONFIG_SETTING_POPULATION_IN_LABEL :Exibir população da cidade na janela da cidade: {STRING} STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Exibe a população das cidades nos nomes, no mapa -STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Grossura das linhas nos gráficos: {STRING} -STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Grossura da linha nos gráficos. Linhas finas são mais precisas, enquanto linhas grossas são mais fáceis de distinguir. +STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Espessura das linhas nos gráficos: {STRING} +STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Espessura da linha nos gráficos. Linhas finas são mais precisas, enquanto linhas grossas são mais fáceis de distinguir. STR_CONFIG_SETTING_LANDSCAPE :Terreno: {STRING} STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT :O terreno define a jogabilidade básica com diferentes cargas e requerimentos para o crescimento das cidades. NewGRF's e Scripts de Jogo permitem um controle mais fino @@ -1373,6 +1373,8 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Desligado STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Mover a tela com o botão esquerdo: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Ativa rolamento do mapa por clique e arraste com o botão esquerdo. Especialmente útil ao usar um touchscreen para o rolamento +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Fechar janela com botão direito do mouse: {STRING} +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Fecha uma janela ao clicar com o botão direito do mouse nela. Desativa o tooltip com o botão direito! STR_CONFIG_SETTING_AUTOSAVE :Auto-salvar: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Selecione intervalo entre jogos salvos automaticamente @@ -1536,12 +1538,12 @@ STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI_HELPTEXT :Exibe uma janel STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE :Tipo de sinal a ser construído: {STRING} STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE_HELPTEXT :Tipo padrão de sinal a se utilizar STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL :Normal -STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS :Avançado -STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY :Avançado de mão única +STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS :De trajeto +STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY :De trajeto de mão única STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES :Tipo de sinal a ser exibido: {STRING} STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT :Seleciona quais tipos de sinal a exibir, quando Ctrl+Clicar em Construir Sinais com a ferramenta Sinal STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL :Normal apenas -STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS :Avançados apenas +STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS :De trajeto apenas STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL :Todos STR_CONFIG_SETTING_TOWN_LAYOUT :Disposição de ruas para novas cidades: {STRING} @@ -1762,6 +1764,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Checar p STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Exibe configurações de IA e script do jogo STR_INTRO_TOOLTIP_QUIT :{BLACK}Sair do 'OpenTTD' +STR_INTRO_BASESET :{BLACK}Faltam {NUM} "sprite{P "" s}" no conjunto de gráficos base selecionado. Por favor verifique se há atualizações para ele. STR_INTRO_TRANSLATION :{BLACK}Faltam {NUM} string{P "" s} nessa tradução. Por favor faça o OpenTTD melhor se inscrevendo como tradutor. Leia Readme.txt para mais detalhes. # Quit window @@ -2358,14 +2361,14 @@ STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Sinais p STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Sinal de Entrada (semáforo){}Verde enquanto haja um ou mais sinais de saída verdes na atual seção dos trilhos. Do contrário, mostra vermelho STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Sinal de saída (semáforo){}Funciona como um sinal normal, porém é necessário para o funcionamento correto do sistema de pré-sinais combo ou de entrada STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Sinal combo (semáforo){}O sinal combo funciona tanto como um sinal de entrada quanto de saída. Permite construir várias ramificações -STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Sinal avançado(Semáforo){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo -STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Sinal avançado de mão única(Semáforo){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo, porém não permite a passagem na via contrária +STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Sinal de trajeto(Semáforo){}Um sinal de trajeto permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal de trajeto já permite a passada do próximo +STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Sinal de trajeto de mão única(Semáforo){}Um sinal de trajeto permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal de trajeto já permite a passada do próximo, porém não permite a passagem na via contrária STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Sinal Padrão (elétrico){}Sinais são necessários para impedir que trens batam em redes de ferrovias com mais de uma máquina STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Sinal de Entrada (elétrico){}Verde enquanto haja um ou mais sinais de saída verdes na atual seção dos trilhos. Do contrário, mostra vermelho STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Sinal de saída(elétrico){}Funciona como um sinal normal, porém é necessário para o funcionamento correto do sistema de pré-sinais combo ou de entrada STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Sinal Combo (elétrico){}O sinal combo funciona tanto como um sinal de entrada quanto de saída. Permite construir várias ramificações de pré-sinais -STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Sinal de trajeto(Elétrico){}Um sinal de trajeto permite mais de um trem entrar em um bloco de sinal ao mesmo tempo, se o trem puder reservar um trajeto para um ponto seguro de parada. Sinais de trajeto padrões podem ser passados pelo lado de trás -STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Sinal avançado de mão única(Elétrico){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo, porém não permite a passagem na via contrária +STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Sinal de trajeto (Elétrico){}Um sinal de trajeto permite mais de um trem entrar em um bloco de sinal ao mesmo tempo, se o trem puder reservar um trajeto para um ponto seguro de parada. Sinais de trajeto padrões podem ser passados pelo lado de trás +STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Sinal avançado de mão única(Elétrico){}Um sinal de trajeto permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal de trajeto já permite a passada do próximo, porém não permite a passagem na via contrária STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Converter sinal{}Quando selecionado, clicar num sinal existente converte-o para o tipo selecionado e suas variantes. Ctrl+Clique muda a variante atual. Shift+Clique mostra o preço estimado da conversão STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Densidade dos sinais ao clicar e arrastar STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Diminuir a densidade dos sinais @@ -2590,6 +2593,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Nome da STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Carga aceita: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) +STR_LANG_AREA_INFORMATION_RAIL_TYPE :{BLACK}Tipo de ferrovia: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Velocidade limite do trilho: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Limite de velocidade da rua: {LTBLUE}{VELOCITY} @@ -2602,29 +2606,29 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS :Campos STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND :Neve STR_LAI_CLEAR_DESCRIPTION_DESERT :Deserto -STR_LAI_RAIL_DESCRIPTION_TRACK :Trilho de Ferrovia -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Trilho de Ferrovia com sinais normais -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :Trilho de Ferrovia com pré-sinais -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Trilho de Ferrovia com sinais de saída -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :Trilho de Ferrovia com sinais-combo -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Trilho de Ferrovia com sinais avançados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Trilhos de Ferrovia com sinais avançados de mão única -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :Trilho de Ferrovia com sinais normais e pré-sinais -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :Trilho de Ferrovia com sinais normais e pré-sinais -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Trilho de Ferrovia com sinais normais e sinais-combo -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Trilho de Ferrovia com sinais normais e avançados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Trilho de Ferrovia com sinais normais e avançados de mão única -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :Trilho de Ferrovia com pré-sinais e de saída -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :Trilho de Ferrovia com pré-sinais e sinais-combo -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :Trilho de Ferrovia com pré-sinais e sinais avançados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :Trilho de Ferrovia com pré-sinais e avançados de mão única -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :Trilho de Ferrovia com sinais de saída e sinais-combo -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Trilho de Ferrovia com sinais de saída e avançados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Trilho de Ferrovia com sinais de saída e avançados de mão única -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Trilho de Ferrovia com sinais-combo e avançados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Trilho de Ferrovia com sinais-combo e avançados de mão única -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Trilho de Ferrovia com sinais avançados e avançados de mão única -STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :Depósito de Ferrovia +STR_LAI_RAIL_DESCRIPTION_TRACK :Trilho de ferrovia +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Trilho de ferrovia com sinais normais +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :Trilho de ferrovia com pré-sinais +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Trilho de ferrovia com sinais de saída +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :Trilho de ferrovia com sinais-combo +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Trilho de ferrovia com sinais de trajeto +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Trilhos de Ferrovia com sinais de trajeto de mão única +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :Trilho de ferrovia com sinais normais e pré-sinais +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :Trilho de ferrovia com sinais normais e pré-sinais +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Trilho de ferrovia com sinais normais e sinais-combo +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Trilho de ferrovia com sinais normais e de trajeto +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Trilho de ferrovia com sinais normais e de trajeto de mão única +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :Trilho de ferrovia com pré-sinais e de saída +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :Trilho de ferrovia com pré-sinais e sinais-combo +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :Trilho de ferrovia com pré-sinais e sinais de trajeto +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :Trilho de ferrovia com pré-sinais de trajeto e de mão única +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :Trilho de ferrovia com sinais de saída e sinais-combo +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Trilho de ferrovia com sinais de saída e de trajeto +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Trilho de ferrovia com sinais de saída de trajeto e de mão única +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Trilho de ferrovia com sinais-combo e de trajeto +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Trilho de ferrovia com sinais-combo de trajeto e de mão única +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Trilho de ferrovia com sinais de trajeto normais e de mão única +STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :Depósito de ferrovia STR_LAI_ROAD_DESCRIPTION_ROAD :Rodovia STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS :Rodovia iluminada @@ -3293,6 +3297,11 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Requer: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Requer: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necessita +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}aguardando +STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produz: {YELLOW}{STRING}{STRING} @@ -3361,6 +3370,10 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Remover todos o STR_GROUP_RENAME_CAPTION :{BLACK}Renomear um grupo +STR_GROUP_PROFIT_THIS_YEAR :Lucros deste ano: +STR_GROUP_PROFIT_LAST_YEAR :Lucros do ano passado: +STR_GROUP_OCCUPANCY :Uso atual: +STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Novos Veículos Ferroviários @@ -3393,6 +3406,7 @@ STR_PURCHASE_INFO_ALL_TYPES :Todos as cargas STR_PURCHASE_INFO_ALL_BUT :Todas menos {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Tração máx : {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Alcance: {GOLD}{COMMA} quadrados +STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Tipo de aeronave: {GOLD}{STRING} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Lista de trens - clique num trem para informações. Cltr+Clique para alterar a visibilidade do tipo de trem STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Lista de automóveis - clique num automóvel para informações. Cltr+Clique para alterar a visibilidade do tipo de automóvel @@ -3527,6 +3541,10 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :locomotiva magl STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Preço: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade: {VELOCITY} Potência: {POWER}{}Custo de manutenção: {CURRENCY_LONG}/ano{}Capacidade: {CARGO_LONG} STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Preço: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Vel.: {VELOCITY} Potência: {POWER} Tração Máx: {6:FORCE}{}Custo de manutenção: {4:CURRENCY_LONG}/yr{}Capacidade: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Preço: {CURRENCY_LONG} Vel. Max.: {VELOCITY}{}Capacidade: {CARGO_LONG}{}Custo de manuteção: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Vel Máx.: {VELOCITY}{}Tipo de aeronave: {STRING}{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Custo de oper.: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Vel Máx.: {VELOCITY}{}Tipo de aeronave: {STRING}{}Capacidade: {CARGO_LONG}{}Custo de oper.: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Vel. Máx.: {VELOCITY}{}Tipo de aeronave: {STRING} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Custo de oper.: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Vel. Máx.: {VELOCITY}{}Tipo de aeronave: {STRING} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}{}Custo de oper.: {CURRENCY_LONG}/ano # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituir {STRING} - {STRING} @@ -3556,6 +3574,7 @@ STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Pression STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}Troca entre substituir máquinas e substituir vagões STR_REPLACE_ENGINES :Motores STR_REPLACE_WAGONS :Vagões +STR_REPLACE_ALL_RAILTYPE :Todos os veículos ferroviários STR_REPLACE_HELP_RAILTYPE :{BLACK}Escolha o tipo de ferrovia para o qual deseja efetuar a substituição dos motores STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Exibe o tipo de motor que substituirá o que está selecionado à esquerda, se algum @@ -3648,6 +3667,8 @@ STR_VEHICLE_INFO_AGE :{COMMA} ano{P " STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} ano{P "" s} ({COMMA}) STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Velocidade Max: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}Vel. Máx.: {LTBLUE}{VELOCITY} {BLACK}Tipo de aeronave: {LTBLUE}{STRING} +STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE :{BLACK}Vel. Máx.: {LTBLUE}{VELOCITY} {BLACK}Tipo de aeronave: {LTBLUE}{STRING} {BLACK}Alcance: {LTBLUE}{COMMA} quadrados STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Força: {LTBLUE}{POWER}{BLACK} Velocidade Max: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Força: {LTBLUE}{POWER}{BLACK} Velocidade Max: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE} @@ -3778,7 +3799,7 @@ STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Percentual carr STR_ORDER_CONDITIONAL_RELIABILITY :Confiabilidade STR_ORDER_CONDITIONAL_MAX_SPEED :Velocidade máxima STR_ORDER_CONDITIONAL_AGE :Idade (anos) -STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Necessia de manutenção +STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Necessita de manutenção STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Sempre STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Tempo de vida restante (anos) diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 13e90746c5..72f9b33cdd 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -572,7 +572,7 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Zumirano do kra STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT :Standardno zumiranje slike zaslona STR_ABOUT_MENU_GIANT_SCREENSHOT :Slika zaslona cijele karte STR_ABOUT_MENU_ABOUT_OPENTTD :O 'OpenTTD' -STR_ABOUT_MENU_SPRITE_ALIGNER :Poravnjanje sprite-a +STR_ABOUT_MENU_SPRITE_ALIGNER :Poravnanje spritea STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Odaberi granične okvire STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Mijenjaj boju blatnih blokova ############ range ends here @@ -778,7 +778,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK :{BLACK}Klikni n STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK :{BLACK}Klikni na glazbenu traku kako bi ju uklonio iz trenutnog programa (samo Proizvoljno 1 ili Proizvoljno 2) # Highscore window -STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED :{BIG_FONT}{BLACK}Najbolje tvrtke koje su dosigle razinu {NUM} +STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED :{BIG_FONT}{BLACK}Najbolje tvrtke do {NUM}. godine STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME :{BIG_FONT}{BLACK}Tablica tvrtki u {NUM} STR_HIGHSCORE_POSITION :{BIG_FONT}{BLACK}{COMMA}. STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN :Privrednik @@ -962,13 +962,13 @@ STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} od sada prihvaća {STRING.aku} STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} od sada prihvaća {STRING.aku} i {STRING.aku} -STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Istekla je ponuda subvencije:{}{}prijevoz {STRING.gen} od {STRING} do {STRING} više neće biti subvencioniran +STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Istekla je ponuda za poticaje:{}{}prijevoz {STRING.gen} od {STRING} do {STRING} više neće biti potican STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvencija je povučena:{}{}prijevoz {STRING.gen} od {STRING} do {STRING} više nije subvencioniran -STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Ponuđena je subvencija:{}{}Prvi koji preveze {STRING.aku} od {STRING} do {STRING} primat će jednogodišnju subvenciju od lokalne samouprave! +STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Ponuđen je poticaj:{}{}Prvi koji preveze {STRING.aku} od {STRING} do {STRING} primat će jednogodišnji poticaj lokalne samouprave! STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Subvencija je dodijeljena tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STRING} do postaje {STRING} plaćat će se 50% više sljedećih godinu dana! STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}Subvencija je dodijeljena tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STRING} do postaje {STRING} plaćat će se dvostruko sljedećih godinu dana! -STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}Subvencija je dodijeljena tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STRING} do postaje {STRING} plaćat će se trostruko sljedećih godinu dana! -STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Subvencija je dodijeljena tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STRING} do postaje {STRING} plaćat će se četverostruko sljedećih godinu dana! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}Poticaj je dodijeljen tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STRING} do postaje {STRING} plaćat će se trostruko sljedećih godinu dana! +STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}Poticaj je dodijeljen tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STRING} do postaje {STRING} plaćat će se četverostruko sljedećih godinu dana! STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK}Grad {TOWN} zahvatio je prometni kaos!{}{}Program rekonstrukcije cesta koji financira tvrtka {STRING} sljedećih će 6 mjeseci zadavati glavobolje motoriziranima! STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Monopol transporta! @@ -1245,7 +1245,7 @@ STR_CONFIG_SETTING_CONSTRUCTION_SPEED :Brzina gradnje: STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT :Limitiraj količinu građevinskih akcija za UI-je STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS :Kvarovi vozila: {STRING} STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :Kontroliraj kako često se mogu pokvariti loše servisirana vozila -STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER :Množitelj za subvencije: {STRING} +STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER :Množitelj za poticaje: {STRING} STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT :Postavi koliko se plaća za subvencionirane veze STR_CONFIG_SETTING_CONSTRUCTION_COSTS :Građevinski troškovi: {STRING} STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT :Postavi razinu građevinskih troškova i troškova kupnje @@ -1385,9 +1385,9 @@ STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Debljina linija STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Debljina linije u grafikonima. Tanja linija je preciznija za čitanje, deblja linija je lakša za vidjeti i boje su lakše za razabrati STR_CONFIG_SETTING_LANDSCAPE :Krajolik: {STRING} -STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT :Tereni definiraju osnovne scenarije za igru sa različitim teretima i preduvjetima za rast gradova. NewGRF-ovi i Skripte Igre dozvoljavaju detaljnije kontrole i postavke. +STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT :Tereni određuju osnovne scenarije za igru s različitim teretima i preduvjetima za rast gradova. NewGRF-ovi i Skripte Igre omogućavaju detaljnije kontrole i postavke. STR_CONFIG_SETTING_LAND_GENERATOR :Generator zemlje: {STRING} -STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT :Originalni generator ovisi o baznom grafičkom setu i stvara fiksne oblike u terenu. TerraGenesis je generator baziran na Perlinu sa detaljnijim kontrolama i postavkama. +STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT :Izvorni generator ovisi o osnovnom grafičkom setu i stvara fiksne oblike terena. TerraGenesis je generator temeljen na Perlinovom šumu s detaljnijim kontrolama i postavkama. STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL :Izvorni STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis STR_CONFIG_SETTING_TERRAIN_TYPE :Vrsta terena: {STRING} @@ -1580,17 +1580,17 @@ STR_CONFIG_SETTING_DISABLE_ELRAILS_HELPTEXT :Uključivanjem STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OWN :Dolazak prvog vozila na postaju igrača: {STRING} STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OWN_HELPTEXT :Prikaži novine kada prvo vozilo dođe na stanicu novog igrača STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER :Dolazak prvog vozila na postaju suparnika: {STRING} -STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER_HELPTEXT :Prikaži novine kada prvo vozilo dođe na suparnikovu stanicu +STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER_HELPTEXT :Prikaži novosti kada prvo vozilo dođe na protivničku postaju STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS :Nesreće / katastrofe: {STRING} STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS_HELPTEXT :Prikaži novine kod nesreća ili katastrofa STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION :Podaci vezani za tvrtku: {STRING} -STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION_HELPTEXT :Prikaži novine kada se pojavi nova tvrtka ili kada tvrtke riskiraju bankrot +STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION_HELPTEXT :Prikaži novosti kada se pojavi nova tvrtka ili kada tvrtke riskiraju bankrot STR_CONFIG_SETTING_NEWS_INDUSTRY_OPEN :Otvaranje industrije: {STRING} STR_CONFIG_SETTING_NEWS_INDUSTRY_OPEN_HELPTEXT :Prikaži novine kada se nove industrije otvaraju STR_CONFIG_SETTING_NEWS_INDUSTRY_CLOSE :Zatvaranje industrije: {STRING} -STR_CONFIG_SETTING_NEWS_INDUSTRY_CLOSE_HELPTEXT :Prikaži novine kada se industrije zatvaraju -STR_CONFIG_SETTING_NEWS_ECONOMY_CHANGES :Promjene u gospodarstvu: {STRING} -STR_CONFIG_SETTING_NEWS_ECONOMY_CHANGES_HELPTEXT :Prikaži novine vezano za globalne promjene u ekonomiji +STR_CONFIG_SETTING_NEWS_INDUSTRY_CLOSE_HELPTEXT :Prikaži novosti kada se industrije zatvaraju +STR_CONFIG_SETTING_NEWS_ECONOMY_CHANGES :Gospodarske promjene: {STRING} +STR_CONFIG_SETTING_NEWS_ECONOMY_CHANGES_HELPTEXT :Prikaži novosti vezane za globalne gospodarske promjene STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_COMPANY :Promjene u proizvodnji industrija koje opslužuje tvrtka: {STRING} STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_COMPANY_HELPTEXT :Prikaži novine kod promjene proizvodnih razina industrija koje tvrtka opslužuje STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_OTHER :Promjene u proizvodnji industrija koje opslužuju suparnici: {STRING} @@ -1602,11 +1602,11 @@ STR_CONFIG_SETTING_NEWS_ADVICE_HELPTEXT :Prikaži poruke STR_CONFIG_SETTING_NEWS_NEW_VEHICLES :Nova vozila: {STRING} STR_CONFIG_SETTING_NEWS_NEW_VEHICLES_HELPTEXT :Prikaži novine kada neki novi tip vozila postane dostupan STR_CONFIG_SETTING_NEWS_CHANGES_ACCEPTANCE :Promjene u prihvaćanju tereta: {STRING} -STR_CONFIG_SETTING_NEWS_CHANGES_ACCEPTANCE_HELPTEXT :Prikaži poruke o stanicama koje mijenjaju prihvaćanje nekih tereta +STR_CONFIG_SETTING_NEWS_CHANGES_ACCEPTANCE_HELPTEXT :Prikaži poruke o postajama koje mijenjaju prihvaćanje nekih tereta STR_CONFIG_SETTING_NEWS_SUBSIDIES :Subvencije: {STRING} -STR_CONFIG_SETTING_NEWS_SUBSIDIES_HELPTEXT :Prikaži novine vezano za događaje o subvencijama +STR_CONFIG_SETTING_NEWS_SUBSIDIES_HELPTEXT :Prikaži novosti vezane za poticaje STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION :Opće informacije: {STRING} -STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION_HELPTEXT :Prikaži novine vezano za opće događaje kao za kupnju ekskluzivnih prava ili financiranje rekonstrukcije cesta +STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION_HELPTEXT :Prikaži novosti vezane za opće događaje kao što su kupnja ekskluzivnih prava ili financiranje rekonstrukcije cesta STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Isključeno STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sažetak @@ -1615,7 +1615,7 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Sve STR_CONFIG_SETTING_COLOURED_NEWS_YEAR :Vijesti u boji pojavljuju se: {STRING} STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT :Godina u kojoj će se novine početi izdavati u boji. Prije ove godine, koriste se crno/bijele novine STR_CONFIG_SETTING_STARTING_YEAR :Početna godina: {STRING} -STR_CONFIG_SETTING_SMOOTH_ECONOMY :Uključi tečnu ekonomiju (više manjih izazova): {STRING} +STR_CONFIG_SETTING_SMOOTH_ECONOMY :Uključi stabilno gospodarstvo (više manjih izazova): {STRING} STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT :Kada je uključeno, promjene u industrijskoj proizvodnji su češće ali u manjim rasponima. Ova postavka obično nema efekta ukoliko su industrije postavljene iz nekog NewGRF-a STR_CONFIG_SETTING_ALLOW_SHARES :Dopusti kupovanje udjela u drugim tvrtkama: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Kada je uključeno, dopušta se kupnja i prodaja dionica tvrtki. Dionice će postati dostupne samo za tvrtke određene starosti @@ -1651,11 +1651,11 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM :Nasumično STR_CONFIG_SETTING_ALLOW_TOWN_ROADS :Gradovi mogu graditi ceste: {STRING} STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT :Dopusti gradovima građenje cesta u svrhu rasta. Isključi za sprečavanje gradskih vlasti u samostalnoj gradnji cesta STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS :Gradovi smiju graditi pružne prijelaze: {STRING} -STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT :Uključivanje ove postavke dozvoljava se gradovima da grade cestovno-pružne prijelaze +STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT :Uključivanje ove postavke dopušta gradovima izgradnju cestovno-pružnih prijelaza STR_CONFIG_SETTING_NOISE_LEVEL :Omogući određivanje razine buke za zračne luke od strane gradova: {STRING} STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT :Kada je ova postavka isključena, mogu postojati dvije zračne luke u svakom gradu. Kada je ova postavka uključena, broj zračnih luka u nekom gradu je ograničen količinom dopuštene buke u gradu, koja ovisi o broju stanovnika i udaljenosti i veličini zračne luke STR_CONFIG_SETTING_TOWN_FOUNDING :Osnivanje gradova tijekom igre: {STRING} -STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Uklučivanje ove postavke dozvoljava igračima osnivanje novih gradova tijekom igre +STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Uklučivanje ove postavke dopušta igračima osnivanje novih gradova tijekom igre STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN :Zabranjeno STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Dopušteno STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Dopušteno, proizvoljan raspored grada @@ -1882,8 +1882,8 @@ STR_OSNAME_SUNOS :SunOS # Abandon game STR_ABANDON_GAME_CAPTION :{WHITE}Napusti igru -STR_ABANDON_GAME_QUERY :{YELLOW}Jesi li siguran da želiš napustiti ovu igru? -STR_ABANDON_SCENARIO_QUERY :{YELLOW}Jesi li siguran da želiš napustiti ovaj scenarij? +STR_ABANDON_GAME_QUERY :{YELLOW}Doista želiš napustiti ovu igru? +STR_ABANDON_SCENARIO_QUERY :{YELLOW}Doista želiš napustiti ovaj scenarij? # Cheat window STR_CHEATS :{WHITE}Varanje @@ -2377,7 +2377,7 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Namjesti STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Učini objekte nevidljivima umjesto prozirnima # Linkgraph legend window -STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Legenda protoka tereta +STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Kazalo protoka tereta STR_LINKGRAPH_LEGEND_ALL :{BLACK}Sve STR_LINKGRAPH_LEGEND_NONE :{BLACK}Ništa STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Odaberi tvrtke koje će se prikazati @@ -2452,13 +2452,13 @@ STR_STATION_CLASS_WAYP :Čvorišta # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Izbornik signala -STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Standardni signal (semafor){}Ovo je najosnovnija vrsta signala, dozvoljava istovremeno samo jedan vlak u bloku +STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Standardni signal (semafor){}Ovo je najosnovnija vrsta signala, dopušta istovremeno samo jedan vlak u bloku STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Ulazni signal (semafor){}Zeleno sve dok je jedan ili više zelenih izlaznih signala na sljedećem dijelu pruge. U protivnom pokazuje crveno STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Izlazni signal (semafor){}Ponaša se na isti način kao i normalni signali, ali je nužno pogoditi točnu boju na ulaznim i kombo pred-signalima STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Kombo signal (semafor){}Kombo signal jednostavno radi kao ulazni i izlazni signal. Ovo omogućava izgradnju velike "mreže" pred-signala. STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Putni signal (semafor){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Standardne putne signale moguće je proći iz suprotnog smjera. STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Jednosmjerni putni signal (semafor){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Jednosmjerne putne signale nije moguće proći iz suprotnog smjera -STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Standardni signal (električni){}Ovo je najosnovnija vrsta signala, dozvoljava istovremeno samo jedan vlak u bloku +STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Standardni signal (električni){}Ovo je najosnovnija vrsta signala, istovremeno dopušta samo jedan vlak u bloku STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Ulazni signal (električni){}Zeleno sve dok je jedan ili više zelenih izlaznih signala na sljedećem dijelu pruge. U protivnom pokazuje crveno STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Izlazni signal (električni){}Ponaša se na isti način kao i normalni signali, ali je nužno pogoditi točnu boju na ulaznim i kombo pred-signalima. STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Kombo signal (električni){}Kombo signal jednostavno radi kao ulazni i izlazni signal. Ovo omogućava izgradnju velike "mreže" pred-signala. @@ -2572,7 +2572,7 @@ STR_STATION_BUILD_NOISE :{BLACK}Proizved STR_LANDSCAPING_TOOLBAR :{WHITE}Uređivanje krajolika STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Snizi jedan kut zemlje. Povlačenje snižava prvi odabrani kut i poravnava selektirano područje na novu visinu prvog kuta. Ctrl selektira područje dijagonalno. Shift mijenja prikaz građenje/procjena troškova. STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Podigni jedan kut zemlje. Povlačenje podiže prvi odabrani kut i poravnava selektirano područje na novu visinu prvog kuta. Ctrl selektira područje dijagonalno. Shift mijenja prikaz građenje/procjena troškova. -STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Poravnaj područje zemlje na visinu prvog odabranog kuta. Ctrl selektira područje dijagonalno. Shift mijenja prikaz građenje/procjena troškova. +STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Izravnaj zemlju na visinu prvog odabranog kuta. Ctrl odabire područje dijagonalno. Shift mijenja prikaz građenje/procjena troškova. STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Kupi zemlju za buduću uporabu. Shift mijenja prikaz građenje/procjena troškova. # Object construction window From 43aa17958626875a899a8e6f18333acac1809c9d Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sat, 9 Dec 2017 19:21:41 +0000 Subject: [PATCH 10/58] (svn r27934) -Fix (r27900): Warning about unsigned unary minus. --- src/window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/window.cpp b/src/window.cpp index 2ce1124ed9..f4b7a1ca18 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1682,7 +1682,7 @@ static Point GetAutoPlacePosition(int width, int height) * of the closebox */ int left = rtl ? _screen.width - width : 0, top = toolbar_y; - int offset_x = rtl ? -NWidgetLeaf::closebox_dimension.width : NWidgetLeaf::closebox_dimension.width; + int offset_x = rtl ? -(int)NWidgetLeaf::closebox_dimension.width : (int)NWidgetLeaf::closebox_dimension.width; int offset_y = max(NWidgetLeaf::closebox_dimension.height, FONT_HEIGHT_NORMAL + WD_CAPTIONTEXT_TOP + WD_CAPTIONTEXT_BOTTOM); restart: From 5116bb5ad1609d77ca88bde70e61220d26d20331 Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sat, 9 Dec 2017 19:21:45 +0000 Subject: [PATCH 11/58] (svn r27935) -Fix [FS#6629]: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update. --- src/video/win32_v.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 4a9861b643..23794cb321 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -34,6 +34,10 @@ #define MAPVK_VK_TO_CHAR (2) #endif +#ifndef PM_QS_INPUT +#define PM_QS_INPUT 0x20000 +#endif + static struct { HWND main_wnd; HBITMAP dib_sect; @@ -737,7 +741,6 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP case WM_MOUSEMOVE: { int x = (int16)LOWORD(lParam); int y = (int16)HIWORD(lParam); - POINT pt; /* If the mouse was not in the window and it has moved it means it has * come into the window, so start drawing the mouse. Also start @@ -747,7 +750,18 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, (TIMERPROC)TrackMouseTimerProc); } - if (_cursor.UpdateCursorPosition(x, y, true)) { + if (_cursor.fix_at) { + /* Get all queued mouse events now in case we have to warp the cursor. In the + * end, we only care about the current mouse position and not bygone events. */ + MSG m; + while (PeekMessage(&m, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE | PM_NOYIELD | PM_QS_INPUT)) { + x = (int16)LOWORD(m.lParam); + y = (int16)HIWORD(m.lParam); + } + } + + if (_cursor.UpdateCursorPosition(x, y, false)) { + POINT pt; pt.x = _cursor.pos.x; pt.y = _cursor.pos.y; ClientToScreen(hwnd, &pt); From 432edcd4a526dbb29f8e488fc55eb57dd1c5d31e Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 10 Dec 2017 13:45:53 +0000 Subject: [PATCH 12/58] (svn r27936) -Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain. --- src/train_gui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/train_gui.cpp b/src/train_gui.cpp index 4724fb98ab..51e772b520 100644 --- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -64,14 +64,14 @@ static int HighlightDragPosition(int px, int max_width, VehicleID selection, boo bool rtl = _current_text_dir == TD_RTL; assert(selection != INVALID_VEHICLE); - int dragged_width = WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; + int dragged_width = 0; for (Train *t = Train::Get(selection); t != NULL; t = chain ? t->Next() : (t->HasArticulatedPart() ? t->GetNextArticulatedPart() : NULL)) { dragged_width += t->GetDisplayImageWidth(NULL); } - int drag_hlight_left = rtl ? max(px -dragged_width, 0) : px; - int drag_hlight_right = rtl ? px : min(px + dragged_width, max_width); - int drag_hlight_width = max(drag_hlight_right - drag_hlight_left, 0); + int drag_hlight_left = rtl ? max(px - dragged_width + 1, 0) : px; + int drag_hlight_right = rtl ? px : min(px + dragged_width, max_width) - 1; + int drag_hlight_width = max(drag_hlight_right - drag_hlight_left + 1, 0); if (drag_hlight_width > 0) { GfxFillRect(drag_hlight_left + WD_FRAMERECT_LEFT, WD_FRAMERECT_TOP + 1, From c2cddb4cc4c0aff94b3736f4177039b9bb788d5f Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 10 Dec 2017 13:48:06 +0000 Subject: [PATCH 13/58] (svn r27937) -Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end. --- src/depot_gui.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index 15291f6b63..3253dacffa 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -384,11 +384,11 @@ struct DepotWindow : Window { int image_left = rtl ? r.left + this->count_width : r.left + this->header_width; int image_right = rtl ? r.right - this->header_width : r.right - this->count_width; if (rtl) { - for (int x = image_right - w; x > image_left; x -= w) { + for (int x = image_right - w; x >= image_left; x -= w) { GfxDrawLine(x, r.top, x, r.bottom, col, 1, 3); } } else { - for (int x = image_left + w; x < image_right; x += w) { + for (int x = image_left + w; x <= image_right; x += w) { GfxDrawLine(x, r.top, x, r.bottom, col, 1, 3); } } @@ -734,7 +734,8 @@ struct DepotWindow : Window { } /* Always have 1 empty row, so people can change the setting of the train */ this->vscroll->SetCount(this->vehicle_list.Length() + this->wagon_list.Length() + 1); - this->hscroll->SetCount(max_width); + /* Always make it longer than the longest train, so you can attach vehicles at the end, and also see the next vertical tile separator line */ + this->hscroll->SetCount(max_width + ScaleGUITrad(2 * VEHICLEINFO_FULL_VEHICLE_WIDTH + 1)); } else { this->vscroll->SetCount(CeilDiv(this->vehicle_list.Length(), this->num_columns)); } From b34418ae601e07105d47b863b53bcae3df96401f Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 10 Dec 2017 13:48:49 +0000 Subject: [PATCH 14/58] (svn r27938) -Fix (r27899): When scrolling in the train depot, also scroll the tile separators. --- src/depot_gui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index 3253dacffa..14461d8817 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -383,12 +383,13 @@ struct DepotWindow : Window { int col = _colour_gradient[wid->colour][4]; int image_left = rtl ? r.left + this->count_width : r.left + this->header_width; int image_right = rtl ? r.right - this->header_width : r.right - this->count_width; + int first_line = w + (-this->hscroll->GetPosition()) % w; if (rtl) { - for (int x = image_right - w; x >= image_left; x -= w) { + for (int x = image_right - first_line; x >= image_left; x -= w) { GfxDrawLine(x, r.top, x, r.bottom, col, 1, 3); } } else { - for (int x = image_left + w; x <= image_right; x += w) { + for (int x = image_left + first_line; x <= image_right; x += w) { GfxDrawLine(x, r.top, x, r.bottom, col, 1, 3); } } From de4b1e80f69c37d1f45ba8736f985afa6839a66d Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 14 Dec 2017 18:45:41 +0000 Subject: [PATCH 15/58] (svn r27944) -Update from Eints: spanish (mexican): 1 change by Absay --- src/lang/spanish_MX.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 11e2c22f12..b3cc389015 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -1134,7 +1134,7 @@ STR_CONFIG_SETTING_COMPANIES_ALL :Todas las empre STR_CONFIG_SETTING_NONE :Ninguno STR_CONFIG_SETTING_ORIGINAL :Original -STR_CONFIG_SETTING_REALISTIC :Simulado +STR_CONFIG_SETTING_REALISTIC :Realista STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT :Izquierda STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER :Centro From 3db395700db909cfb03c7ded010440df502a5544 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 20 Dec 2017 18:45:39 +0000 Subject: [PATCH 16/58] (svn r27945) -Update from Eints: spanish (mexican): 3 changes by Absay --- src/lang/spanish_MX.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index b3cc389015..6be5732cf4 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3949,8 +3949,8 @@ STR_TIMETABLE_CLEAR_SPEED_TOOLTIP :{BLACK}Borrar e STR_TIMETABLE_RESET_LATENESS :{BLACK}Reiniciar retrasos STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Reiniciar el contador del retraso para que el vehículo vaya a tiempo -STR_TIMETABLE_AUTOFILL :{BLACK}Rellenar automáticamente -STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Rellenar la tabla de itinerarios automáticamente con los valores del siguiente recorrido (Ctrl+Clic para intentar mantener los tiempos de espera) +STR_TIMETABLE_AUTOFILL :{BLACK}Llenar automáticamente +STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Llenar la tabla de itinerarios automáticamente con los valores del siguiente recorrido (Ctrl+Clic para intentar mantener los tiempos de espera) STR_TIMETABLE_EXPECTED :{BLACK}Esperado STR_TIMETABLE_SCHEDULED :{BLACK}Programado @@ -4584,7 +4584,7 @@ STR_SV_STNAME_TRANSFER :Transferencia { STR_SV_STNAME_HALT :Parada {STRING} STR_SV_STNAME_VALLEY :Valle de {STRING} STR_SV_STNAME_HEIGHTS :Altos de {STRING} -STR_SV_STNAME_WOODS :Alameda de {STRING} +STR_SV_STNAME_WOODS :Bosques de {STRING} STR_SV_STNAME_LAKESIDE :Lago de {STRING} STR_SV_STNAME_EXCHANGE :Intercambio {STRING} STR_SV_STNAME_AIRPORT :Aeropuerto de {STRING} From cd71c1af3a6e3ca8ce890d30ff4adddeb3d37583 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 21 Dec 2017 18:45:38 +0000 Subject: [PATCH 17/58] (svn r27946) -Update from Eints: spanish (mexican): 1 change by Absay --- src/lang/spanish_MX.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 6be5732cf4..279d4cc5b5 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3271,7 +3271,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY :{WHITE}Tranvía STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT :{GOLD}Casillas de agua: STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS :{WHITE}Canales STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT :{GOLD}Estaciones: -STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Casillas de estación +STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Casillas de estaciones STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Aeropuertos STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL :{WHITE}{CURRENCY_LONG}/año From 61c2f6ff9db23449d0f304b51a539907468eaadc Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 22 Dec 2017 18:45:39 +0000 Subject: [PATCH 18/58] (svn r27947) -Update from Eints: spanish (mexican): 1 change by Absay --- src/lang/spanish_MX.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 279d4cc5b5..c87c275678 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3097,7 +3097,7 @@ STR_STORY_BOOK_NEXT_PAGE_TOOLTIP :{BLACK}Ir a la STR_STORY_BOOK_INVALID_GOAL_REF :{RED}Referencia a objetivos no válida # Station list window -STR_STATION_LIST_TOOLTIP :{BLACK}Nombres de estación: Clic en un nombre para centrar la vista principal en la estación. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_STATION_LIST_TOOLTIP :{BLACK}Nombres de estaciones: Clic en un nombre para centrar la vista principal en la estación. Ctrl+Clic abre una ventana de vista en dicha ubicación STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE :{BLACK}Mantener pulsado Ctrl para seleccionar más de un elemento STR_STATION_LIST_CAPTION :{WHITE}{COMPANY}: {COMMA} estaci{P ón ones} STR_STATION_LIST_STATION :{YELLOW}{STATION} {STATION_FEATURES} From 54040bd31ac537f7f8e8cbfb0262228e8822aff9 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 24 Dec 2017 12:18:36 +0000 Subject: [PATCH 19/58] (svn r27950) -Merge: Documentation updates from 1.7 branch --- changelog.txt | 91 +++++++++++++++++++++++++++++++ os/debian/changelog | 36 ++++++++++++ src/script/api/ai_changelog.hpp | 2 +- src/script/api/game_changelog.hpp | 2 +- 4 files changed, 129 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 89b3babf84..8edba15fb4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,94 @@ +1.7.2 (2017-12-24) +------------------------------------------------------------------------ +(None) + + +1.7.2-RC1 (2017-12-11) +------------------------------------------------------------------------ +- Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end (r27937) +- Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain (r27936) +- Fix: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update [FS#6629] (r27935) +- Fix: Forest, candyfloss forest and battery farm skipped the first animation frame [FS#6639] (r27932) +- Fix: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf [FS#6620] (r27915) +- Fix: 'unban' console command was not handling IPv6 adresses properly (r27914, r27913) +- Fix: Keep the 'link' between industry chain and smallmap windows whenever possible [FS#6585] (r27905) +- Fix: When the last vehicle is removed from a shared orders group, hide the 'Stop sharing' button in the vehicle orders window [FS#6593] (r27904) +- Fix: Tooltip of 'increase service interval' said 'decrease' [FS#6606] (r27895) +- Fix: Console command parser passed invalid strings to the debug output, if command lines had many parameters [FS#6576] (r27884, r27883) + + +1.7.1 (2017-06-13) +------------------------------------------------------------------------ +(None) + + +1.7.1-RC1 (2017-05-04) +------------------------------------------------------------------------ +- Fix: Add missing game script event for ships arriving at a station [FS#6560] (r27859, r27858) +- Fix: StringID truncation to 16 bits broke string remapping test [FS#6555] (r27851) +- Fix: Infinite loop in pathfinder when checking safe waiting position from a waypoint [FS#5926] (r27846) +- Fix: [YAPF] Consider depot as destination before reversing path and applying penalty (r27843) +- Fix: Don't consider locks or ship depots as clear water when placing industries (r27841) +- Fix: Small news window's fake caption was not sized to fit its text (r27838) +- Fix: Black remap did nothing in 8bpp-simple blitter (r27837) +- Fix: Misaligned resize icon due to widget bounds being inclusive (r27831) +- Fix: Update viewport sign dimensions when changing GUI zoom level (r27827, r27819) +- Fix: Vehicle viewport is not user scrollable so flag window as such (r27823) +- Fix: Allow dropdown to be drawn above origin widget even with scrollbar (r27820) +- Fix: 32bpp-anim blitters assumed that pitch and width of the screen were equal [FS#6545] (r27796) +- Fix: Chat text background overflowed due to missing padding [FS#6526] (r27794) +- Fix: Failed to load lzo compressed savegames sometimes [FS#6450] (r27793) +- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS#6366] (r27791, r27790) +- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS#6536] (r27788) +- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS#6479] (r27787, r27786) +- Fix: Buoys not always drawn after being placed depending on zoom level [FS#6508] (r27785) +- Fix: Allow rail conversion even if ship is on tile [FS#6505] (r27784) + + +1.7.0 (2017-04-01) +------------------------------------------------------------------------ +(None) + + +1.7.0-RC1 (2017-03-11) +------------------------------------------------------------------------ +- Feature: [NewGRF] Extend the DCxx range to D800-DFFF (r27769) +- Feature: [NewGRF, script] Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k (r27758) +- Feature: [NewGRF] CB 37 results 0x0401 and 0x0800-0BFF for improved control of display of input cargos in the industry GUI (r27751) +- Feature: Sprites missing in outdated basesets are now provided by openttd.grf (r27732, r27731, r27730) +- Feature: [NewGRF] String command 9A 1E to print the name of a cargo type (r27707, r27706) +- Feature: [Debug] Assign descriptive names to threads [FS#6471] (r27674, r27673, r27670) +- Feature: [NewGRF] Allow composing vehicles from multiple sprites (r27668) +- Change: Enable realistic train and road vehicle acceleration by default (r27760) +- Change: Hide the drive-in stops from the tram station picker (r27734) +- Change: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game (r27729) +- Change: Limit waypoint area by maximum station spread during dragging (r27710) +- Change: [Build] Re-enable Wnarrowing for gcc 4.9+ [FS#6532] (r27709, r27703) +- Change: List railtype of rail tiles explicitly in the tile info window (r27686) +- Change: Re-arrange the autoreplace GUI for trains, and do not filter it by railtype by default (r27683) +- Change: Various performance improvements to CargoDist and LinkGraphs (r27682, r27681, r27614, r27613, r27612, r27611) +- Change: Improve randomisation of rough land appearance (r27657) +- Change: [Build] Enable C++11 for clang 3.3 (r27654) +- Fix: Insufficient thread synchronisation when switching blitters lead to crashes [FS#6510] (r27775) +- Fix: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows [FS#5889] (r27774) +- Fix: Intro games other than the traditional nightly one would cause townname NewGRFs to not get activated in the game options [FS#5819] (r27772) +- Fix: Some variables were not reset between loading old savegames, which made loading them fail [FS#6540] (r27770) +- Fix: Removing secondary roadtypes from bridges was factor 2 too cheap [FS#6538] (r27746) +- Fix: Extra viewports did not center on the selected tile [FS#6537] (r27743) +- Fix: [Build] Building on newer OSX versions with newer SDKs [FS#6295, FS#6502] (r27727, r27675) +- Fix: Improve error message when trying to build rail track over a depot (r27726) +- Fix: Rescanning NewGRF in-game could break the loaded NewGRF, if very many NewGRF were in use (r27721) +- Fix: Text could overflow various GUI elements [FS#6527] (r27713) +- Fix: Memory leak when reloading NewGRF (r27690, r27688, r27687) +- Fix: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal [FS#6511] (r27656) +- Fix: Make the console file commands operate independent of the save/load GUI (r27645) +- Fix: When dragging vehicles in group or depot GUI, draw the complete articulated vehicle (r27632) +- Fix: When dragging multiple vehicles in the depot, make the destination gap as long as the chain instead of just considering the first vehicle (r27629) +- Fix: [Build] Change the GCC version detection so that it works with two-digit and truncated versions [FS#6487] (r27623, r27616) +- Fix: Do not hide filtered and highlighted industries by overlapping tiles in the zoomed-out smallmap (r27622, r27621, r27620) +- Fix: [Script] Kill scripts, when a non-suspendable valuator call takes way too long [FS#6473] (r27594) + + 1.6.1 (2016-07-01) ------------------------------------------------------------------------ - Fix: Compilation and optimisation issues with GCC6 (r27606, r27605, r27595) diff --git a/os/debian/changelog b/os/debian/changelog index c8cf30794b..ce2582128c 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,39 @@ +openttd (1.7.2-0) unstable; urgency=low + + * New upstream release 1.7.2 + + -- OpenTTD Sun, 24 Dec 2017 14:00:00 +0100 + +openttd (1.7.2~RC1-0) unstable; urgency=low + + * New upstream release 1.7.2-RC1 + + -- OpenTTD Mon, 11 Dec 2017 21:30:00 +0100 + +openttd (1.7.1-0) unstable; urgency=low + + * New upstream release 1.7.1 + + -- OpenTTD Tue, 13 Jun 2017 21:00:00 +0200 + +openttd (1.7.1~RC1-0) unstable; urgency=low + + * New upstream release 1.7.1-RC1 + + -- OpenTTD Thu, 04 Mai 2017 21:00:00 +0200 + +openttd (1.7.0-0) unstable; urgency=low + + * New upstream release 1.7.0 + + -- OpenTTD Sat, 01 Apr 2017 19:00:00 +0200 + +openttd (1.7.0~RC1-0) unstable; urgency=low + + * New upstream release 1.7.0-RC1 + + -- OpenTTD Sat, 11 Mar 2017 22:30:00 +0100 + openttd (1.6.1-0) unstable; urgency=low * New upstream release 1.6.1 diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index db1c6eb2a2..3a1765b132 100644 --- a/src/script/api/ai_changelog.hpp +++ b/src/script/api/ai_changelog.hpp @@ -19,7 +19,7 @@ * * 1.8.0 is not yet released. The following changes are not set in stone yet. * - * \b 1.7.0 + * \b 1.7.0 - 1.7.2 * * No changes * diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index 00b9539590..11f0ee6ec2 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -19,7 +19,7 @@ * * 1.8.0 is not yet released. The following changes are not set in stone yet. * - * \b 1.7.0 + * \b 1.7.0 - 1.7.2 * * No changes * From 2b23f11b4709ac9610cec614d33002bf6c0d9c66 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 26 Dec 2017 18:45:39 +0000 Subject: [PATCH 20/58] (svn r27951) -Update from Eints: spanish (mexican): 6 changes by Absay --- src/lang/spanish_MX.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index c87c275678..47b48325ac 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3131,11 +3131,11 @@ STR_STATION_VIEW_WAITING_AMOUNT :Cantidad: Esper STR_STATION_VIEW_PLANNED_STATION :Estación: Planeado STR_STATION_VIEW_PLANNED_AMOUNT :Cantidad: Planeado STR_STATION_VIEW_FROM :{YELLOW}{CARGO_SHORT} desde {STATION} -STR_STATION_VIEW_VIA :{YELLOW}{CARGO_SHORT} por {STATION} +STR_STATION_VIEW_VIA :{YELLOW}{CARGO_SHORT} pasando por {STATION} STR_STATION_VIEW_TO :{YELLOW}{CARGO_SHORT} a {STATION} STR_STATION_VIEW_FROM_ANY :{RED}{CARGO_SHORT} desde estación desconocida STR_STATION_VIEW_TO_ANY :{RED}{CARGO_SHORT} a cualquier estación -STR_STATION_VIEW_VIA_ANY :{RED}{CARGO_SHORT} por cualquier estación +STR_STATION_VIEW_VIA_ANY :{RED}{CARGO_SHORT} pasando por cualquier estación STR_STATION_VIEW_FROM_HERE :{GREEN}{CARGO_SHORT} con salida desde esta estación STR_STATION_VIEW_VIA_HERE :{GREEN}{CARGO_SHORT} se detendrá en esta estación STR_STATION_VIEW_TO_HERE :{GREEN}{CARGO_SHORT} a esta estación @@ -3835,8 +3835,8 @@ STR_ORDERS_GO_TO_TOOLTIP :{BLACK}Añadir STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP :{BLACK}Ver todos los vehículos que comparten el mismo itinerario # String parts to build the order string -STR_ORDER_GO_TO_WAYPOINT :Ir por {WAYPOINT} -STR_ORDER_GO_NON_STOP_TO_WAYPOINT :Ir sin paradas por {WAYPOINT} +STR_ORDER_GO_TO_WAYPOINT :Ir pasando por {WAYPOINT} +STR_ORDER_GO_NON_STOP_TO_WAYPOINT :Ir sin paradas pasando por {WAYPOINT} STR_ORDER_SERVICE_AT :Mantenimiento en STR_ORDER_SERVICE_NON_STOP_AT :Mantenimiento sin paradas en @@ -3916,9 +3916,9 @@ STR_TIMETABLE_TRAVEL_FOR_SPEED :Viajar durante STR_TIMETABLE_TRAVEL_FOR_ESTIMATED :Viajar (durante {STRING}, no programado) STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED :Viajar (durante {STRING}, no programado) a {VELOCITY} como máximo STR_TIMETABLE_STAY_FOR_ESTIMATED :(esperar {STRING}, no programado) -STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED :(viajar por {STRING}, no programado) +STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED :(viajar {STRING}, no programado) STR_TIMETABLE_STAY_FOR :y esperar {STRING} -STR_TIMETABLE_AND_TRAVEL_FOR :y viajar por {STRING} +STR_TIMETABLE_AND_TRAVEL_FOR :y viajar {STRING} STR_TIMETABLE_DAYS :{COMMA}{NBSP}día{P "" s} STR_TIMETABLE_TICKS :{COMMA}{NBSP}tick{P "" s} From 150ef3999cf6893dd745ef1c5a1136f5579c0043 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 27 Dec 2017 21:54:52 +0000 Subject: [PATCH 21/58] (svn r27952) -Change: Reword texts in industry view, when stockpiling is used. --- src/industry_gui.cpp | 35 ++++++++++++++--------------------- src/lang/english.txt | 8 +++----- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 41b3c573ff..2e06983af0 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -777,37 +777,30 @@ public: y += FONT_HEIGHT_NORMAL; first = false; } + SetDParam(0, CargoSpec::Get(i->accepts_cargo[j])->name); + SetDParam(1, i->accepts_cargo[j]); + SetDParam(2, i->incoming_cargo_waiting[j]); + SetDParamStr(3, ""); + StringID str = STR_NULL; switch (cargo_suffix[j].display) { - case CSD_CARGO_AMOUNT: - if (stockpiling) { - SetDParam(0, i->accepts_cargo[j]); - SetDParam(1, i->incoming_cargo_waiting[j]); - DrawString(left_side, right - WD_FRAMERECT_RIGHT, y, STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT); - break; - } + case CSD_CARGO_AMOUNT_TEXT: + SetDParamStr(3, cargo_suffix[j].text); FALLTHROUGH; - - case CSD_CARGO: - SetDParam(0, CargoSpec::Get(i->accepts_cargo[j])->name); - DrawString(left_side, right - WD_FRAMERECT_RIGHT, y, STR_INDUSTRY_VIEW_ACCEPT_CARGO); + case CSD_CARGO_AMOUNT: + str = stockpiling ? STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT : STR_INDUSTRY_VIEW_ACCEPT_CARGO; break; case CSD_CARGO_TEXT: - SetDParam(0, CargoSpec::Get(i->accepts_cargo[j])->name); - SetDParamStr(1, cargo_suffix[j].text); - DrawString(left_side, right - WD_FRAMERECT_RIGHT, y, STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT); - break; - - case CSD_CARGO_AMOUNT_TEXT: - SetDParam(0, i->accepts_cargo[j]); - SetDParam(1, i->incoming_cargo_waiting[j]); - SetDParamStr(2, cargo_suffix[j].text); - DrawString(left_side, right - WD_FRAMERECT_RIGHT, y, STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT); + SetDParamStr(3, cargo_suffix[j].text); + FALLTHROUGH; + case CSD_CARGO: + str = STR_INDUSTRY_VIEW_ACCEPT_CARGO; break; default: NOT_REACHED(); } + DrawString(left_side, right - WD_FRAMERECT_RIGHT, y, str); y += FONT_HEIGHT_NORMAL; } diff --git a/src/lang/english.txt b/src/lang/english.txt index 0228f9c307..33a4f42cfe 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3296,11 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Requires STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Requires: {YELLOW}{STRING}{RAW_STRING}, {STRING}{RAW_STRING}, {STRING}{RAW_STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requires -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}waiting -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{RAW_STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{RAW_STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requires: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:RAW_STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} waiting{RAW_STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produces: {YELLOW}{STRING}{RAW_STRING} From b394dd846899a38e9597395813408f7814defee2 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 27 Dec 2017 21:55:30 +0000 Subject: [PATCH 22/58] (svn r27953) -Cleanup: Adjust other languages for r27952 --- src/lang/brazilian_portuguese.txt | 8 +++----- src/lang/catalan.txt | 8 +++----- src/lang/croatian.txt | 8 +++----- src/lang/czech.txt | 8 +++----- src/lang/dutch.txt | 8 +++----- src/lang/english_US.txt | 8 +++----- src/lang/finnish.txt | 6 +++--- src/lang/french.txt | 8 +++----- src/lang/gaelic.txt | 8 +++----- src/lang/galician.txt | 8 +++----- src/lang/german.txt | 8 +++----- src/lang/greek.txt | 6 +++--- src/lang/hebrew.txt | 8 +++----- src/lang/hungarian.txt | 6 ++---- src/lang/italian.txt | 8 +++----- src/lang/japanese.txt | 3 +-- src/lang/korean.txt | 8 +++----- src/lang/latin.txt | 8 +++----- src/lang/luxembourgish.txt | 8 +++----- src/lang/malay.txt | 2 +- src/lang/norwegian_bokmal.txt | 8 +++----- src/lang/polish.txt | 8 +++----- src/lang/portuguese.txt | 4 ++-- src/lang/russian.txt | 6 ++---- src/lang/simplified_chinese.txt | 4 ++-- src/lang/spanish.txt | 8 +++----- src/lang/spanish_MX.txt | 8 +++----- src/lang/swedish.txt | 8 +++----- src/lang/turkish.txt | 8 +++----- src/lang/vietnamese.txt | 8 +++----- 30 files changed, 82 insertions(+), 131 deletions(-) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index d655f49dff..e4fd8dce5b 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Requer: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Requer: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necessita -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}aguardando -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necessita: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} aguardando{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produz: {YELLOW}{STRING}{STRING} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 3cbde7515f..b2fff236de 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Necessit STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Necessita: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necessita -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}esperant -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necessita: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} esperant{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produeix: {YELLOW}{STRING}{STRING} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 72f9b33cdd..dcfb6e2fe4 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3392,11 +3392,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Treba: { STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Treba: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Treba -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}čeka -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Treba: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} čeka{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Proizvodi: {YELLOW}{STRING}{STRING} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index c914cfdc4d..0cd1b4e00d 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3389,11 +3389,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Vyžaduj STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Vyžaduje: {YELLOW}{STRING.acc}{STRING}, {STRING.acc}{STRING}, {STRING.acc}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Vyžaduje -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}ček{P á ají á} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Vyžaduje: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} ček{P á ají á}{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produkuje: {YELLOW}{STRING}{STRING} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index ca1ce4be2c..cb625b1f6d 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3296,11 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Vereist: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Vereist: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Vereist -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}wachtend -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Vereist: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} wachtend{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produceert: {YELLOW}{STRING}{STRING} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 63314c4159..48247afb28 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3296,11 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Requires STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Requires: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requires -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}waiting -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requires: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} waiting{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produces: {YELLOW}{STRING}{STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 98fd58031d..24cb9b697d 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3296,9 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Tarvitse STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Tarvitsee: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Tarvitsee -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}odottamassa +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Tarvitsee: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} odottamassa{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Tuottaa: {YELLOW}{STRING}{STRING} diff --git a/src/lang/french.txt b/src/lang/french.txt index 65fba11c27..19bee524a7 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Nécessi STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Nécessite{NBSP}: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Nécessite -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}en attente -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Nécessite: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} en attente{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produit{NBSP}: {YELLOW}{STRING}{STRING} diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index fa202dc6d4..d500df2b4b 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -3537,11 +3537,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Feum air STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Feum air: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Feum air -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}a' feitheamh -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Feum air: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} a' feitheamh{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Toradh: {YELLOW}{STRING}{STRING} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 98119197b7..4a17d897e7 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Require: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Require: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Require -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}agardando -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Require: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} agardando{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produce: {YELLOW}{STRING}{STRING} diff --git a/src/lang/german.txt b/src/lang/german.txt index 499eb6ee6b..f5042e8338 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Benötig STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Benötigt: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}benötigt -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}wartend -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}benötigt: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} wartend{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produziert: {YELLOW}{STRING}{STRING} diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 28493787fe..ae56581485 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3402,9 +3402,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Απαι STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Απαιτεί: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Απαιτεί -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}σε αναμονή +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Απαιτεί: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} σε αναμονή{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Παράγει: {YELLOW}{STRING}{STRING} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index a129f91dbd..8f362d3f74 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3310,11 +3310,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{YELLOW}{3:STRI STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{YELLOW}{5:STRING}{4:STRING},{3:STRING}{2:STRING},{1:STRING}{0:STRING}{BLACK} :דורש ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}דורש -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}ממתין -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}דורש: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} ממתין{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{YELLOW}{1:STRING}{0:STRING}{BLACK} :מייצר diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index a993dc305d..00a3d089b4 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3361,10 +3361,8 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Felhaszn ############ range for requires ends STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Elfogad: -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}várakozik -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} várakozik{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Gyárt: {YELLOW}{STRING}{STRING} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 309f4e9f01..7b1da01230 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3326,11 +3326,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Richiede STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Richiede: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Richiede -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}in attesa -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Richiede: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} in attesa{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produce: {YELLOW}{STRING}{STRING} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index ed7584bfc1..13d52cbe58 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3293,8 +3293,7 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}必要 STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}必要資源: {YELLOW}{STRING}{STRING}、{STRING}{STRING}、{STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES : {BLACK}必要物資 -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT : {YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES : {BLACK}必要物資: ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}生産品: {YELLOW}{STRING}{STRING} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 9c6d98c05b..923bced9f9 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}필요 STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}필요함: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}받는 화물 -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}대기중 -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}받는 화물: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} 대기중{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}생산: {YELLOW}{STRING}{STRING} diff --git a/src/lang/latin.txt b/src/lang/latin.txt index bd47867beb..42047a47d6 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -3498,11 +3498,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Postulat STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Postulat: {YELLOW}{STRING.acc}{STRING}, {STRING.acc}{STRING}, {STRING.acc}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Postulat -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING.acc} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}manet -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING.acc}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Postulat: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING.acc}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} manet{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Efficit: {YELLOW}{STRING.acc}{STRING} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 41150fc85a..35ba9b4d41 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3296,11 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Brauch: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Brauch: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Brauch -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}um waarden -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Brauch: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} um waarden{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produzéiert: {YELLOW}{STRING}{STRING} diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 8d7d0850c1..d1da5f40f6 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -2957,7 +2957,7 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Memerluk STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Memerlukan: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Diperlukan +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Diperlukan: ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Mengeluarkan: {YELLOW}{STRING}{STRING} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 535e83e6ce..bcb5f4fcf4 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3300,11 +3300,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Trenger: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Trenger: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Krever -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}venter -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Krever: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} venter{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produserer: {YELLOW}{STRING}{STRING} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 2720818545..6fcf49adeb 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3676,11 +3676,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Wymaga: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Wymaga: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Potrzebuje -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}oczekuje -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Potrzebuje: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} oczekuje{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produkuje: {YELLOW}{STRING}{STRING} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index fd62809141..1914a11add 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3294,8 +3294,8 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Necessá STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Necessário: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}a aguardar +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} a aguardar{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produz: {YELLOW}{STRING}{STRING} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index bdc0a8dd7f..559e47ae85 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3477,10 +3477,8 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Треб ############ range for requires ends STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Требуется: -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}ожидает -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} ожидает{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Производит: {YELLOW}{STRING}{STRING} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 21f587aa8d..d613ea15fe 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3293,8 +3293,8 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}需要 STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}需要：{YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}等待中 +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} 等待中{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}产出: {YELLOW}{STRING}{STRING} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 5e27b22c4d..d20ec0719c 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Necesita STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Requiere: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necesita -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}esperando -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Necesita: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} esperando{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produce: {YELLOW}{STRING}{STRING} diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 47b48325ac..45de4d746b 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Requiere STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Requiere: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requiere -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}esperando -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requiere: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} esperando{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produce: {YELLOW}{STRING}{STRING} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index e884079d44..1113e32358 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3296,11 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Kräver: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Kräver: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Kräver -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}väntar -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Kräver: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} väntar{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Producerar: {YELLOW}{STRING}{STRING} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index f34035c22c..763eb16f6d 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3297,11 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}İstenen STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}İstenenler: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Gereken -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}bekliyor -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Gereken: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} bekliyor{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Üretir: {YELLOW}{STRING}{STRING} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index c9ef33616e..38fcf09edc 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3296,11 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Yêu c STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Yêu cầu: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Cần cung cấp -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{CARGO_LONG} {BLACK}đang chờ -STR_INDUSTRY_VIEW_ACCEPT_CARGO_TEXT :{YELLOW}{STRING}{STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_TEXT :{YELLOW}{CARGO_LONG}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Cần cung cấp: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} đang chờ{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Sản xuất: {YELLOW}{STRING}{STRING} From 6b11ab49d2bb25b86df086ca9d5e1572bdc503fb Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 27 Dec 2017 22:07:59 +0000 Subject: [PATCH 23/58] (svn r27954) -Cleanup [FS#6644]: Remove unused function (M3Henry) --- src/fileio.cpp | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index 526f5b184f..0590efd3a7 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -584,32 +584,6 @@ bool AppendPathSeparator(char *buf, const char *last) return true; } -/** - * Allocates and files a variable with the full path - * based on the given directory. - * @param dir the directory to base the path on - * @return the malloced full path - */ -char *BuildWithFullPath(const char *dir) -{ - char *dest = MallocT(MAX_PATH); - char *last = dest + MAX_PATH - 1; - strecpy(dest, dir, last); - - /* Check if absolute or relative path */ - const char *s = strchr(dest, PATHSEPCHAR); - - /* Add absolute path */ - if (s == NULL || dest != s) { - if (getcwd(dest, MAX_PATH) == NULL) *dest = '\0'; - AppendPathSeparator(dest, last); - strecat(dest, dir, last); - } - AppendPathSeparator(dest, last); - - return dest; -} - /** * Find the first directory in a tar archive. * @param tarname the name of the tar archive to look in. From bfd9e30c301370144feb54449b143db6726e1686 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 28 Dec 2017 18:45:40 +0000 Subject: [PATCH 24/58] (svn r27955) -Update from Eints: french: 2 changes by glx --- src/lang/french.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/french.txt b/src/lang/french.txt index 19bee524a7..9150d72ed3 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3297,9 +3297,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Nécessi STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Nécessite{NBSP}: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends -STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Nécessite: +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Nécessite{NBSP}: STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} -STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} en attente{STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}{NBSP}: {CARGO_SHORT} en attente{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Produit{NBSP}: {YELLOW}{STRING}{STRING} From f9ae0c50451c6ac7891f784a1c79411b723b3530 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 31 Dec 2017 18:45:41 +0000 Subject: [PATCH 25/58] (svn r27956) -Update from Eints: spanish (mexican): 16 changes by Absay --- src/lang/spanish_MX.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 45de4d746b..b551ac1170 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -4098,7 +4098,7 @@ STR_ERROR_NO_TOWN_IN_SCENARIO :{WHITE}... no h STR_ERROR_PNGMAP :{WHITE}No se puede cargar mapa desde PNG... STR_ERROR_PNGMAP_FILE_NOT_FOUND :{WHITE}... archivo no encontrado STR_ERROR_PNGMAP_IMAGE_TYPE :{WHITE}... no se pudo convertir el tipo de imagen. Se requieren imágenes PNG de 8 o 24 bits -STR_ERROR_PNGMAP_MISC :{WHITE}... algo salió mal (quizá el archivo esté tenga errores) +STR_ERROR_PNGMAP_MISC :{WHITE}... algo salió mal (quizá el archivo está dañado) STR_ERROR_BMPMAP :{WHITE}No se pudo cargar mapa desde BMP... STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... no se pudo convertir el tipo de imagen @@ -4131,7 +4131,7 @@ STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Tierra i STR_ERROR_CAN_T_DO_THIS :{WHITE}No se puede hacer eso... STR_ERROR_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Primero se debe demoler el edificio STR_ERROR_CAN_T_CLEAR_THIS_AREA :{WHITE}No se puede despejar esta zona... -STR_ERROR_SITE_UNSUITABLE :{WHITE}... lugar no apropiado +STR_ERROR_SITE_UNSUITABLE :{WHITE}... lugar no apto STR_ERROR_ALREADY_BUILT :{WHITE}... ya construido STR_ERROR_OWNED_BY :{WHITE}... propiedad de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... otra empresa es dueña de esta área @@ -4172,7 +4172,7 @@ STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}No se pu STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}No se puede construir la sede de la empresa... STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}No se puede comprar el 25% de acciones... STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}No se puede vender el 25% de acciones... -STR_ERROR_PROTECTED :{WHITE}Esta empresa es aún muy reciente para comerciar con acciones... +STR_ERROR_PROTECTED :{WHITE}Esta empresa es muy reciente para comerciar con acciones... # Town related errors STR_ERROR_CAN_T_GENERATE_TOWN :{WHITE}No se puede crear ningún pueblo @@ -4183,10 +4183,10 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB :{WHITE}... dema STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}... demasiado cerca de otro pueblo STR_ERROR_TOO_MANY_TOWNS :{WHITE}... demasiados pueblos STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... ya no hay espacio en el mapa -STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS :{WHITE}El pueblo no construirá carreteras. La función de construcción de carreteras puede activarse Configuración->Ambiente->Pueblos +STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS :{WHITE}El pueblo no construirá carreteras. La función de construcción de carreteras puede activarse en Configuración->Ambiente->Pueblos STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Obras de carretera en progreso STR_ERROR_TOWN_CAN_T_DELETE :{WHITE}No se puede eliminar este pueblo...{}Quedan estaciones o depósitos relacionados con él, o una propiedad suya no puede ser retirada -STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... no hay lugar apropiado para una estatua en el centro de esta pueblo +STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... no hay ningún lugar apto para una estatua en el centro de este pueblo # Industry related errors STR_ERROR_TOO_MANY_INDUSTRIES :{WHITE}... demasiadas industrias @@ -4207,8 +4207,8 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... los STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... solo se puede construir por encima del nivel de nieve STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... solo se puede construir por debajo del nivel de nieve -STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}No hubo sitios apropiados para industrias '{STRING}' -STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Cambia los parámetros de generación para obtener un mejor mapa +STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}No hubo espacio para industrias de tipo "{STRING}" +STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Cambia las opciones de generación para crear un mejor mapa # Station construction related errors STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}No se puede construir la estación de tren aquí... @@ -4225,7 +4225,7 @@ STR_ERROR_TOO_MANY_STATIONS_LOADING :{WHITE}Demasiad STR_ERROR_TOO_MANY_STATION_SPECS :{WHITE}Demasiadas partes de estación de tren STR_ERROR_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paradas de autobuses STR_ERROR_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas estaciones de camiones -STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Demasiado cerca de otra estación de pasajeros o carga +STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Demasiado cerca de otra estación o zona de carga STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK :{WHITE}Demasiado cerca de otro muelle STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT :{WHITE}Demasiado cerca de otro aeropuerto STR_ERROR_CAN_T_RENAME_STATION :{WHITE}No se puede cambiar nombre de la estación... @@ -4278,14 +4278,14 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}... pued STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}... puede que esté detenido dentro de un astillero STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR :{WHITE}... puede que esté detenido dentro de un hangar -STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Los trenes únicamente pueden modificarse si están detenidos dentro de un depósito +STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Los trenes pueden modificarse solo si están detenidos dentro de un depósito STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren demasiado largo STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}No se puede cambiar dirección del vehículo... STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}... vehículo compuesto por múltiples unidades STR_ERROR_INCOMPATIBLE_RAIL_TYPES :Los tipos de vías férreas no son compatibles STR_ERROR_CAN_T_MOVE_VEHICLE :{WHITE}No se puede mover vehículo... -STR_ERROR_REAR_ENGINE_FOLLOW_FRONT :{WHITE}El motor posterior debe seguir siempre al delantero +STR_ERROR_REAR_ENGINE_FOLLOW_FRONT :{WHITE}La locomotora trasera debe conectarse a la delantera STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}No se puede encontrar ruta al depósito STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}No se puede encontrar depósito @@ -4357,14 +4357,14 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE :{WHITE}No se pu STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Lugar no apto para entrada de túnel STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Primero se debe demoler el túnel STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY :{WHITE}Otro túnel obstaculiza -STR_ERROR_TUNNEL_THROUGH_MAP_BORDER :{WHITE}El túnel terminaría fuera del mapa +STR_ERROR_TUNNEL_THROUGH_MAP_BORDER :{WHITE}El túnel se extendería más allá del mapa STR_ERROR_UNABLE_TO_EXCAVATE_LAND :{WHITE}No se puede excavar la tierra al otro lado del túnel STR_ERROR_TUNNEL_TOO_LONG :{WHITE}... túnel demasiado largo # Object related errors STR_ERROR_TOO_MANY_OBJECTS :{WHITE}... demasiados objetos STR_ERROR_CAN_T_BUILD_OBJECT :{WHITE}No se puede colocar objeto... -STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Otro objeto obstaculiza +STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Otro objeto estorba STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... la sede de la empresa obstaculiza STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}No es posible adquirir este terreno... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... ¡ya fue adquirido por el jugador! @@ -4379,9 +4379,9 @@ STR_ERROR_GROUP_CAN_T_ADD_VEHICLE :{WHITE}No se pu STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}No se pueden añadir vehículos compartidos al grupo... # Generic vehicle errors -STR_ERROR_TRAIN_IN_THE_WAY :{WHITE}Tren obstaculiza -STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vehículo de carretera obstaculiza -STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Barco obstaculiza +STR_ERROR_TRAIN_IN_THE_WAY :{WHITE}Tren estorba +STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vehículo de carretera estorba +STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Barco estorba STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Aeronave obstaculiza STR_ERROR_CAN_T_REFIT_TRAIN :{WHITE}No se puede reequipar tren... @@ -4465,7 +4465,7 @@ STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE :{WHITE}... la a # Timetable related errors STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}No se pueden asignar itinerarios al vehículo... STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Los vehículos solo pueden esperar en estaciones -STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Este vehículo se detendrá en esta estación +STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Este vehículo no se detendrá en esta estación # Sign related errors STR_ERROR_TOO_MANY_SIGNS :{WHITE}... demasiados carteles From 66ccd9f71b2faf530fcbe8e254108bc9f52adbe7 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 3 Jan 2018 18:45:37 +0000 Subject: [PATCH 26/58] (svn r27957) -Update from Eints: spanish (mexican): 3 changes by Absay --- src/lang/spanish_MX.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index b551ac1170..0c234632a9 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -55,7 +55,7 @@ STR_CARGO_PLURAL_CANDY :{G=m}Dulces STR_CARGO_PLURAL_COLA :{G=f}Bebida de cola STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón de azúcar STR_CARGO_PLURAL_BUBBLES :{G=f}Burbujas -STR_CARGO_PLURAL_TOFFEE :{G=m}Jamoncillos +STR_CARGO_PLURAL_TOFFEE :{G=m}Caramelos suaves STR_CARGO_PLURAL_BATTERIES :{G=f}Pilas STR_CARGO_PLURAL_PLASTIC :{G=m}Plástico STR_CARGO_PLURAL_FIZZY_DRINKS :{G=m}Refrescos @@ -89,7 +89,7 @@ STR_CARGO_SINGULAR_CANDY :{G=m}Dulce STR_CARGO_SINGULAR_COLA :{G=f}Bebida de cola STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón de azúcar STR_CARGO_SINGULAR_BUBBLE :{G=f}Burbuja -STR_CARGO_SINGULAR_TOFFEE :{G=m}Jamoncillo +STR_CARGO_SINGULAR_TOFFEE :{G=m}Caramelo suave STR_CARGO_SINGULAR_BATTERY :{G=f}Pila STR_CARGO_SINGULAR_PLASTIC :{G=m}Plástico STR_CARGO_SINGULAR_FIZZY_DRINK :{G=m}Refresco @@ -123,7 +123,7 @@ STR_QUANTITY_SWEETS :{COMMA}{NBSP}bo STR_QUANTITY_COLA :{VOLUME_LONG} de cola STR_QUANTITY_CANDYFLOSS :{WEIGHT_LONG} de algo{P dón dones} de azúcar STR_QUANTITY_BUBBLES :{COMMA} burbuja{P "" s} -STR_QUANTITY_TOFFEE :{WEIGHT_LONG} de jamoncillo{P "" s} +STR_QUANTITY_TOFFEE :{WEIGHT_LONG} de caramelo suave STR_QUANTITY_BATTERIES :{COMMA} pila{P "" s} STR_QUANTITY_PLASTIC :{VOLUME_LONG} de plásticos STR_QUANTITY_FIZZY_DRINKS :{COMMA} refresco{P "" s} From ae5bbfb4b63de53f009fad7a265d34c76e177711 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 4 Jan 2018 18:45:39 +0000 Subject: [PATCH 27/58] (svn r27958) -Update from Eints: spanish (mexican): 26 changes by Absay --- src/lang/spanish_MX.txt | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 0c234632a9..088680de57 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -131,38 +131,38 @@ STR_QUANTITY_N_A :N/A # Two letter abbreviation of cargo name STR_ABBREV_NOTHING : -STR_ABBREV_PASSENGERS :{TINY_FONT}PJ -STR_ABBREV_COAL :{TINY_FONT}CB -STR_ABBREV_MAIL :{TINY_FONT}CR -STR_ABBREV_OIL :{TINY_FONT}PT -STR_ABBREV_LIVESTOCK :{TINY_FONT}GN -STR_ABBREV_GOODS :{TINY_FONT}MC +STR_ABBREV_PASSENGERS :{TINY_FONT}PS +STR_ABBREV_COAL :{TINY_FONT}CA +STR_ABBREV_MAIL :{TINY_FONT}CO +STR_ABBREV_OIL :{TINY_FONT}PE +STR_ABBREV_LIVESTOCK :{TINY_FONT}GA +STR_ABBREV_GOODS :{TINY_FONT}ME STR_ABBREV_GRAIN :{TINY_FONT}GR -STR_ABBREV_WOOD :{TINY_FONT}MD -STR_ABBREV_IRON_ORE :{TINY_FONT}MH +STR_ABBREV_WOOD :{TINY_FONT}MA +STR_ABBREV_IRON_ORE :{TINY_FONT}HI STR_ABBREV_STEEL :{TINY_FONT}AC -STR_ABBREV_VALUABLES :{TINY_FONT}VA -STR_ABBREV_COPPER_ORE :{TINY_FONT}MC +STR_ABBREV_VALUABLES :{TINY_FONT}OV +STR_ABBREV_COPPER_ORE :{TINY_FONT}CB STR_ABBREV_MAIZE :{TINY_FONT}MZ -STR_ABBREV_FRUIT :{TINY_FONT}FT -STR_ABBREV_DIAMONDS :{TINY_FONT}DM +STR_ABBREV_FRUIT :{TINY_FONT}FR +STR_ABBREV_DIAMONDS :{TINY_FONT}DI STR_ABBREV_FOOD :{TINY_FONT}AL -STR_ABBREV_PAPER :{TINY_FONT}PP +STR_ABBREV_PAPER :{TINY_FONT}PA STR_ABBREV_GOLD :{TINY_FONT}OR STR_ABBREV_WATER :{TINY_FONT}AG -STR_ABBREV_WHEAT :{TINY_FONT}TG -STR_ABBREV_RUBBER :{TINY_FONT}GA +STR_ABBREV_WHEAT :{TINY_FONT}TR +STR_ABBREV_RUBBER :{TINY_FONT}CH STR_ABBREV_SUGAR :{TINY_FONT}AZ -STR_ABBREV_TOYS :{TINY_FONT}JG -STR_ABBREV_SWEETS :{TINY_FONT}DC +STR_ABBREV_TOYS :{TINY_FONT}JU +STR_ABBREV_SWEETS :{TINY_FONT}DU STR_ABBREV_COLA :{TINY_FONT}CL STR_ABBREV_CANDYFLOSS :{TINY_FONT}AA STR_ABBREV_BUBBLES :{TINY_FONT}BU -STR_ABBREV_TOFFEE :{TINY_FONT}JM +STR_ABBREV_TOFFEE :{TINY_FONT}CS STR_ABBREV_BATTERIES :{TINY_FONT}PI STR_ABBREV_PLASTIC :{TINY_FONT}PL -STR_ABBREV_FIZZY_DRINKS :{TINY_FONT}RF -STR_ABBREV_NONE :{TINY_FONT}NO +STR_ABBREV_FIZZY_DRINKS :{TINY_FONT}RE +STR_ABBREV_NONE :{TINY_FONT}NI STR_ABBREV_ALL :{TINY_FONT}TOD # 'Mode' of transport for cargoes @@ -212,7 +212,7 @@ STR_UNITS_VOLUME_SHORT_IMPERIAL :{COMMA}{NBSP}ga STR_UNITS_VOLUME_SHORT_METRIC :{COMMA}{NBSP}l STR_UNITS_VOLUME_SHORT_SI :{COMMA}{NBSP}m³ -STR_UNITS_VOLUME_LONG_IMPERIAL :{COMMA} gal{P ón ones} +STR_UNITS_VOLUME_LONG_IMPERIAL :{COMMA}{NBSP} gal{P ón ones} STR_UNITS_VOLUME_LONG_METRIC :{COMMA}{NBSP}litro{P "" s} STR_UNITS_VOLUME_LONG_SI :{COMMA}{NBSP}m³ @@ -247,7 +247,7 @@ STR_TOOLTIP_RESIZE :{BLACK}Arrastra STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Cambiar entre tamaño de ventana grande o pequeño STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Barra de desplazamiento (mueve la lista arriba o abajo) STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Barra de desplazamiento (mueve la lista izquierda o derecha) -STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Demoler edificios, etc. en un área de terreno. Ctrl permite trazar una diagonal para seleccionar un área cuadrada. Mayús muestra una estimación del precio +STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Demoler edificios, etc. en un área de terreno. Ctrl para seleccionar un área en diagonal. Mayús muestra una estimación del precio # Show engines button STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN :{BLACK}Mostrar ocultos @@ -271,7 +271,7 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS :°!"#$%&/()=?¡ # Measurement tooltip STR_MEASURE_LENGTH :{BLACK}Longitud: {NUM} -STR_MEASURE_AREA :{BLACK}Área: {NUM} x {NUM} +STR_MEASURE_AREA :{BLACK}Área: {NUM} × {NUM} STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longitud: {NUM}{}Diferencia altura: {HEIGHT} STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM}×{NUM}{}Diferencia altura: {HEIGHT} @@ -2475,9 +2475,9 @@ STR_STATION_BUILD_NOISE :{BLACK}Ruido ge # Landscaping toolbar STR_LANDSCAPING_TOOLBAR :{WHITE}Modificación de terreno -STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Disminuir una esquina del terreno. Al arrastrar el ratón se reduce la primera esquina elegida y se nivela el resto del terreno seleccionado a dicha altura. Ctrl permite trazar una diagonal para seleccionar un área cuadrada. -STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Elevar una esquina del terreno. Al arrastrar el ratón se eleva la primera esquina elegida y se nivela el resto del terreno seleccionado a dicha altura. Ctrl permite trazar una diagonal para seleccionar un área cuadrada. Mayús muestra una estimación del precio -STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Nivela un área de terreno a la altura de la primera esquina seleccionada. Ctrl permite trazar una diagonal para seleccionar un área cuadrada. Mayús muestra una estimación del precio +STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Disminuir una esquina del terreno. Al arrastrar el ratón se reduce la primera esquina elegida y se nivela el resto del terreno seleccionado a dicha altura. Ctrl para seleccionar un área en diagonal. +STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Elevar una esquina del terreno. Al arrastrar el ratón se eleva la primera esquina elegida y se nivela el resto del terreno seleccionado a dicha altura. Ctrl para seleccionar un área en diagonal. Mayús muestra una estimación del precio +STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Nivela un área de terreno a la altura de la primera esquina seleccionada. Ctrl para seleccionar un área en diagonal. Mayús muestra una estimación del precio STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Comprar terreno para usos futuros. Mayús muestra una estimación del precio # Object construction window From ebd46cc3031919311a81cc04de9c2ef4ca4d7d8a Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 5 Jan 2018 18:45:40 +0000 Subject: [PATCH 28/58] (svn r27959) -Update from Eints: spanish (mexican): 8 changes by Absay --- src/lang/spanish_MX.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 088680de57..153404e431 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -163,7 +163,7 @@ STR_ABBREV_BATTERIES :{TINY_FONT}PI STR_ABBREV_PLASTIC :{TINY_FONT}PL STR_ABBREV_FIZZY_DRINKS :{TINY_FONT}RE STR_ABBREV_NONE :{TINY_FONT}NI -STR_ABBREV_ALL :{TINY_FONT}TOD +STR_ABBREV_ALL :{TINY_FONT}TODO # 'Mode' of transport for cargoes STR_PASSENGERS :{COMMA}{NBSP}pasajero{P "" s} @@ -598,8 +598,8 @@ STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPAN STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingeniero STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Director de Tráfico STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordinador de Transporte -STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ROUTE_SUPERVISOR :Supervisor de Ruta -STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_DIRECTOR :Directivo +STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ROUTE_SUPERVISOR :Supervisor de Rutas +STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_DIRECTOR :Jefe STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHIEF_EXECUTIVE :Subdirector STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHAIRMAN :Director STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT :Presidente @@ -804,7 +804,7 @@ STR_NEWS_DISASTER_FLOOD_VEHICLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_IN_TROUBLE_TITLE :{BIG_FONT}{BLACK}¡Empresa de transporte en problemas! STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION :{BIG_FONT}{BLACK}¡{STRING} será vendida o declarada en bancarrota de no incrementar su desempeño pronto! -STR_NEWS_COMPANY_MERGER_TITLE :{BIG_FONT}{BLACK}¡Fusión de empresa de transportes! +STR_NEWS_COMPANY_MERGER_TITLE :{BIG_FONT}{BLACK}¡Fusión de empresas de transportes! STR_NEWS_COMPANY_MERGER_DESCRIPTION :{BIG_FONT}{BLACK}¡{STRING} fue vendida a {STRING} por {CURRENCY_LONG}! STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLACK}¡En bancarrota! STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}¡{STRING} fue cerrada por sus acreedores y todos sus activos fueron vendidos! @@ -844,15 +844,15 @@ STR_NEWS_AIRCRAFT_IS_WAITING :{WHITE}{VEHICLE STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS :{WHITE}{VEHICLE} tiene muy pocas órdenes en la lista STR_NEWS_VEHICLE_HAS_VOID_ORDER :{WHITE}{VEHICLE} tiene una orden vacía STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY :{WHITE}{VEHICLE} tiene órdenes duplicadas -STR_NEWS_VEHICLE_HAS_INVALID_ENTRY :{WHITE}{VEHICLE} tiene en la lista una estación no válida -STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY :{WHITE}{VEHICLE} tiene en la lista un aeropuerto con una pista muy corta +STR_NEWS_VEHICLE_HAS_INVALID_ENTRY :{WHITE}{VEHICLE} tiene una estación no válida en la lista +STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY :{WHITE}{VEHICLE} tiene un aeropuerto con una pista muy corta en la lista STR_NEWS_VEHICLE_IS_GETTING_OLD :{WHITE}{VEHICLE} se está haciendo viejo STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD :{WHITE}{VEHICLE} se está haciendo muy viejo STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND :{WHITE}{VEHICLE} se está haciendo muy viejo y requiere renovación urgente STR_NEWS_TRAIN_IS_STUCK :{WHITE}{VEHICLE} no encuentra una ruta para continuar STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE} se perdió -STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}La utilidad del año pasado del {VEHICLE} fue de {CURRENCY_LONG} +STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}La utilidad de {VEHICLE} el año pasado fue de {CURRENCY_LONG} STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} no puede llegar al siguiente destino porque no está a su alcance STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} no avanza porque no pudo reequipar su carga @@ -1792,7 +1792,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}¿Está # Cheat window STR_CHEATS :{WHITE}Trucos -STR_CHEATS_TOOLTIP :{BLACK}Las casillas verificadas indican que ya se usó este truco +STR_CHEATS_TOOLTIP :{BLACK}Las casillas marcadas indican que ya se usó este truco STR_CHEATS_WARNING :{BLACK}¡Atención! Estás a punto de traicionar a tus competidores. Recuerda que siempre se recordará tal deshonra STR_CHEAT_MONEY :{LTBLUE}Recibir {CURRENCY_LONG} de dinero STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jugar como la empresa: {ORANGE}{COMMA} From 96b3036d4caa2c962d3038d70674301f845e635c Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 6 Jan 2018 18:45:38 +0000 Subject: [PATCH 29/58] (svn r27960) -Update from Eints: spanish (mexican): 2 changes by Absay --- src/lang/spanish_MX.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 153404e431..dcea934c68 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -162,7 +162,7 @@ STR_ABBREV_TOFFEE :{TINY_FONT}CS STR_ABBREV_BATTERIES :{TINY_FONT}PI STR_ABBREV_PLASTIC :{TINY_FONT}PL STR_ABBREV_FIZZY_DRINKS :{TINY_FONT}RE -STR_ABBREV_NONE :{TINY_FONT}NI +STR_ABBREV_NONE :{TINY_FONT}NADA STR_ABBREV_ALL :{TINY_FONT}TODO # 'Mode' of transport for cargoes @@ -4125,7 +4125,7 @@ STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY :{YELLOW}Mensaje # Generic construction errors STR_ERROR_OFF_EDGE_OF_MAP :{WHITE}Fuera del borde del mapa STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP :{WHITE}Demasiado cerca del borde del mapa -STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY :{WHITE}No hay suficiente dinero: se requieren {CURRENCY_LONG} +STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY :{WHITE}No alcanza el dinero: se necesitan {CURRENCY_LONG} STR_ERROR_FLAT_LAND_REQUIRED :{WHITE}Se requiere terreno plano STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Tierra inclinada en dirección errónea STR_ERROR_CAN_T_DO_THIS :{WHITE}No se puede hacer eso... From 9d9e15a74710082afb5558548e39fb8716e6ad3a Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 7 Jan 2018 14:21:09 +0000 Subject: [PATCH 30/58] (svn r27961) -Fix [FS#6654]: The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version. (PaulC) --- bin/baseset/openttd.grf | Bin 498506 -> 498518 bytes media/extra_grf/openttdgui.png | Bin 26460 -> 26462 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf index 85d3fc8adc6f90cb9912c0ea79d0dbee280581a5..6d979b5d795ec2ea9e200488b8913bf57f6cebe8 100644 GIT binary patch delta 184 zcmV;p07w7IwjS2D9)N@agaU*Egaot&Ro8#$7zF_V0RaKv2&fVSG&IA)m=pm4=n(_L zz`*Dz0s%D0Dc}D)O1-JFr235lnp;xB> delta 172 zcmV;d08{_gwjRp19)N@agaU*Egaot&Ro8!r7{Dh40RaI4*a)Z+13$pPkQ4<0z{0}9 z*c1W*KgcQA69K~54gmqsF6d0)5!g@z0YB)_DFgvO!osjJ$XDo2&~NA`z(nX_$Q0;o z0qEd>uywE>;7`zX=(^}Uz)-M)xOmus;NGBu(8B`g=+I)&q0qy~b;%Xb^#Q=>&anw8 ap)QGKiFBERmqCjK7>5Da1-Aj%235mmKT$9M diff --git a/media/extra_grf/openttdgui.png b/media/extra_grf/openttdgui.png index 28ad2fbafeab4b109e2d9fbbbc20a0f6a21d653d..94871968d3e853d14fcc2342169967fd76fcf2ef 100644 GIT binary patch delta 25813 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 E2S1EJ3jhEB delta 25812 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

53GThnS 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 Z$M8Xe!<+X)&4MA|%LH^=C^K*l`!6TrQS$%* From 78d80a996886cd0b20098a458e74023014d76d29 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 9 Jan 2018 18:45:38 +0000 Subject: [PATCH 31/58] (svn r27962) -Update from Eints: spanish (mexican): 1 change by Absay --- src/lang/spanish_MX.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index dcea934c68..69b1feb1de 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -869,7 +869,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta de subsidio vencida:{}{}{STRING} de {STRING} a {STRING} ya no está subsidiado STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidio retirado:{}{}El servicio de {STRING} desde {STRING} a {STRING} ya no está subsidiado -STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Se ofrece subsidio.{}{}¡El primer servicio de {STRING} desde {STRING} a {STRING} tendrá subsidio durante un año parte del ayuntamiento local! +STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Se ofrece subsidio.{}{}¡El primer servicio de {STRING} desde {STRING} a {STRING} tendrá subsidio durante un año por parte del ayuntamiento local! STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}¡Subsidio otorgado a {STRING}!{}{}¡El servicio de {STRING} desde {STRING} a {STRING} generará un 50% extra por un año! STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}¡Subsidio otorgado a {STRING}!{}{}¡El servicio de {STRING} desde {STRING} a {STRING} generará tasa doble durante un año! STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIG_FONT}{BLACK}¡Subsidio otorgado a {STRING}!{}{}¡El servicio de {STRING} desde {STRING} a {STRING} generará tasa triple durante un año! From 0842742b91a370a93370829ef3a4a196029d0991 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 11 Jan 2018 18:45:39 +0000 Subject: [PATCH 32/58] (svn r27963) -Update from Eints: norwegian (bokmal): 2 changes by Leifbk --- src/lang/norwegian_bokmal.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index bcb5f4fcf4..eb5d8dbdd9 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3281,8 +3281,8 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL :{WHITE}{CURRENC # Industry directory STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrier STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ingen - -STR_INDUSTRY_DIRECTORY_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}){YELLOW} ({COMMA}{NBSP}% transportert) -STR_INDUSTRY_DIRECTORY_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}/{CARGO_LONG}{STRING}){YELLOW} ({COMMA}{NBSP}%/{COMMA}{NBSP}% transportert) +STR_INDUSTRY_DIRECTORY_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}){YELLOW} ({COMMA}% transportert) +STR_INDUSTRY_DIRECTORY_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}/{CARGO_LONG}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportert) STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY} STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Industrinavn - klikk på navn for å gå til industri. Ctrl+klikk åpner et nytt tilleggsvindu over industrien From 156d34b5e48278f3e5538e03a1fe93ee27c5eb70 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 16 Jan 2018 18:45:39 +0000 Subject: [PATCH 33/58] (svn r27964) -Update from Eints: spanish (mexican): 10 changes by Absay --- src/lang/spanish_MX.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 69b1feb1de..67d2dd7b0a 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -1810,18 +1810,18 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Cambiar STR_CHEAT_SETUP_PROD :{LTBLUE}Permitir cambiar los valores de producción: {ORANGE}{STRING} # Livery window -STR_LIVERY_CAPTION :{WHITE}Diseño de colores corporativos +STR_LIVERY_CAPTION :{WHITE}Nueva cromática -STR_LIVERY_GENERAL_TOOLTIP :{BLACK}Mostrar diseño general de colores -STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Mostrar diseño general de colores para trenes -STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Mostrar diseño general de colores para vehículos de carretera -STR_LIVERY_SHIP_TOOLTIP :{BLACK}Mostrar diseño general de colores de colores para barcos -STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Mostrar diseño general de colores de colores para aeronaves -STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Elegir el color principal para el diseño seleccionado. Ctrl+Clic para establecerlo como diseño general -STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Elegir el color secundario para el diseño seleccionado. Ctrl+Clic para establecerlo como diseño general -STR_LIVERY_PANEL_TOOLTIP :{BLACK}Elegir un solo diseño de colores, o Ctrl+Clic para elegir varios. Verificar cada una casilla para establecer diferentes combinaciones según el tipo de vehículo +STR_LIVERY_GENERAL_TOOLTIP :{BLACK}Mostrar cromática general +STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Mostrar cromáticas para trenes +STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Mostrar cromáticas para vehículos de carretera +STR_LIVERY_SHIP_TOOLTIP :{BLACK}Mostrar cromáticas para barcos +STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Mostrar cromáticas para aeronaves +STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Elegir el color principal para la cromática elegida. Ctrl+Clic para establecerlo como cromática general +STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Elegir el color secundario para el diseño seleccionado. Ctrl+Clic para establecerlo como cromática general +STR_LIVERY_PANEL_TOOLTIP :{BLACK}Elegir un solo tipo de cromática, o Ctrl+Clic para elegir varios. Marcar las casillas para establecer diferentes combinaciones según el tipo de vehículo -STR_LIVERY_DEFAULT :Diseño de colores estándar +STR_LIVERY_DEFAULT :Cromática estándar STR_LIVERY_STEAM :Locomotora a vapor STR_LIVERY_DIESEL :Locomotora de diésel STR_LIVERY_ELECTRIC :Locomotora eléctrica From 25c9cc6b1143e1ed8286bb81a91bb31e9da35b72 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 21 Jan 2018 18:45:39 +0000 Subject: [PATCH 34/58] (svn r27965) -Update from Eints: spanish (mexican): 43 changes by Absay --- src/lang/spanish_MX.txt | 86 ++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 67d2dd7b0a..0219f79bdc 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -855,7 +855,7 @@ STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}La utilidad de {VEHICLE} el año pasado fue de {CURRENCY_LONG} STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} no puede llegar al siguiente destino porque no está a su alcance -STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} no avanza porque no pudo reequipar su carga +STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} no avanza porque no pudo reformarse STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Renovación automática fallida para {VEHICLE}{}{STRING} STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE :{BIG_FONT}{BLACK}¡Nuev{G o a} {STRING} ahora disponible! @@ -2938,7 +2938,7 @@ STR_NEWGRF_LIST_MISSING :{RED}Archivos q STR_NEWGRF_BROKEN :{WHITE}Es posible que el funcionamiento del NewGRF '{0:STRING}' cause desincronizaciones o errores STR_NEWGRF_BROKEN_POWERED_WAGON :{WHITE}Cambió el estado 'vagón con motor' para '{1:ENGINE}' cuando no estaba dentro de un depósito STR_NEWGRF_BROKEN_VEHICLE_LENGTH :{WHITE}cambió la longitud del vehículo para '{1:ENGINE}' cuando no estaba dentro de un depósito -STR_NEWGRF_BROKEN_CAPACITY :{WHITE}Cambió la capacidad del vehículo para '{1:ENGINE}' cuando no estaba dentro de un depósito o mientras no se estaba reequipando +STR_NEWGRF_BROKEN_CAPACITY :{WHITE}Cambió la capacidad del vehículo para '{1:ENGINE}' cuando no estaba dentro de un depósito o mientras no se estaba reformando STR_BROKEN_VEHICLE_LENGTH :{WHITE}Tren '{VEHICLE}' perteneciente a '{COMPANY}' tiene una longitud no válida. Puede ser debido a problemas con los NewGRF. El juego puede fallar STR_NEWGRF_BUGGY :{WHITE}El NewGRF '{0:STRING}' da información incorrecta @@ -3399,7 +3399,7 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {G STR_PURCHASE_INFO_COST_SPEED :{BLACK}Costo: {GOLD}{CURRENCY_LONG}{BLACK} Velocidad: {GOLD}{VELOCITY} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacidad: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagones con motor: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT} -STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reequipamiento: {GOLD}{STRING} +STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reforma: {GOLD}{STRING} STR_PURCHASE_INFO_ALL_TYPES :Todo tipo de carga STR_PURCHASE_INFO_ALL_BUT :Todo excepto {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Máx. fuerza de tracción: {GOLD}{FORCE} @@ -3604,10 +3604,10 @@ STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Esto com STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Forzar al tren a proceder sin esperar a que la señal le ceda vía libre -STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP :{BLACK}Reequipar tren para transportar otro tipo de cargamento -STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Reequipar vehículo de carretera para transportar otro tipo de cargamento -STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Reequipar barco para que transporte otro tipo de cargamento -STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Reequipar aeronave para llevar otro tipo de cargamento +STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP :{BLACK}Reformar tren para transportar otro tipo de cargamento +STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Reformar vehículo de carretera para transportar otro tipo de cargamento +STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Reformar barco para que transporte otro tipo de cargamento +STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Reformar aeronave para llevar otro tipo de cargamento STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP :{BLACK}Cambiar dirección del tren STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Forzar al vehículo a girar en sentido opuesto @@ -3720,28 +3720,28 @@ STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP :{BLACK}Mostrar STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY :{BLACK}Capacidad: {LTBLUE} # Vehicle refit -STR_REFIT_CAPTION :{WHITE}{VEHICLE} (reequipar) +STR_REFIT_CAPTION :{WHITE}{VEHICLE} (reformar) STR_REFIT_TITLE :{GOLD}Elegir el nuevo tipo de cargamento: -STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}{}{BLACK}Costo por reequipar: {RED}{CURRENCY_LONG} -STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}{}{BLACK}Ingreso al reequipar: {GREEN}{CURRENCY_LONG} -STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Costo por reequipar: {RED}{CURRENCY_LONG} -STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Ingreso al reequipar: {GREEN}{CURRENCY_LONG} -STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Elegir los vehículos de ferrocarril a reequipar. Arrastrar con el ratón para elegir más de un vehículo. Clic en un espacio vacío para elegir el tren completo. Ctrl+Clic para elegir una unidad del tren y los vagones subsecuentes +STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}{}{BLACK}Costo por reformar: {RED}{CURRENCY_LONG} +STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}{}{BLACK}Ingreso al reformar: {GREEN}{CURRENCY_LONG} +STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Costo por reformar: {RED}{CURRENCY_LONG} +STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Ingreso al reformar: {GREEN}{CURRENCY_LONG} +STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Elegir los vehículos de ferrocarril a reformar. Arrastrar con el ratón para elegir más de un vehículo. Clic en un espacio vacío para elegir el tren completo. Ctrl+Clic para elegir una unidad del tren y los vagones subsecuentes STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}Elegir el tipo de cargamento para el tren STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Elegir el tipo de cargamento para el vehículo de carretera STR_REFIT_SHIP_LIST_TOOLTIP :{BLACK}Elegir el tipo de cargamento para el barco STR_REFIT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Elegir el tipo de cargamento para la aeronave -STR_REFIT_TRAIN_REFIT_BUTTON :{BLACK}Reequipar tren -STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON :{BLACK}Reequipar vehículo de carretera -STR_REFIT_SHIP_REFIT_BUTTON :{BLACK}Reequipar barco -STR_REFIT_AIRCRAFT_REFIT_BUTTON :{BLACK}Reequipar aeronave +STR_REFIT_TRAIN_REFIT_BUTTON :{BLACK}Reformar tren +STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON :{BLACK}Reformar vehículo de carretera +STR_REFIT_SHIP_REFIT_BUTTON :{BLACK}Reformar barco +STR_REFIT_AIRCRAFT_REFIT_BUTTON :{BLACK}Reformar aeronave -STR_REFIT_TRAIN_REFIT_TOOLTIP :{BLACK}Reequipar el tren para transportar el cargamento elegido -STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Reequipar el vehículo de carretera para transportar el cargamento elegido -STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Reequipar el barco para transportar el cargamento elegido -STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Reequipar la aeronave para transportar el cargamento elegido +STR_REFIT_TRAIN_REFIT_TOOLTIP :{BLACK}Reformar el tren para transportar el cargamento elegido +STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Reformar el vehículo de carretera para transportar el cargamento elegido +STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Reformar el barco para transportar el cargamento elegido +STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Reformar la aeronave para transportar el cargamento elegido # Order view STR_ORDERS_CAPTION :{WHITE}{VEHICLE} (Órdenes) @@ -3777,10 +3777,10 @@ STR_ORDER_DROP_TRANSFER :Transferir STR_ORDER_DROP_NO_UNLOADING :No descargar STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Cambiar el comportamiento de descarga en la orden elegida -STR_ORDER_REFIT :{BLACK}Reequipar -STR_ORDER_REFIT_TOOLTIP :{BLACK}Elegir el tipo de cargamento a reequipar en esta orden. Ctrl+Clic para eliminar la orden -STR_ORDER_REFIT_AUTO :{BLACK}Reequipar en estación -STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Elegir el tipo de cargamento a reequipar en esta orden. Ctrl+Clic para eliminar la orden. Reequipar solo es posible si el vehículo lo permite +STR_ORDER_REFIT :{BLACK}Reformar +STR_ORDER_REFIT_TOOLTIP :{BLACK}Elegir el tipo de cargamento a reformar en esta orden. Ctrl+Clic para eliminar la orden +STR_ORDER_REFIT_AUTO :{BLACK}Reformar en estación +STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Elegir el tipo de cargamento a reformar en esta orden. Ctrl+Clic para eliminar la orden. Reformar solo es posible si el vehículo lo permite STR_ORDER_DROP_REFIT_AUTO :Cargamento fijo STR_ORDER_DROP_REFIT_AUTO_ANY :Cargamento disponible @@ -3847,8 +3847,8 @@ STR_ORDER_SHIP_DEPOT :astillero de ba STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT :{STRING} {STRING} {STRING} STR_ORDER_GO_TO_DEPOT_FORMAT :{STRING} {DEPOT} -STR_ORDER_REFIT_ORDER :(Reequipar a {STRING}) -STR_ORDER_REFIT_STOP_ORDER :(Reequipar a {STRING} y detenerse) +STR_ORDER_REFIT_ORDER :(Reformar a {STRING}) +STR_ORDER_REFIT_STOP_ORDER :(Reformar a {STRING} y detenerse) STR_ORDER_STOP_ORDER :(Detenerse) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} @@ -3871,18 +3871,18 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(No descargar y STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No descargar y llenar cualquiera) STR_ORDER_NO_UNLOAD_NO_LOAD :(No descargar ni cargar) -STR_ORDER_AUTO_REFIT :(Reequipar a {STRING}) -STR_ORDER_FULL_LOAD_REFIT :(Reequipar a {STRING} y llenar) -STR_ORDER_FULL_LOAD_ANY_REFIT :(Reequipar a {STRING} y llenar cualquiera) -STR_ORDER_UNLOAD_REFIT :(Descargar y cargar con reequipamiento a {STRING}) -STR_ORDER_UNLOAD_FULL_LOAD_REFIT :(Descargar y llenar con reequipamiento a {STRING}) -STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT :(Descargar y llenar cualquiera con reequipamiento a {STRING}) -STR_ORDER_TRANSFER_REFIT :(Transferir y cargar con reequipamiento a {STRING}) -STR_ORDER_TRANSFER_FULL_LOAD_REFIT :(Transferir y llenar con reequipamiento a {STRING}) -STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT :(Transferir y llenar cualquiera con reequipamiento a {STRING}) -STR_ORDER_NO_UNLOAD_REFIT :(No descargar y cargar con reequipamiento a {STRING}) -STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT :(No descargar y llenar con reequipamiento a {STRING}) -STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT :(No descargar y llenar cualquiera con reequipamiento a {STRING}) +STR_ORDER_AUTO_REFIT :(Reformar a {STRING}) +STR_ORDER_FULL_LOAD_REFIT :(Llenar todo y reformar a{STRING}) +STR_ORDER_FULL_LOAD_ANY_REFIT :(Llenar cualquiera y reformar a {STRING}) +STR_ORDER_UNLOAD_REFIT :(Descargar y cargar con reforma a {STRING}) +STR_ORDER_UNLOAD_FULL_LOAD_REFIT :(Descargar y llenar todo con reforma a {STRING}) +STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT :(Descargar y llenar cualquiera con reforma a {STRING}) +STR_ORDER_TRANSFER_REFIT :(Transferir y cargar con reforma a {STRING}) +STR_ORDER_TRANSFER_FULL_LOAD_REFIT :(Transferir y llenar con reforma a {STRING}) +STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT :(Transferir y llenar cualquiera con reforma a {STRING}) +STR_ORDER_NO_UNLOAD_REFIT :(No descargar y cargar con reforma a {STRING}) +STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT :(No descargar y llenar todo con reforma a {STRING}) +STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT :(No descargar y llenar cualquiera con reforma a {STRING}) STR_ORDER_AUTO_REFIT_ANY :cargamento disponible @@ -4384,10 +4384,10 @@ STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vehícul STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Barco estorba STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Aeronave obstaculiza -STR_ERROR_CAN_T_REFIT_TRAIN :{WHITE}No se puede reequipar tren... -STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE :{WHITE}No se puede reequipar vehículo de carretera... -STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}No se puede reequipar barco... -STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}No se puede reequipar aeronave... +STR_ERROR_CAN_T_REFIT_TRAIN :{WHITE}No se puede reformar tren... +STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE :{WHITE}No se puede reformar vehículo de carretera... +STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}No se puede reformar barco... +STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}No se puede reformar aeronave... STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}No se puede cambiar nombre del tren... STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}No se puede cambiar nombre del vehículo... From 5fe62ccb3e1a9763349a3aba3f0a95b3b8a5c448 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 22 Jan 2018 18:45:38 +0000 Subject: [PATCH 35/58] (svn r27966) -Update from Eints: spanish (mexican): 32 changes by Absay portuguese: 41 changes by Samu --- src/lang/portuguese.txt | 70 ++++++++++++++++++++++++----------------- src/lang/spanish_MX.txt | 64 ++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 61 deletions(-) diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 1914a11add..dd8e94f24e 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1373,6 +1373,8 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Desligado STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Deslocar com botão esquerdo: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Activar deslocamento do mapa através de arrastamento com o botão esquerdo do rato. Esta opção é particularmente útil quando é usado um ecran de toque para deslocamento +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Fechar janelas ao fazer clique direito: {STRING} +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Fecha uma janela ao fazer clique direito dentro dela. Desactiva os textos de ajuda ao fazer clique direito! STR_CONFIG_SETTING_AUTOSAVE :Guardar automaticamente: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Seleccione o intervalo entre gravações automáticas @@ -1402,7 +1404,7 @@ STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT :Mostrar horári STR_CONFIG_SETTING_QUICKGOTO :Criação rápida de ordens de veículos: {STRING} STR_CONFIG_SETTING_QUICKGOTO_HELPTEXT :Pré-seleccionar o 'cursor Ir Para' ao abrir a janela de ordens STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE :Tipo padrão de ferrovia (ao criar ou abrir jogo): {STRING} -STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT :Tipo de carrir seleccionado após o início ou carregamento de um jogo. 'primeiro disponível' selecciona o tipo mais antigo de carril, 'último disponível' selecciona o tipo mais recente de carril e 'mais utilizado' selecciona o tipo mais utilizado actualmente +STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT :Tipo de carril seleccionado após o início ou carregamento de um jogo. 'primeiro disponível' selecciona o tipo mais antigo de carril, 'último disponível' selecciona o tipo mais recente de carril e 'mais utilizado' selecciona o tipo mais utilizado actualmente STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST :Primeiro disponível STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST :Último disponível STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED :Mais utilizado @@ -2591,6 +2593,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Nome do STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Carga aceite: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) +STR_LANG_AREA_INFORMATION_RAIL_TYPE :{BLACK}Tipo de carril: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Limite de velocidade da linha: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Limite de velocidade da estrada: {LTBLUE}{VELOCITY} @@ -2603,29 +2606,29 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS :Campos STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND :Neve STR_LAI_CLEAR_DESCRIPTION_DESERT :Deserto -STR_LAI_RAIL_DESCRIPTION_TRACK :Caminhos-de-ferro linha -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Caminhos-de-ferro linha com sinais de bloqueio -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :Caminhos-de-ferro linha com pre-sinais -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Caminhos-de-ferro linha com sinais de saída -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :Caminhos-de-ferro linha com sinais combinados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Caminhos-de-ferro linha com sinais de caminho -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Caminhos-de-ferro linha com sinais de sentido único -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :Caminhos-de-ferro linha com bloqueio e pré-sinais -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :Caminhos-de-ferro linha com bloqueio e sinais de saida -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Caminhos-de-ferro linha com bloqueio e sinais combinados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Caminhos-de-ferro linha com bloqueio e sinais de rota -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Caminhos-de-ferro linha com bloqueio e sinais de sentido único -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :Caminhos-de-ferro linha com pré-sinais e sinais de saida -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :Caminhos-de-ferro linha com pré-sinais e sinais combinados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :Caminhos-de-ferro linha com pré-sinais e sinais de rota -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :Caminhos-de-ferro linha com pré-sinais e sinais de sentido único -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :Caminhos-de-ferro linha com sinais de saida e sinais combinados -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Caminhos-de-ferro linha com sinais de saida e sinais de rota -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Caminhos-de-ferro linha com sinais de saida e de sentido único -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Caminhos-de-ferro linha com sinais combinados e sinais de rota -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Caminhos-de-ferro linha com sinais combinados e sentido unico -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Caminhos-de-ferro linha com sinais de rota e de sentido unico -STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :Caminhos-de-ferro depósito de comboios +STR_LAI_RAIL_DESCRIPTION_TRACK :Linha de caminhos-de-ferro +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Linha de caminhos-de-ferro com sinais de bloqueio +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :Linha de caminhos-de-ferro com pre-sinais +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Linha de caminhos-de-ferro com sinais de saída +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :Linha de caminhos-de-ferro com sinais combinados +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Linha de caminhos-de-ferro com sinais de rota +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Linha de caminhos-de-ferro com sinais de sentido único +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :Linha de caminhos-de-ferro com sinais de bloqueio e pré-sinais +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :Linha de caminhos-de-ferro com sinais de bloqueio e de saida +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Linha de caminhos-de-ferro com sinais de bloqueio e combinados +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Linha de caminhos-de-ferro com sinais de bloqueio e de rota +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Linha de caminhos-de-ferro com sinais de bloqueio e de sentido único +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :Linha de caminhos-de-ferro com pré-sinais e sinais de saida +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS :Linha de caminhos-de-ferro com pré-sinais e sinais combinados +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS :Linha de caminhos-de-ferro com pré-sinais e sinais de rota +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS :Linha de caminhos-de-ferro com pré-sinais e sinais de sentido único +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :Linha de caminhos-de-ferro com sinais de saida e combinados +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Linha de caminhos-de-ferro com sinais de saida e de rota +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Linha de caminhos-de-ferro com sinais de saida e de sentido único +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Linha de caminhos-de-ferro com sinais combinados e de rota +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Linha de caminhos-de-ferro com sinais combinados e de sentido único +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Linha de caminhos-de-ferro com sinais de rota e de sentido único +STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :Depósito de comboios de caminhos-de-ferro STR_LAI_ROAD_DESCRIPTION_ROAD :Estrada STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS :Estrada com iluminação @@ -3294,6 +3297,7 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Necessá STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Necessário: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Requer: STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} a aguardar{STRING} @@ -3364,8 +3368,10 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Remover todos o STR_GROUP_RENAME_CAPTION :{BLACK}Renomear um grupo +STR_GROUP_PROFIT_THIS_YEAR :Lucro deste ano: STR_GROUP_PROFIT_LAST_YEAR :Lucro no último ano: STR_GROUP_OCCUPANCY :Utilização actual: +STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Novos Veículos Ferroviários @@ -3398,6 +3404,7 @@ STR_PURCHASE_INFO_ALL_TYPES :Todos os tipos STR_PURCHASE_INFO_ALL_BUT :Todas menos {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Máx. Força de Tracção: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Alcance: {GOLD}{COMMA} quadrados +STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Tipo de aeronave: {GOLD}{STRING} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Lista de veículos ferroviários - clique num veículo para informações STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Lista de veículos rodoviários - clique num veículo para informações @@ -3529,10 +3536,13 @@ STR_ENGINE_PREVIEW_SHIP :barco STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE :locomotiva monocarril STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :locomotiva maglev -STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Custo: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade: {VELOCITY} Potência: {POWER}{}Custo de circulação: {CURRENCY_LONG}/ano{}Capacidade: {CARGO_LONG} -STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Custo: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade: {VELOCITY} Potência: {POWER} Máx. F.T.: {6:FORCE}{}Custo de circulação: {4:CURRENCY_LONG}/ano{}Capacidade: {5:CARGO_LONG} -STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Máx. Velocidade: {VELOCITY}{}Capacidade: {CARGO_LONG}{}Custo de circulação: {CURRENCY_LONG}/ano -STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Vel. Máxima: {VELOCITY}{}Tipo de Aeronave: {STRING} Alcance: {COMMA}{}Capacity: {CARGO_LONG}, {CARGO_LONG}{}Custo de circulação: {CURRENCY_LONG}/yr +STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Custo: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade Máx.: {VELOCITY} Potência: {POWER}{}Custo de Circulação: {CURRENCY_LONG}/ano{}Capacidade: {CARGO_LONG} +STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Custo: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Velocidade Máx.: {VELOCITY} Potência: {POWER} F.T. Máx.: {6:FORCE}{}Custo de Circulação: {4:CURRENCY_LONG}/ano{}Capacidade: {5:CARGO_LONG} +STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO_LONG}{}Custo de Circulação: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Velocidade Máx.: {VELOCITY}{}Tipo de Aeronave: {STRING}{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Custo de Circulação: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Velocidade Máx.: {VELOCITY}{}Tipo de Aeronave: {STRING}{}Capacidade: {CARGO_LONG}{}Custo de Circulação: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Velocidade Máx.: {VELOCITY}{}Tipo de Aeronave: {STRING} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Custo de Circulação: {CURRENCY_LONG}/ano +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_RUNCOST :{BLACK}Custo: {CURRENCY_LONG} Velocidade Máx.: {VELOCITY}{}Tipo de Aeronave: {STRING} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}{}Custo de Circulação: {CURRENCY_LONG}/ano # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituir {STRING} - {STRING} @@ -3562,6 +3572,7 @@ STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Pression STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}Alternar entre a janela de substituição de locomotivas e a janela de substituição de vagões STR_REPLACE_ENGINES :Locomotivas STR_REPLACE_WAGONS :Vagões +STR_REPLACE_ALL_RAILTYPE :Todos os veículos ferroviários STR_REPLACE_HELP_RAILTYPE :{BLACK}Seleccione o tipo de carril para o qual deseja efectuar a substituição dos motores STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Exibe o tipo de motor que substituirá o que está seleccionado à esquerda, se algum @@ -3655,6 +3666,7 @@ STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} an STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Máx. velocidade: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}Vel. máxima: {LTBLUE}{VELOCITY} {BLACK}Tipo de Aeronave: {LTBLUE}{STRING} +STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY} {BLACK}Tipo de Aeronave: {LTBLUE}{STRING} {BLACK}Alcance: {LTBLUE}{COMMA} quadrados STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Max. velocidade: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Máx. velocidade: {LTBLUE}{VELOCITY} {BLACK}Máx. E.T.: {LTBLUE}{FORCE} @@ -4025,7 +4037,7 @@ STR_AI_SETTINGS_CAPTION_GAMESCRIPT :Script de Jogo STR_AI_SETTINGS_CLOSE :{BLACK}Fechar STR_AI_SETTINGS_RESET :{BLACK}Repor STR_AI_SETTINGS_SETTING :{STRING}: {ORANGE}{STRING} -STR_AI_SETTINGS_START_DELAY :Número de dias para iniciar esta IA depois da anterior (tomar ou lorgar): {ORANGE}{STRING} +STR_AI_SETTINGS_START_DELAY :Número de dias para iniciar esta IA depois da anterior (aproximadamente): {ORANGE}{STRING} # Textfile window diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 0219f79bdc..1c8ca5c220 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -862,10 +862,10 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLACK}{ENGINE} STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}¡Nuev{G o a} {STRING} ahora disponible! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ya no recibe {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ya no recibe {STRING} ni {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} recibe ahora {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} recibe ahora {STRING} y {STRING} +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ya no acepta {STRING} +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ya no acepta {STRING} ni {STRING} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} acepta ahora {STRING} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} acepta ahora {STRING} y {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta de subsidio vencida:{}{}{STRING} de {STRING} a {STRING} ya no está subsidiado STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidio retirado:{}{}El servicio de {STRING} desde {STRING} a {STRING} ya no está subsidiado @@ -1141,7 +1141,7 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER :Centro STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT :Derecha STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Máximo préstamo inicial: {STRING} -STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Máxima cantidad que una empresa puede recibir como préstamo (sin tener en cuenta la inflación) +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Máxima cantidad que una empresa puede pedir prestada (sin tener en cuenta la inflación) STR_CONFIG_SETTING_INTEREST_RATE :Porcentaje de interés: {STRING} STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT :Porcentaje de interés de los préstamos; controla también la inflación, en caso de estar activada STR_CONFIG_SETTING_RUNNING_COSTS :Costos de operación: {STRING} @@ -1794,7 +1794,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}¿Está STR_CHEATS :{WHITE}Trucos STR_CHEATS_TOOLTIP :{BLACK}Las casillas marcadas indican que ya se usó este truco STR_CHEATS_WARNING :{BLACK}¡Atención! Estás a punto de traicionar a tus competidores. Recuerda que siempre se recordará tal deshonra -STR_CHEAT_MONEY :{LTBLUE}Recibir {CURRENCY_LONG} de dinero +STR_CHEAT_MONEY :{LTBLUE}Añadir {CURRENCY_LONG} en efectivo STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jugar como la empresa: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Excavadora mágica (elimina industrias y objetos inamovibles): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Los túneles se pueden cruzar: {ORANGE}{STRING} @@ -2191,7 +2191,7 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} cr STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} salió de la partida ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} cambió su nombre a {STRING} STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} le dio a tu empresa {2:CURRENCY_LONG} -STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY :*** {2:CURRENCY_LONG} entregado a la empresa {1:STRING} +STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY :*** {2:CURRENCY_LONG} cedidos a la empresa {1:STRING} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}El servidor ha cerrado la sesión STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Se está reiniciando el servidor...{}Espera por favor... @@ -2298,7 +2298,7 @@ STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Desactiv STR_STATION_BUILD_COVERAGE_ON :{BLACK}Activado STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}No mostrar área de recolección en el sitio planeado STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Mostrar área de recolección en el sitio planeado -STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Recibe: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Acepta: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Provee: {GOLD}{CARGO_LIST} # Join station window @@ -3113,9 +3113,9 @@ STR_STATION_VIEW_WAITING_CARGO :{WHITE}{CARGO_L STR_STATION_VIEW_EN_ROUTE_FROM :{YELLOW}({CARGO_SHORT} en camino desde {STATION}) STR_STATION_VIEW_RESERVED :{YELLOW}({CARGO_SHORT} reservado para cargar) -STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Recibe -STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Mostrar lista de cargamento recibido -STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Recibe: {WHITE}{CARGO_LIST} +STR_STATION_VIEW_ACCEPTS_BUTTON :{BLACK}Acepta +STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Lista de cargamento aceptado +STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Acepta: {WHITE}{CARGO_LIST} STR_STATION_VIEW_EXCLUSIVE_RIGHTS_SELF :{BLACK}Esta estación tiene los derechos exclusivos de transporte en este pueblo. STR_STATION_VIEW_EXCLUSIVE_RIGHTS_COMPANY :{YELLOW}{COMPANY}{BLACK} compró los derechos exclusivos de transporte en este pueblo. @@ -3748,7 +3748,7 @@ STR_ORDERS_CAPTION :{WHITE}{VEHICLE STR_ORDERS_TIMETABLE_VIEW :{BLACK}Itinerario STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar a la ventana de itinerarios -STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes: Clic en una orden para seleccionarla. Ctrl+Clic para desplazarse a la estación indicada en la orden +STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes: Clic en una orden para resaltarla. Ctrl+Clic para desplazarse a la estación indicada en la orden STR_ORDER_INDEX :{COMMA}:{NBSP} STR_ORDER_TEXT :{STRING} {STRING} {STRING} @@ -3759,23 +3759,23 @@ STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin de órd STR_ORDER_NON_STOP :{BLACK}Sin paradas STR_ORDER_GO_TO :Ir a STR_ORDER_GO_NON_STOP_TO :Ir sin paradas a -STR_ORDER_GO_VIA :Ir por +STR_ORDER_GO_VIA :Pasar por STR_ORDER_GO_NON_STOP_VIA :Ir sin paradas por -STR_ORDER_TOOLTIP_NON_STOP :{BLACK}Cambiar el comportamiento de parada en la orden elegida +STR_ORDER_TOOLTIP_NON_STOP :{BLACK}Cambiar la forma de parada en la orden resaltada -STR_ORDER_TOGGLE_FULL_LOAD :{BLACK}Llenar cualquier carga +STR_ORDER_TOGGLE_FULL_LOAD :{BLACK}Llenar cualquiera STR_ORDER_DROP_LOAD_IF_POSSIBLE :Cargar si hay disponible -STR_ORDER_DROP_FULL_LOAD_ALL :Llenar todas las cargas -STR_ORDER_DROP_FULL_LOAD_ANY :Llenar cualquier carga +STR_ORDER_DROP_FULL_LOAD_ALL :Llenar todo +STR_ORDER_DROP_FULL_LOAD_ANY :Llenar cualquiera STR_ORDER_DROP_NO_LOADING :No cargar -STR_ORDER_TOOLTIP_FULL_LOAD :{BLACK}Cambiar el comportamiento de carga en la orden elegida +STR_ORDER_TOOLTIP_FULL_LOAD :{BLACK}Cambiar la forma de carga en la orden resaltada STR_ORDER_TOGGLE_UNLOAD :{BLACK}Descargar todo -STR_ORDER_DROP_UNLOAD_IF_ACCEPTED :Descargar si es recibido +STR_ORDER_DROP_UNLOAD_IF_ACCEPTED :Descargar si es aceptado STR_ORDER_DROP_UNLOAD :Descargar todo STR_ORDER_DROP_TRANSFER :Transferir STR_ORDER_DROP_NO_UNLOADING :No descargar -STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Cambiar el comportamiento de descarga en la orden elegida +STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Cambiar la forma de descarga en la orden resaltada STR_ORDER_REFIT :{BLACK}Reformar STR_ORDER_REFIT_TOOLTIP :{BLACK}Elegir el tipo de cargamento a reformar en esta orden. Ctrl+Clic para eliminar la orden @@ -3804,21 +3804,21 @@ STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Tiempo de vida STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}Comparación de los datos del vehículo respecto al valor dado STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :es igual a STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS :no es igual a -STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN :es menos de -STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS :es menor o igual a -STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN :es más de -STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS :es más o igual a +STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN :es menor que +STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS :es menor o igual que +STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN :es mayor que +STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS :es mayor o igual a STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE :es verdadero STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :es falso STR_ORDER_CONDITIONAL_VALUE_TOOLTIP :{BLACK}El valor contra el cual comparar de los datos del vehículo -STR_ORDER_CONDITIONAL_VALUE_CAPT :{WHITE}Indicar el valor contra el cual comparar +STR_ORDER_CONDITIONAL_VALUE_CAPT :{WHITE}Indicar el valor a comparar -STR_ORDERS_SKIP_BUTTON :{BLACK}Saltar -STR_ORDERS_SKIP_TOOLTIP :{BLACK}Ignorar la orden actual y saltar a la siguiente. Ctrl+Clic salta a la orden elegida +STR_ORDERS_SKIP_BUTTON :{BLACK}Ignorar +STR_ORDERS_SKIP_TOOLTIP :{BLACK}Ignorar la orden actual y proceder con la siguiente. Ctrl+Clic para iniciar la orden resaltada STR_ORDERS_DELETE_BUTTON :{BLACK}Eliminar -STR_ORDERS_DELETE_TOOLTIP :{BLACK}Eliminar orden marcada +STR_ORDERS_DELETE_TOOLTIP :{BLACK}Eliminar orden resaltada STR_ORDERS_DELETE_ALL_TOOLTIP :{BLACK}Eliminar todas las órdenes STR_ORDERS_STOP_SHARING_BUTTON :{BLACK}Dejar de compartir STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Dejar de compartir la lista de órdenes. Ctrl+Clic elimina también todas las órdenes de este vehículo @@ -3837,7 +3837,7 @@ STR_ORDER_GO_TO_WAYPOINT :Ir pasando por STR_ORDER_GO_NON_STOP_TO_WAYPOINT :Ir sin paradas pasando por {WAYPOINT} STR_ORDER_SERVICE_AT :Mantenimiento en -STR_ORDER_SERVICE_NON_STOP_AT :Mantenimiento sin paradas en +STR_ORDER_SERVICE_NON_STOP_AT :Ir a sin paradas a mantenimiento en STR_ORDER_NEAREST_DEPOT :el más cercano STR_ORDER_NEAREST_HANGAR :el hangar más cercano @@ -3859,7 +3859,7 @@ STR_ORDER_FULL_LOAD :(Llenar todo) STR_ORDER_FULL_LOAD_ANY :(Llenar cualquiera) STR_ORDER_NO_LOAD :(No cargar) STR_ORDER_UNLOAD :(Descargar y cargar) -STR_ORDER_UNLOAD_FULL_LOAD :(Descargar y llenar) +STR_ORDER_UNLOAD_FULL_LOAD :(Descargar y llenar todo) STR_ORDER_UNLOAD_FULL_LOAD_ANY :(Descargar y llenar cualquiera) STR_ORDER_UNLOAD_NO_LOAD :(Descargar y dejar vacío) STR_ORDER_TRANSFER :(Transferir y cargar) @@ -3867,7 +3867,7 @@ STR_ORDER_TRANSFER_FULL_LOAD :(Transferir y l STR_ORDER_TRANSFER_FULL_LOAD_ANY :(Transferir y llenar cualquiera) STR_ORDER_TRANSFER_NO_LOAD :(Transferir y dejar vacío) STR_ORDER_NO_UNLOAD :(No descargar y cargar) -STR_ORDER_NO_UNLOAD_FULL_LOAD :(No descargar y llenar) +STR_ORDER_NO_UNLOAD_FULL_LOAD :(No descargar y llenar todo) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No descargar y llenar cualquiera) STR_ORDER_NO_UNLOAD_NO_LOAD :(No descargar ni cargar) @@ -3890,7 +3890,7 @@ STR_ORDER_STOP_LOCATION_NEAR_END :[principio] STR_ORDER_STOP_LOCATION_MIDDLE :[centro] STR_ORDER_STOP_LOCATION_FAR_END :[fondo] -STR_ORDER_OUT_OF_RANGE :{RED} (El sig. destino está legos del alcance) +STR_ORDER_OUT_OF_RANGE :{RED} (El siguiente destino está muy lejos) STR_ORDER_CONDITIONAL_UNCONDITIONAL :Saltar a orden {COMMA} STR_ORDER_CONDITIONAL_NUM :Saltar a orden {COMMA} cuando {STRING} {STRING} {COMMA} From cefedd692361b5bf0809b84c031c6d7e16ab43d4 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 23 Jan 2018 18:45:40 +0000 Subject: [PATCH 36/58] (svn r27967) -Update from Eints: portuguese: 2 changes by Samu --- src/lang/portuguese.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index dd8e94f24e..2f0603c443 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1199,9 +1199,9 @@ STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT :Altura máxima STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :Tamanho máximo de túneis: {STRING} STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT :Tamanho máximo para construção de túneis STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :Método de financiamento de indústrias primárias: {STRING} -STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT :Método de financiar uma indústria pirmária. 'nenhum' significa que não é possível financiar nenhuma, 'prospecção' significa que é possível financiar, mas a construção é feita num local arbitrário no mapa e até pode falhar, 'como outras indústrias' significa que as indústrias de matérias primas podem ser construídas por companhias como indústrias de processamento em qualquer sítio que elas escolham +STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT :Método de financiar uma indústria primária. 'nenhum' significa que não é possível financiar nenhuma, 'prospecção' significa que é possível financiar, mas a construção é feita num local arbitrário no mapa e até pode falhar, 'como as outras' significa que as indústrias de matérias primas podem ser construídas em qualquer sítio pelas empresas, como se fossem indústrias de processamento STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Nenhum -STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Mesmo método +STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Como as outras STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Prospecção STR_CONFIG_SETTING_INDUSTRY_PLATFORM :Área plana à volta das industrias: {STRING} STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT :Quantidade de terreno plano á volta de uma industria. Isto garante que terreno vazio esteja disponível para construir linhas, etc From eec61671552d31e940734b78fc4a7cf5064d20c2 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 7 Feb 2018 18:45:38 +0000 Subject: [PATCH 37/58] (svn r27968) -Update from Eints: korean: 1 change by telk5093 --- src/lang/korean.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 923bced9f9..5c0de74420 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2385,7 +2385,7 @@ STR_BRIDGE_NAME_GIRDER_STEEL :강철 거더 STR_BRIDGE_NAME_CANTILEVER_STEEL :강철 캔틸레버교 STR_BRIDGE_NAME_SUSPENSION_CONCRETE :콘크리트 현수교 STR_BRIDGE_NAME_WOODEN :나무 다리 -STR_BRIDGE_NAME_CONCRETE :콘트리트교 +STR_BRIDGE_NAME_CONCRETE :콘크리트교 STR_BRIDGE_NAME_TUBULAR_STEEL :강철 원통형 다리 STR_BRIDGE_TUBULAR_SILICON :실리콘 원통형 다리 From d6df92b6df6e9092b44e1c059ae6c5c6ddaec082 Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 23 Feb 2018 18:45:38 +0000 Subject: [PATCH 38/58] (svn r27969) -Update from Eints: danish: 22 changes by Knogle --- src/lang/danish.txt | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 18abcb7846..a596e0cce5 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1372,6 +1372,8 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Fra STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Venstreklik-scrolling: {STRING} STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT :Aktiver rulle kortet ved at trække den med venstre museknap. Dette er især nyttigt, når du bruger en touch-screen til at rulle +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Luk vindue ved højre-klik: {STRING} +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Lukker vinduet ved at højreklikke inde i det. Deaktiverer værktøjstip ved at højreklikke! STR_CONFIG_SETTING_AUTOSAVE :Auto gem: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Vælg interval mellem automatisk gemte spil @@ -1761,6 +1763,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Tjek for STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Vis computerspiller/spilscript indstillinger STR_INTRO_TOOLTIP_QUIT :{BLACK}Afslut 'OpenTTD' +STR_INTRO_BASESET :{BLACK} Det aktuelt valgte base grafiksæt mangler {NUM} sprite {P "" s}. Se venligst efter opdateringer til basesættet. STR_INTRO_TRANSLATION :{BLACK}Denne oversættelse mangler {NUM} streng{P "" e}. Hjælp venligst med at gøre OpenTTD bedre ved at tilmelde dig som oversætter. Se readme.txt for detaljer. # Quit window @@ -2589,6 +2592,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Lufthavn STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Accepteret last: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) +STR_LANG_AREA_INFORMATION_RAIL_TYPE :{BLACK}Tog type: {LTBLUE}{STRING} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Togspors hastighedsgrænse: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Vej hastighedsbegrænsning: {LTBLUE}{VELOCITY} @@ -2604,13 +2608,13 @@ STR_LAI_CLEAR_DESCRIPTION_DESERT :Ørken STR_LAI_RAIL_DESCRIPTION_TRACK :Jernbane spor STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Jernbane spor med bloksignaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS :Jernbane spor med with pre-signaler -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Jernbane spor med udgangssignaler +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS :Jernbane spor med udgangs-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS :Jernbane spor med kombinerede signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS :Jernbane spor med rute-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS :Jernbane spor med en-vejs-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS :Jernbane spor med blok- og pre-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS :Jernbane spor med blok- og udgangs-signaler -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Jernbane spor med blok og kombinerede signaler +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS :Jernbane spor med blok- og kombinerede signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS :Jernbane spor med blok- og rute-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS :Jernbane spor med blok og en-vejs rute-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS :Jernbane spor med pre- og udgangs-signaler @@ -2621,7 +2625,7 @@ STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS :Jernbane spor m STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS :Jernbane spor med udgangs- og rute-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS :Jernbane spor med udgangs- og en-vejs rute-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS :Jernbane spor med kombinerede og rute-signaler -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Jernbane spor med kombinerede og en-vejs rute-signaler +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS :Jernbane spor med kombinationede- og en-vejs rute-signaler STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS :Jernbane spor med rute- og en-vejs rute-signaler STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT :Jernbane togdepot @@ -3292,6 +3296,9 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO :{BLACK}Kræver: STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO :{BLACK}Kræver: {YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING} ############ range for requires ends +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Kræver: +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} venter{STRING} ############ range for produces starts STR_INDUSTRY_VIEW_PRODUCES_CARGO :{BLACK}Producerer: {YELLOW}{STRING}{STRING} @@ -3360,6 +3367,10 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Fjern alle kør STR_GROUP_RENAME_CAPTION :{BLACK}Omdøb en gruppe +STR_GROUP_PROFIT_THIS_YEAR :Afkast i år: +STR_GROUP_PROFIT_LAST_YEAR :Afkast sidste år: +STR_GROUP_OCCUPANCY :Nuværende brug: +STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Nye jernbanekøretøjer @@ -3392,6 +3403,7 @@ STR_PURCHASE_INFO_ALL_TYPES :Alle lasttyper STR_PURCHASE_INFO_ALL_BUT :Alle undtagen {CARGO_LIST} STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. trækkraft: {GOLD}{FORCE} STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Rækkevidde: {GOLD}{COMMA} felter +STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Fly type: {GOLD}{STRING} STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Togvalgsliste - klik på et køretøj for mere information STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Liste over køretøjstyper - klik på køretøj for information @@ -3526,6 +3538,10 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :magnetskinnelok STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Pris: {CURRENCY_LONG} Vægt: {WEIGHT_SHORT}{}Hastighed: {VELOCITY} Styrke: {POWER}{}Driftsomkostninger: {CURRENCY_LONG}/år{}Kapacitet: {CARGO_LONG} STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Pris: {CURRENCY_LONG} Vægt: {WEIGHT_SHORT}{}Hastighed: {VELOCITY} Hestekræfter: {POWER} Maks. Trækkraft: {6:FORCE}{}Driftsomkostning: {4:CURRENCY_LONG}/år{}Kapacitet: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Pris: {CURRENCY_LONG} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO_LONG}{}Driftsomkostninger: {CURRENCY_LONG}/år +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST :{BLACK}Pris: {CURRENCY_LONG} Max. Hastighed: {VELOCITY}{}Aircraft type: {STRING}{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Omkostninger: {CURRENCY_LONG}/år +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}Pris: {CURRENCY_LONG} Max. Hastighed: {VELOCITY}{}Fly type: {STRING}{}Kapacitet: {CARGO_LONG}{}Omkostninger: {CURRENCY_LONG}/år +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST :{BLACK}Pris: {CURRENCY_LONG} Max. Hastighed: {VELOCITY}{}Fly type: {STRING} Rækkevidde: {COMMA} felter{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Omkostninger: {CURRENCY_LONG}/år +STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_RUNCOST :{BLACK}Pris: {CURRENCY_LONG} Max. Hastighed{VELOCITY}{}Fly type: {STRING} Rækkevidde: {COMMA} felter{}Kapacitet: {CARGO_LONG}{}Omkostninger: {CURRENCY_LONG}/år # Autoreplace window STR_REPLACE_VEHICLES_WHITE :{WHITE}Udskift {STRING} - {STRING} @@ -3555,6 +3571,7 @@ STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Tryk for STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}Skift imellem lokomotiv- og vognudskiftningsvindue STR_REPLACE_ENGINES :Lokomotiver STR_REPLACE_WAGONS :Vogne +STR_REPLACE_ALL_RAILTYPE :Alle jernbanevogne STR_REPLACE_HELP_RAILTYPE :{BLACK}Vælg den skinne type, du ønsker at udskifte lokomotiver til STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Viser hvilket køretøj det valgte køretøj til venstre bliver udskiftet med, hvis det udskiftes @@ -3647,6 +3664,8 @@ STR_VEHICLE_INFO_AGE :{COMMA} år ({C STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} år ({COMMA}) STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Maks. hast.: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}Max. hastighed: {LTBLUE}{VELOCITY} {BLACK}Fly type: {LTBLUE}{STRING} +STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE :{BLACK}Max. hastighed: {LTBLUE}{VELOCITY} {BLACK}Fly type: {LTBLUE}{STRING} {BLACK}Rækkevidde: {LTBLUE}{COMMA} felter STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Vægt: {LTBLUE}{WEIGHT_SHORT} {BLACK}Effekt: {LTBLUE}{POWER}{BLACK} Maks. hast.: {LTBLUE}{VELOCITY} STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Vægt: {LTBLUE}{WEIGHT_SHORT} {BLACK}Effekt: {LTBLUE}{POWER}{BLACK} Maks. hast.: {LTBLUE}{VELOCITY} {BLACK}Maks. trækkraft: {LTBLUE}{FORCE} From d6354f5408db4f7650cc64294f03a5278a0ce35d Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 28 Feb 2018 18:45:37 +0000 Subject: [PATCH 39/58] (svn r27970) -Update from Eints: greek: 1 change by Jubilee --- src/lang/greek.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/greek.txt b/src/lang/greek.txt index ae56581485..686e619a70 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1479,6 +1479,7 @@ 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_RIGHT_MOUSE_WND_CLOSE :Κλείσιμο παραθύρου με δεξί-κλικ: {STRING} STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Κλείνει το παράθυρο με δεξί πάτημα μέσα του. Απενεργοποιεί την ανάδυση επεξηγήσεων με το δεξί κουμπί! STR_CONFIG_SETTING_AUTOSAVE :Αυτόματο σώσιμο: {STRING} From 9ce3403e2ddd5c0bdcde4aadfe8518415b893f5d Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 1 Mar 2018 18:45:36 +0000 Subject: [PATCH 40/58] (svn r27971) -Update from Eints: spanish (mexican): 2 changes by Absay --- src/lang/spanish_MX.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 1c8ca5c220..0fb6815e2b 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -1857,7 +1857,7 @@ STR_FACE_FEMALE_BUTTON :{BLACK}Mujer STR_FACE_FEMALE_TOOLTIP :{BLACK}Elegir cara femenina STR_FACE_NEW_FACE_BUTTON :{BLACK}Nueva cara STR_FACE_NEW_FACE_TOOLTIP :{BLACK}Generar cara al azar -STR_FACE_ADVANCED :{BLACK}Avanzada +STR_FACE_ADVANCED :{BLACK}Avanzado STR_FACE_ADVANCED_TOOLTIP :{BLACK}Selección avanzada de caras STR_FACE_SIMPLE :{BLACK}Simple STR_FACE_SIMPLE_TOOLTIP :{BLACK}Selección simple de caras @@ -4493,7 +4493,7 @@ STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1 :Edificio de ofi STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1 :Conjunto habitacional pequeño STR_TOWN_BUILDING_NAME_CHURCH_1 :Iglesia STR_TOWN_BUILDING_NAME_LARGE_OFFICE_BLOCK_1 :Complejo de oficinas -STR_TOWN_BUILDING_NAME_TOWN_HOUSES_1 :Casas de pueblo +STR_TOWN_BUILDING_NAME_TOWN_HOUSES_1 :Casas adosadas STR_TOWN_BUILDING_NAME_HOTEL_1 :Hotel STR_TOWN_BUILDING_NAME_STATUE_1 :Estatua STR_TOWN_BUILDING_NAME_FOUNTAIN_1 :Fuente From b85190128aafd3b6905539e01445f8bbce974038 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 5 Mar 2018 21:24:48 +0000 Subject: [PATCH 41/58] (svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots. --- src/table/elrail_data.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/table/elrail_data.h b/src/table/elrail_data.h index 102ad42644..6915360035 100644 --- a/src/table/elrail_data.h +++ b/src/table/elrail_data.h @@ -310,10 +310,10 @@ enum WireSpriteOffset { WSO_X_NE_UP, WSO_Y_NW_DOWN, - WSO_ENTRANCE_NE, - WSO_ENTRANCE_SE, WSO_ENTRANCE_SW, WSO_ENTRANCE_NW, + WSO_ENTRANCE_NE, + WSO_ENTRANCE_SE, }; struct SortableSpriteStruct { @@ -400,10 +400,10 @@ static const SortableSpriteStruct RailCatenarySpriteData_Depot[] = { }; static const SortableSpriteStruct RailCatenarySpriteData_Tunnel[] = { - { WSO_ENTRANCE_NE, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for NE tunnel exit - { WSO_ENTRANCE_SE, 7, 0, 1, 15, 1, ELRAIL_ELEVATION }, //! Wire for SE tunnel exit - { WSO_ENTRANCE_SW, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for SW tunnel exit - { WSO_ENTRANCE_NW, 7, 0, 1, 15, 1, ELRAIL_ELEVATION } //! Wire for NW tunnel exit + { WSO_ENTRANCE_SW, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for NE tunnel (SW facing exit) + { WSO_ENTRANCE_NW, 7, 0, 1, 15, 1, ELRAIL_ELEVATION }, //! Wire for SE tunnel (NW facing exit) + { WSO_ENTRANCE_NE, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for SW tunnel (NE facing exit) + { WSO_ENTRANCE_SE, 7, 0, 1, 15, 1, ELRAIL_ELEVATION } //! Wire for NW tunnel (SE facing exit) }; From c46e470f07864a58fe7c25fb942f48931174068c Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 5 Mar 2018 22:57:49 +0000 Subject: [PATCH 42/58] (svn r27973) -Fix: [FS#6662] Avoid tile operations outside map border when building lock. --- src/water_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index edce4cda58..6b11e7e64b 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -73,7 +73,7 @@ static const uint8 _flood_from_dirs[] = { */ static inline void MarkTileDirtyIfCanalOrRiver(TileIndex tile) { - if (IsTileType(tile, MP_WATER) && (IsCanal(tile) || IsRiver(tile))) MarkTileDirtyByTile(tile); + if (IsValidTile(tile) && IsTileType(tile, MP_WATER) && (IsCanal(tile) || IsRiver(tile))) MarkTileDirtyByTile(tile); } /** From 5df8ac52d60b1eada8157284b5c8be29fcf34829 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Tue, 6 Mar 2018 07:48:29 +0000 Subject: [PATCH 43/58] (svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR) --- src/newgrf.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 4759c8a19c..704892e5cf 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3672,6 +3672,9 @@ static void DuplicateTileTable(AirportSpec *as) HangarTileTable *depot_table = MallocT(as->nof_depots); MemCpyT(depot_table, as->depot_table, as->nof_depots); as->depot_table = depot_table; + Direction *rotation = MallocT(as->num_table); + MemCpyT(rotation, as->rotation, as->num_table); + as->rotation = rotation; } /** @@ -3741,6 +3744,7 @@ static ChangeInfoResult AirportChangeInfo(uint airport, int numinfo, int prop, B } case 0x0A: { // Set airport layout + free(as->rotation); as->num_table = buf->ReadByte(); // Number of layaouts as->rotation = MallocT(as->num_table); uint32 defsize = buf->ReadDWord(); // Total size of the definition From 7ed8067e1cda42a4979175ae5566212f4bf751bd Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 11 Mar 2018 07:16:58 +0000 Subject: [PATCH 44/58] (svn r27975) -Fix (r8969) [FS#6642]: Missing one hair style. --- src/company_manager_face.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/company_manager_face.h b/src/company_manager_face.h index 993e539cc7..511f85b7d5 100644 --- a/src/company_manager_face.h +++ b/src/company_manager_face.h @@ -78,7 +78,7 @@ static const CompanyManagerFaceBitsInfo _cmf_info[] = { /* CMFV_MOUSTACHE */ { 13, 2, { 3, 0, 3, 0 }, { 0x367, 0, 0x397, 0 } }, ///< Depends on CMFV_HAS_MOUSTACHE /* CMFV_LIPS */ { 13, 4, { 12, 10, 9, 9 }, { 0x35B, 0x351, 0x3A5, 0x3C8 } }, ///< Depends on !CMFV_HAS_MOUSTACHE /* CMFV_NOSE */ { 17, 3, { 8, 4, 4, 5 }, { 0x349, 0x34C, 0x393, 0x3B3 } }, ///< Depends on !CMFV_HAS_MOUSTACHE - /* CMFV_HAIR */ { 20, 4, { 9, 5, 5, 4 }, { 0x382, 0x38B, 0x3D4, 0x3D9 } }, + /* CMFV_HAIR */ { 20, 4, { 9, 5, 5, 5 }, { 0x382, 0x38B, 0x3D4, 0x3D9 } }, /* CMFV_JACKET */ { 24, 2, { 3, 3, 3, 3 }, { 0x36B, 0x378, 0x36B, 0x378 } }, /* CMFV_COLLAR */ { 26, 2, { 4, 4, 4, 4 }, { 0x36E, 0x37B, 0x36E, 0x37B } }, /* CMFV_TIE_EARRING */ { 28, 3, { 6, 3, 6, 3 }, { 0x372, 0x37F, 0x372, 0x3D1 } }, ///< Depends on CMFV_HAS_TIE_EARRING From 37be4bef67a9f1664949408e1e876b5b6805323c Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 11:43:32 +0000 Subject: [PATCH 45/58] (svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC) --- bin/baseset/openttd.grf | Bin 498518 -> 501532 bytes media/extra_grf/airports.nfo | 13 +++++++++++++ media/extra_grf/airports.png | Bin 6504 -> 8478 bytes 3 files changed, 13 insertions(+) diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf index 6d979b5d795ec2ea9e200488b8913bf57f6cebe8..5d124f3f8fa8ba03d57e1d67a8abe553fef879ec 100644 GIT binary patch delta 3433 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 ecS}B+hZ}a~#R)@OR>S%0BEEbdoWJhhaQJ@$-p z-ZK*dtrrQ(w4!4r>r;C>84bfIdtYmXh^mEmuls zLW3XZV7jd=+p?^%t(0uS9n7M96ts!9bJ%Xg>@H3Am6{D0(&Ma$rm4qRV|&PD zVT{o$Gr@Z4I)j<)v5We>`&@q&_W}ZN#O-hngOc6ox~)#l)H%@^05IRpCFhN|!w&-7 zv(7AQv*XM4=l0z!M#}B)53y!^k zsJS{lFL4wvC3Ysxcv(=&TNoYS3j&3nsX345AMMiC!rx+RRWQh9#3w5ihnf{q*;bH2 zG@BOu^YwY_mP%z|8mZ1AxkP{hm*RtrEEF|(6orMm}OQ|Aqm>Un=`PK zPW~5ODHyb*Q9d0o`IKXJP!Vrih}pOiudr|x=F&O5!Q1DX80|8RBuxcVG{8Gk^aHoc zq~cAl3i7+cT}9(&S>FZ0p@-|Y_?TN^J!rPhq|-xyUeB}fu?an@Ln*ceAnrNEZn1gi zRSHD6bKAWgKc8G7x|}!WrMa9eD0lwE55>K_7(_HjPtJ^T5o-_W;l?}qI0te6nK?|& zLz80#^lfC$*isX3*J7-g>`~L!1 C?m-v; diff --git a/media/extra_grf/airports.nfo b/media/extra_grf/airports.nfo index 8feb813baf..45cd25de04 100644 --- a/media/extra_grf/airports.nfo +++ b/media/extra_grf/airports.nfo @@ -23,3 +23,16 @@ -1 sprites/airports.png 8bpp 82 88 64 31 -31 0 normal -1 sprites/airports.png 8bpp 162 88 64 31 -31 0 normal -1 sprites/airports.png 8bpp 242 88 64 31 -31 0 normal + -1 * 0 0C "Climate specific sprites by PaulC" + -1 * 0 07 83 01 \7! 01 03 + -1 * 0 05 90 02 0D + -1 sprites/airports.png 8bpp 320 88 64 31 -31 0 normal + -1 sprites/airports.png 8bpp 400 88 64 31 -31 0 normal + -1 * 0 07 83 01 \7! 02 03 + -1 * 0 05 90 02 0D + -1 sprites/airports.png 8bpp 480 88 64 31 -31 0 normal + -1 sprites/airports.png 8bpp 560 88 64 31 -31 0 normal + -1 * 0 07 83 01 \7! 03 03 + -1 * 0 05 90 02 0D + -1 sprites/airports.png 8bpp 640 88 64 31 -31 0 normal + -1 sprites/airports.png 8bpp 720 88 64 31 -31 0 normal diff --git a/media/extra_grf/airports.png b/media/extra_grf/airports.png index fd63355b1f5f428cf951228e1d5012b0bf552ece..a5833b057665b066e4e3c992a5dbaac234d401aa 100644 GIT binary patch delta 7734 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 Date: Sun, 11 Mar 2018 12:03:17 +0000 Subject: [PATCH 46/58] (svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC) --- bin/baseset/orig_dos.obg | 2 +- bin/baseset/orig_dos_de.obg | 2 +- bin/baseset/orig_extra.grf | Bin 327856 -> 328676 bytes bin/baseset/orig_win.obg | 2 +- media/extra_grf/airports.png | Bin 8478 -> 9491 bytes media/extra_grf/airports_orig_extra.nfo | 12 ++++++++++++ media/extra_grf/orig_extra.nfo | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 media/extra_grf/airports_orig_extra.nfo diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg index 2ed8a5a59c..9d0db3e2af 100644 --- a/bin/baseset/orig_dos.obg +++ b/bin/baseset/orig_dos.obg @@ -77,7 +77,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6 -ORIG_EXTRA.GRF = 0b10a95c0adee710ecca9c3d676be4f3 +ORIG_EXTRA.GRF = 67bcfac5911667309d86b7749ea8d08c [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/baseset/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg index 598d8ed89d..754ab5a2d4 100644 --- a/bin/baseset/orig_dos_de.obg +++ b/bin/baseset/orig_dos_de.obg @@ -75,7 +75,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = fcde1d7e8a74197d72a62695884b909e -ORIG_EXTRA.GRF = 0b10a95c0adee710ecca9c3d676be4f3 +ORIG_EXTRA.GRF = 67bcfac5911667309d86b7749ea8d08c [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/baseset/orig_extra.grf b/bin/baseset/orig_extra.grf index 46faff391673e974f469787bf2779dee0659983c..728a8b2555bb3de7506193ed1124209dafa33ad7 100644 GIT binary patch delta 862 zcmWmB&ube;6bJB~*hagp$8px@L?})ecY5b*ci0KW;a((Y_x&Qug+kv%KXN` zy0zWdxsu_QQV;Mv6uG4ez(?|K27F*}XUqAL=Qxh?X~x%}s;1|}Fp9&_JwN<7qbRnW z&EgFq8OM=Z4zAh+-zlJC9i7kTl$t3aD`f+P7rmdA=q|4 z|I2F15LY$Nr{%pF)wAcQyJ!Rr{6>;&lHg`w&1 z3cBvp$RI_Y;ccBD!Ew4ZYGMTY&dBhc)RKEW$LV#uU2F+XzuzAizDH1|*Nc-liw*Lr zYouO)Uas;TMa|L#9OANjZGwsQ@*JOx_1P!HVA4*F`Q`Z?vUvS2pUridjHV`t=I_BM z_7}vU<=L0K#EH@Q6JvfcT>yvG;VA&QH}HW8qky$4Ej+uxB9X-D=5Q-OK${KH#R+<{ z={bQ#I$y8=7wj#?(v#ujci#&vQB7jKM*jj?jQCgKUH43E$!anlkCT`kJNbzk zp!jr!vhd03bTdV?j7|3M4WR#hiJ0ViMwHYf8K(xH#1j3SB2e_u&}56eIhiG55_6oK z8lMf2w*~a+99AWY&gyjFqLBlO#TSQ9AKicPz+qSJ-(Mc(|9Kzi_|>z^M;{(te01sP Ut5-MfU2Q{F{2y1_!ncS20VUCN82|tP delta 35 pcmaFTF0!FfgoTCS|I0>}Ru;ysEKII-?X`_eK+L?owvi>h2>|No4D$d0 diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg index 2b7d43478d..ec00781488 100644 --- a/bin/baseset/orig_win.obg +++ b/bin/baseset/orig_win.obg @@ -76,7 +76,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32 TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1 TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8 -ORIG_EXTRA.GRF = 0b10a95c0adee710ecca9c3d676be4f3 +ORIG_EXTRA.GRF = 67bcfac5911667309d86b7749ea8d08c [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/media/extra_grf/airports.png b/media/extra_grf/airports.png index a5833b057665b066e4e3c992a5dbaac234d401aa..5fb9618bc5bf8113df7bfb7e0739c3864e441d7f 100644 GIT binary patch delta 8723 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 diff --git a/media/extra_grf/airports_orig_extra.nfo b/media/extra_grf/airports_orig_extra.nfo new file mode 100644 index 0000000000..f2a8dc8327 --- /dev/null +++ b/media/extra_grf/airports_orig_extra.nfo @@ -0,0 +1,12 @@ +// +// $Id$ +// +// This file is part of OpenTTD. +// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. +// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . +// + -1 * 0 0C "Climate specific airport sprite by PaulC" + -1 * 0 07 83 01 \7! 03 02 + -1 * 0 0A 01 01 2F 08 + -1 sprites/airports.png 8bpp 20 170 42 39 -19 -21 normal diff --git a/media/extra_grf/orig_extra.nfo b/media/extra_grf/orig_extra.nfo index 534badab03..a1173a58c1 100644 --- a/media/extra_grf/orig_extra.nfo +++ b/media/extra_grf/orig_extra.nfo @@ -78,6 +78,7 @@ #include "chars_orig_extra.nfo" #include "shore.nfo" #include "fix_graphics.nfo" +#include "airports_orig_extra.nfo" #include "canals_extra.nfo" #include "rivers/rapids.nfo" #include "rivers/temperate.nfo" From 91bcc210cff361bb5dc97324a7013a4210c01a25 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 12:11:09 +0000 Subject: [PATCH 47/58] (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) --- src/saveload/saveload.cpp | 3 ++- src/table/settings.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index dfa3be7219..2c00ecc4a1 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -264,8 +264,9 @@ * 194 26881 1.5.x, 1.6.0 * 195 27572 1.6.x * 196 27778 1.7.x + * 197 27978 */ -extern const uint16 SAVEGAME_VERSION = 196; ///< Current savegame version of OpenTTD. +extern const uint16 SAVEGAME_VERSION = 197; ///< Current savegame version of OpenTTD. SavegameType _savegame_type; ///< type of savegame we are loading FileToSaveLoad _file_to_saveload; ///< File to save or load in the openttd loop. diff --git a/src/table/settings.ini b/src/table/settings.ini index 23fca32a43..2554a2ece5 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2189,7 +2189,7 @@ cat = SC_BASIC base = GameSettings var = game_creation.variety type = SLE_UINT8 -flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +from = 197 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY def = 0 min = 0 From 6e19cbf219900f33762f8d10d021b2e838245733 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 12:18:30 +0000 Subject: [PATCH 48/58] (svn r27979) -Add: adf88 to readme --- readme.txt | 1 + src/misc_gui.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/readme.txt b/readme.txt index e378bd5d22..5f6598b9a2 100644 --- a/readme.txt +++ b/readme.txt @@ -680,6 +680,7 @@ http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip X.X) Credits ---- ------- The OpenTTD team (in alphabetical order): + Grzegorz Duczyński (adf88) - General coding (since 1.7.2) Albert Hofkamp (Alberth) - GUI expert (since 0.7) Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3) Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3) diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 03500c2a26..01e8d2c45d 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -397,6 +397,7 @@ static const char * const _credits[] = { "Original graphics by Simon Foster", "", "The OpenTTD team (in alphabetical order):", + " Grzegorz Duczy\xC5\x84ski (adf88) - General coding (since 1.7.2)", " Albert Hofkamp (Alberth) - GUI expert (since 0.7)", " Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)", " Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)", From b1592787ebc829782f6a04fd141d7c8124511a8a Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 12:24:32 +0000 Subject: [PATCH 49/58] (svn r27980) -Doc: Yearly increment --- os/debian/copyright | 2 +- os/rpm/openttd.spec | 2 +- src/lang/afrikaans.txt | 2 +- src/lang/arabic_egypt.txt | 2 +- src/lang/basque.txt | 2 +- src/lang/belarusian.txt | 2 +- src/lang/brazilian_portuguese.txt | 2 +- src/lang/bulgarian.txt | 2 +- src/lang/catalan.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 2 +- src/lang/danish.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english.txt | 2 +- src/lang/english_AU.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/esperanto.txt | 2 +- src/lang/estonian.txt | 2 +- src/lang/faroese.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/gaelic.txt | 2 +- src/lang/galician.txt | 2 +- src/lang/german.txt | 2 +- src/lang/greek.txt | 2 +- src/lang/hebrew.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/indonesian.txt | 2 +- src/lang/irish.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/japanese.txt | 2 +- src/lang/korean.txt | 2 +- src/lang/latvian.txt | 2 +- src/lang/lithuanian.txt | 2 +- src/lang/luxembourgish.txt | 2 +- src/lang/malay.txt | 2 +- src/lang/norwegian_bokmal.txt | 2 +- src/lang/norwegian_nynorsk.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.txt | 2 +- src/lang/serbian.txt | 2 +- src/lang/simplified_chinese.txt | 2 +- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/spanish_MX.txt | 2 +- src/lang/swedish.txt | 2 +- src/lang/tamil.txt | 2 +- src/lang/thai.txt | 2 +- src/lang/traditional_chinese.txt | 2 +- src/lang/turkish.txt | 2 +- src/lang/ukrainian.txt | 2 +- src/lang/unfinished/frisian.txt | 2 +- src/lang/unfinished/ido.txt | 2 +- src/lang/unfinished/macedonian.txt | 2 +- src/lang/unfinished/persian.txt | 2 +- src/lang/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- src/os/windows/ottdres.rc.in | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/os/debian/copyright b/os/debian/copyright index ab62f66a42..05cbfc4328 100644 --- a/os/debian/copyright +++ b/os/debian/copyright @@ -5,7 +5,7 @@ Source: http://www.openttd.org Files: * -Copyright: © 2004-2017 Ludvig Strigeous and others. +Copyright: © 2004-2018 Ludvig Strigeous and others. License: GPL-2.0 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2.0 as diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index 9685624462..27acc1b7df 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -2,7 +2,7 @@ # spec file for package openttd # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2007-2017 The OpenTTD developers +# Copyright (c) 2007-2018 The OpenTTD developers # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 02c5e92135..b7fee9ae8b 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2688,7 +2688,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Maatskappy-besi STR_ABOUT_OPENTTD :{WHITE}Oor OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Oorspronklike kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou STR_ABOUT_VERSION :{BLACK}OpenTTD uitgawe {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Die OpenTTD span +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Die OpenTTD span # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spaar Spel diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 70e4734099..b026705865 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2320,7 +2320,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :ارض مملو STR_ABOUT_OPENTTD :{WHITE}حول النسخة المفتوحة STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}الحقوق الاصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة STR_ABOUT_VERSION :{BLACK}النسخة المفتوحة رقم {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2017 فريق النسخة المفتوحة +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2018 فريق النسخة المفتوحة # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}حفظ اللعبة diff --git a/src/lang/basque.txt b/src/lang/basque.txt index f761d45931..6d80461b68 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -2592,7 +2592,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Konpainia jabe STR_ABOUT_OPENTTD :{WHITE}OpenTTD-ri buruz STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD bertsioa {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Gordetako jokoa diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index fc469fe53e..a9824eec67 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -3020,7 +3020,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Зямля на STR_ABOUT_OPENTTD :{WHITE}Аб OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Арыґінальныя аўтарскія правы {COPYRIGHT} 1995 Chris Sawyer. Усе правы абароненыя. STR_ABOUT_VERSION :{BLACK}OpenTTD вэрсія {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002–2017 Каманда распрацоўнікаў OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002–2018 Каманда распрацоўнікаў OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Захаваць гульню diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index e4fd8dce5b..859a6c1afa 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :O terreno é pr STR_ABOUT_OPENTTD :{WHITE}Sobre o OpenTTD... STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados STR_ABOUT_VERSION :{BLACK}OpenTTD versão {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 A equipe do OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 A equipe do OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salvar Jogo diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 81ae04a8ac..f366f29344 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2626,7 +2626,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Земя, пр STR_ABOUT_OPENTTD :{WHITE}Относно OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Авторски права {COPYRIGHT} 1995 Крис Сойер (Chris Sawyer), Всички права са запазени STR_ABOUT_VERSION :{BLACK}OpenTTD версия {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Запази играта diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index b2fff236de..28814005c8 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :terreny propiet STR_ABOUT_OPENTTD :{WHITE}Quant a l'OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer. Tots els drets reservats. STR_ABOUT_VERSION :{BLACK}Versió {REV} de l'OpenTTD -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 L'equip de l'OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 L'equip de l'OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Desa la Partida diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index dcfb6e2fe4..e7694f1bde 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2787,7 +2787,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Zemlja u posjed STR_ABOUT_OPENTTD :{WHITE}O OpenTTD-u STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Izvorno autorsko pravo {COPYRIGHT} 1995 Chris Sawyer, sva prava pridržana STR_ABOUT_VERSION :{BLACK}OpenTTD verzija {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD tim +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD tim # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spremi igru diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0cd1b4e00d..cab72a7c92 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2784,7 +2784,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Půda vlastněn STR_ABOUT_OPENTTD :{WHITE}O OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Původní copyright: {COPYRIGHT} 1995 Chris Sawyer, všechna práva vyhrazena STR_ABOUT_VERSION :{BLACK}OpenTTD verze {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Tým OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Tým OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Uložit hru diff --git a/src/lang/danish.txt b/src/lang/danish.txt index a596e0cce5..3119390f3e 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Land ejet af se STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheder reserveret STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD teamet +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD teamet # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Gem spil diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index cb625b1f6d..383706f727 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terrein in bedr STR_ABOUT_OPENTTD :{WHITE}Over OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Originele copyright {COPYRIGHT} 1995 Chris Sawyer, alle rechten voorbehouden STR_ABOUT_VERSION :{BLACK}OpenTTD versie {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Het OpenTTD-team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Het OpenTTD-team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spel Opslaan diff --git a/src/lang/english.txt b/src/lang/english.txt index 33a4f42cfe..258c02c6d6 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Company-owned l STR_ABOUT_OPENTTD :{WHITE}About OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Save Game diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index a37f78d61c..8d51d06660 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -2662,7 +2662,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Company-owned l STR_ABOUT_OPENTTD :{WHITE}About OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Save Game diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 48247afb28..86519ddc61 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Company-owned l STR_ABOUT_OPENTTD :{WHITE}About OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Save Game diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 8cb30a79d2..949fdb0d2c 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2265,7 +2265,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Kompanie poseda STR_ABOUT_OPENTTD :{WHITE}Pri OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Origina kopirajto {COPYRIGHT} 1995 Chris Sawyer, Ĉiuj rajtoj rezervitaj STR_ABOUT_VERSION :{BLACK}OpenTTD-versio {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 La teamo de OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 La teamo de OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Konservu Ludon diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index a69b0da58a..344f099741 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2745,7 +2745,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Ettevõtte maa STR_ABOUT_OPENTTD :{WHITE}OpenTTD lisainfo STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Algne autorikaitse {COPYRIGHT} 1995 Chris Sawyer, kõik õigused kaitstud STR_ABOUT_VERSION :{BLACK}OpenTTD osa {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 OpenTTD meeskond +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 OpenTTD meeskond # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Mängu salvestamine diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 3fcea7a53e..4d90facad2 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -2427,7 +2427,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Ogn hjá fyrit STR_ABOUT_OPENTTD :{WHITE}Um OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Upprunalig upphavsrættindi {COPYRIGHT} 1995 Chris Sawyer, Øll rættindi umbiðin STR_ABOUT_VERSION :{BLACK}OpenTTD útgáva {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD toymi +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD toymi # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Goym spæl diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 24cb9b697d..b53a762c9b 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Yhtiön omistam STR_ABOUT_OPENTTD :{WHITE}Tietoja OpenTTD:stä STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Alkuperäiset oikeudet {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään STR_ABOUT_VERSION :{BLACK}OpenTTD-versio {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Tallenna peli diff --git a/src/lang/french.txt b/src/lang/french.txt index 9150d72ed3..2c57358046 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terrain apparte STR_ABOUT_OPENTTD :{WHITE}À propos de OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tous droits réservés STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 L'équipe OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 L'équipe OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sauvegarder la partie diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index d500df2b4b..c06b81ecf7 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -2932,7 +2932,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Tìr a' chompan STR_ABOUT_OPENTTD :{WHITE}Mu dheidhinn OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Còir-lethbhreac tùsail {COPYRIGHT} 1995 Chris Sawyer, a h-uile còir glèidhte STR_ABOUT_VERSION :{BLACK}OpenTTD tionndadh {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 An sgioba OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 An sgioba OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sàbhail an geama diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 4a17d897e7..d87aa14abe 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terreo propieda STR_ABOUT_OPENTTD :{WHITE}Acerca de OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados STR_ABOUT_VERSION :{BLACK}OpenTTD versión {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 O equipo de OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 O equipo de OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Gravar partida diff --git a/src/lang/german.txt b/src/lang/german.txt index f5042e8338..128c516c62 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Firmeneigenes G STR_ABOUT_OPENTTD :{WHITE}OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Transport Tycoon-Urheberrecht {COPYRIGHT} 1995 Chris Sawyer, alle Rechte vorbehalten STR_ABOUT_VERSION :{BLACK}OpenTTD-Version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD-Team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD-Team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spiel speichern diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 686e619a70..11d5755d78 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -2798,7 +2798,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Ιδιοκτη STR_ABOUT_OPENTTD :{WHITE}Σχετικά με το OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Αρχικά Πνευματικά Δικαιώματα {COPYRIGHT} 1995 Chris Sawyer, Όλα τα δικαιώματα διατηρούνται STR_ABOUT_VERSION :{BLACK}Έκδοση OpenTTD{REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Η ομάδα του OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Η ομάδα του OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Αποθήκευση Παιχνιδιού diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 8f362d3f74..90ed5ccc55 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -2705,7 +2705,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :שטח בבעל STR_ABOUT_OPENTTD :{WHITE}OpenTTD אודות STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}כל הזכויות שמורות , {COPYRIGHT}1995 כריס סויר - זכויות יוצרים מקוריות STR_ABOUT_VERSION :{BLACK}{REV} גירסה , OpenTTD -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}שמור משחק diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 00a3d089b4..99dbfb82c8 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2755,7 +2755,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Vállalat álta STR_ABOUT_OPENTTD :{WHITE}Az OpenTTD-ről STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Eredeti copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva STR_ABOUT_VERSION :{BLACK}OpenTTD {REV} verzió -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 Az OpenTTD csapat +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 Az OpenTTD csapat # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Játék mentése diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 3202b99e62..77e9c09660 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2536,7 +2536,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Land í eigu fy STR_ABOUT_OPENTTD :{WHITE}Um OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin STR_ABOUT_VERSION :{BLACK}OpenTTD útgáfa {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 OpenTTD hópurinn +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 OpenTTD hópurinn # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Vista leik diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index b9194ea0a7..9a371a83d5 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -2687,7 +2687,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Tanah milik Per STR_ABOUT_OPENTTD :{WHITE}Tentang OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Hak Cipta asli {COPYRIGHT} 1995 Chris Sawyer, Hak Cipta dilindungi STR_ABOUT_VERSION :{BLACK}OpenTTD versi {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Tim OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Tim OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Simpan Permainan diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 229580074d..6c2cb21375 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -2687,7 +2687,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Talamh faoi úi STR_ABOUT_OPENTTD :{WHITE}Maidir le OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Cóipcheart bunaidh {COPYRIGHT} 1995 Chris Sawyer, Gach ceart ar cosaint STR_ABOUT_VERSION :{BLACK}OpenTTD leagan {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 An fhoireann OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 An fhoireann OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sábháil an Cluiche diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 7b1da01230..e2d5ffa49a 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2721,7 +2721,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terreno possedu STR_ABOUT_OPENTTD :{WHITE}Informazioni su OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright originale {COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati STR_ABOUT_VERSION :{BLACK}OpenTTD versione {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Il team OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Il team OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salva partita diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 13d52cbe58..8e7f0c486d 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2688,7 +2688,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :社有地 STR_ABOUT_OPENTTD :{WHITE}OpenTTDについて STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}オリジナル版権{COPYRIGHT} 1995 Chris Sawyer All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD バージョン {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}ゲームを保存 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 5c0de74420..b6dc29a099 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :회사 소유 STR_ABOUT_OPENTTD :{WHITE}OpenTTD에 대해서 STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD 버전 {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD 개발팀 +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD 개발팀 # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}게임 저장 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 30f43b807a..dab5900f75 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -2628,7 +2628,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Uzņēmumam pie STR_ABOUT_OPENTTD :{WHITE}Par OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Oriģināla autortiesības {COPYRIGHT} 1995 Kriss Sojers. Visas tiesības paturētas STR_ABOUT_VERSION :{BLACK}OpenTTD versija {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD darba grupa +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD darba grupa # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Saglabāt spēli diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 6d6d1428b8..4d44522671 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2906,7 +2906,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Kompanijos žem STR_ABOUT_OPENTTD :{WHITE}Apie OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Pradinės versijos teisės priklauso {COPYRIGHT} 1995 Chris Sawyer, Visos teisės saugomos STR_ABOUT_VERSION :{BLACK}OpenTTD versija {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 OpenTTD komanda +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 OpenTTD komanda # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Išsaugoti žaidimą diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 35ba9b4d41..38dba61000 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Land am Firmenb STR_ABOUT_OPENTTD :{WHITE}Iwwert OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original Copyright {COPYRIGHT} 1995 Chris Sawyer, All Rechter virbehalen STR_ABOUT_VERSION :{BLACK}OpenTTD Versioun {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 D'OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 D'OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spill späicheren diff --git a/src/lang/malay.txt b/src/lang/malay.txt index d1da5f40f6..4ba83efdaa 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -2406,7 +2406,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Tanah dimiliki STR_ABOUT_OPENTTD :{WHITE}Tentang OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Hakcipta Asal {COPYRIGHT} 1995 Chris Sawyer, Hakcipta terpelihara STR_ABOUT_VERSION :{BLACK}OpenTTD versi {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Simpankan Permainan diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index eb5d8dbdd9..dccf73075f 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2695,7 +2695,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Firma-eid lando STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Opprinnelig opphavsbeskyttet {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert STR_ABOUT_VERSION :{BLACK}OpenTTD versjon {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD-teamet +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD-teamet # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Lagre spill diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 516933dd7a..5e545ce290 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2608,7 +2608,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Feltet eigast a STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Opphaveleg opphavsbeskytta av {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheiter reservert STR_ABOUT_VERSION :{BLACK}OpenTTD versjon {REV}. Oversett til nynorsk av Thor Morten Skogrand med fleire. -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD-teamet +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD-teamet # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Lagre spel diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 6fcf49adeb..cc3f06cffe 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3071,7 +3071,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Teren w posiada STR_ABOUT_OPENTTD :{WHITE}OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Prawa Autorskie {COPYRIGHT} 1995 Chris Sawyer, Wszelkie prawa zastrzeżone STR_ABOUT_VERSION :{BLACK}OpenTTD wersja {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 Zespół OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 Zespół OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Zapisz grę diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 2f0603c443..65ad9c6661 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terreno proprie STR_ABOUT_OPENTTD :{WHITE}Sobre o OpenTTD... STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Direitos de autor originais {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados STR_ABOUT_VERSION :{BLACK}OpenTTD versão {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 A equipa do OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 A equipa do OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Guardar Jogo diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 69b3c11a18..a2aa17927e 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2652,7 +2652,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Teren în propr STR_ABOUT_OPENTTD :{WHITE}Despre OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Toate drepturile rezervate STR_ABOUT_VERSION :{BLACK}OpenTTD versiunea {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Echipa OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Echipa OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salvează joc diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 559e47ae85..45b3be2c6d 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2871,7 +2871,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Земля в STR_ABOUT_OPENTTD :{WHITE}Об OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Оригинальные авторские права {COPYRIGHT} 1995 Chris Sawyer. Все права защищены. STR_ABOUT_VERSION :{BLACK}OpenTTD версия {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Команда разработчиков OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Команда разработчиков OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Сохранить игру diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 5a81456990..155772ce5d 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -2882,7 +2882,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Zemljište u po STR_ABOUT_OPENTTD :{WHITE}O OpenTTD-u STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Originalni kopirajt {COPYRIGHT} 1995 Chris Sawyer, Sva prava zadržana STR_ABOUT_VERSION :{BLACK}OpenTTD verzija {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD tim +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD tim # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sačuvaj poziciju diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index d613ea15fe..d8e9f0c8c6 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2688,7 +2688,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :公司属地 STR_ABOUT_OPENTTD :{WHITE}关于 OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}原始版权由 {COPYRIGHT} 1995 Chris Sawyer 所有，保留一切权力。 STR_ABOUT_VERSION :{BLACK}OpenTTD 版本 {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD 团队 +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD 团队 # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}保存游戏 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index eaf1b59285..4e28c45c02 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2755,7 +2755,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Spoločnosťou STR_ABOUT_OPENTTD :{WHITE}OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Pôvodný copyright: {COPYRIGHT} 1995 Chris Sawyer, všetky práva vyhradené STR_ABOUT_VERSION :{BLACK}OpenTTD verzia {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 team OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 team OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Uložiť hru diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index b89bb03510..5fd44b4d36 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2841,7 +2841,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Ozemlje v lasti STR_ABOUT_OPENTTD :{WHITE}O OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Prvotne avtorske pravice {COPYRIGHT} 1995 Chris Sawyer, vse pravice pridržane STR_ABOUT_VERSION :{BLACK}OpenTTD različica {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 ekipa OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 ekipa OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Shrani igro diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index d20ec0719c..6993b7b04b 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terreno propied STR_ABOUT_OPENTTD :{WHITE}Acerca de OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados STR_ABOUT_VERSION :{BLACK}OpenTTD versión {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 El equipo OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 El equipo OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Guardar Juego diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 0fb6815e2b..739cfa37a3 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Terreno propied STR_ABOUT_OPENTTD :{WHITE}Acerca de OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados STR_ABOUT_VERSION :{BLACK}OpenTTD versión {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017, el equipo de OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018, el equipo de OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Guardar partida diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 1113e32358..255967c9d7 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Mark som ägs a STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Ursprunglig upphovsrätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter hävdas STR_ABOUT_VERSION :{BLACK}OpenTTD-version {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD-teamet +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD-teamet # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spara spel diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index c0df044d1f..ec3ef56fff 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -2378,7 +2378,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :நிறுவ STR_ABOUT_OPENTTD :{WHITE}OpenTTD-ஐ பற்றி STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}அசல் உரிமைகள் {COPYRIGHT} 1995 கிறிஸ் சாயர், எல்லா உரிமைகளும் பதிவுசெய்யப்பட்டது STR_ABOUT_VERSION :{BLACK}OpenTTD பதிப்பு {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD குழுமம் +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD குழுமம் # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}ஆட்டத்தை பதிவு செய் diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 1d2ff09156..d939eeeeac 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -2635,7 +2635,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :บริษั STR_ABOUT_OPENTTD :{WHITE}เกี่ยวกับ OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}ลิขสิทธิ์เดิม {COPYRIGHT} ค.ศ.1995 ของ Chris Sawyer, สงวนลิขสิทธิ์ STR_ABOUT_VERSION :{BLACK}OpenTTD รุ่นที่ {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2017 ของ The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2018 ของ The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}บันทึกเกม diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 7346889e4a..7ce922edc1 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2687,7 +2687,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :公司所有土 STR_ABOUT_OPENTTD :{WHITE}關於 OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}原著作權為 {COPYRIGHT} 1995 Chris Sawyer，保留所有權利 STR_ABOUT_VERSION :{BLACK}OpenTTD 版本 {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD 開發小組 +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD 開發小組 # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}儲存遊戲 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 763eb16f6d..763fb2a65a 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2692,7 +2692,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Satın alınmı STR_ABOUT_OPENTTD :{WHITE}OpenTTD Hakkında STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Telif hakkı {COPYRIGHT} 1995 Chris Sawyer, Her hakkı saklıdır STR_ABOUT_VERSION :{BLACK}OpenTTD sürüm {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 OpenTTD ekibi +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD ekibi # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Oyunu Kaydet diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 1b3e3a42bb..dbb815d2dc 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2818,7 +2818,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Ця ділян STR_ABOUT_OPENTTD :{WHITE}Про OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Авторське право {COPYRIGHT} 1995 Кріс Сойєр, Всі права захищені STR_ABOUT_VERSION :{BLACK}OpenTTD версія {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 команда OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 команда OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Зберегти гру diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 2b0b989323..051b62c843 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -2475,7 +2475,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Lân fan bedriu STR_ABOUT_OPENTTD :{WHITE}Oer OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Orizjineel copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD-ferzje {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 It OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 It OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spul Opslaan diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index ff0ad37f4e..4f4d4846ff 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -776,7 +776,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS :Stabeyo di komp # About OpenTTD window STR_ABOUT_VERSION :{BLACK}OpenTTD versiono {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 La kruo OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 La kruo OpenTTD # Save/load game/scenario STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Ludo Detali diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index f3b4cbaaec..6a0157c5a8 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -1202,7 +1202,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Компани STR_ABOUT_OPENTTD :{WHITE}За OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Оригинален copyright {COPYRIGHT} 1995 Chris Sawyer, Сите права се задржани STR_ABOUT_VERSION :{BLACK}OpenTTD верзија {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 OpenTTD тимот +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 OpenTTD тимот # Save/load game/scenario STR_SAVELOAD_LOAD_BUTTON :{BLACK}Оптоварување diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 14a70bab4e..9701899630 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -2389,7 +2389,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :زمین خری STR_ABOUT_OPENTTD :{WHITE}OpenTTD در باره ی STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD ویرایش {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 The OpenTTD team +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 The OpenTTD team # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}ذخیره ی بازی diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 38fcf09edc..19fbce1cfd 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -2691,7 +2691,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Đất công ty STR_ABOUT_OPENTTD :{WHITE}Về OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Nguyên tác bản quyền {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_ABOUT_VERSION :{BLACK}OpenTTD phiên bản {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2017 Nhóm OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 Nhóm OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Lưu Ván Chơi diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 4519d0e919..35027d48fc 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -2688,7 +2688,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :Tir cwmni STR_ABOUT_OPENTTD :{WHITE}Gwybodaeth am OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Hawlfraint Wreiddiol {COPYRIGHT} 1995 Chris Sawyer, Holl cedwir pob hawl STR_ABOUT_VERSION :{BLACK}fersiwn OpenTTD {REV} -STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2017 Y tîm OpenTTD +STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 Y tîm OpenTTD # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Cadw Gêm diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index fca129c6a6..b96b0faa9f 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -100,7 +100,7 @@ BEGIN VALUE "FileDescription", "OpenTTD\0" VALUE "FileVersion", "!!VERSION!!\0" VALUE "InternalName", "openttd\0" - VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2017. All Rights Reserved.\0" + VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2018. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "openttd.exe\0" VALUE "PrivateBuild", "\0" From 8f47687b84838c3a34a08c3381aca2585a688b8f Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 12:46:05 +0000 Subject: [PATCH 50/58] (svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu) --- src/economy.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/economy.cpp b/src/economy.cpp index 0106e87e14..e97f61d6e9 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -654,12 +654,16 @@ static void CompanyCheckBankrupt(Company *c) */ static void CompaniesGenStatistics() { - Station *st; + /* Check for bankruptcy each month */ + Company *c; + FOR_ALL_COMPANIES(c) { + CompanyCheckBankrupt(c); + } Backup cur_company(_current_company, FILE_LINE); - Company *c; if (!_settings_game.economy.infrastructure_maintenance) { + Station *st; FOR_ALL_STATIONS(st) { cur_company.Change(st->owner); CommandCost cost(EXPENSES_PROPERTY, _price[PR_STATION_VALUE] >> 1); @@ -688,11 +692,6 @@ static void CompaniesGenStatistics() } cur_company.Restore(); - /* Check for bankruptcy each month */ - FOR_ALL_COMPANIES(c) { - CompanyCheckBankrupt(c); - } - /* Only run the economic statics and update company stats every 3rd month (1st of quarter). */ if (!HasBit(1 << 0 | 1 << 3 | 1 << 6 | 1 << 9, _cur_month)) return; From aee8ffc73be6a437f05008cf3658317b3b70a601 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:17:44 +0000 Subject: [PATCH 51/58] (svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent. --- src/newgrf_spritegroup.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index a838a1388d..96ebdf093d 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -60,11 +60,7 @@ RandomizedSpriteGroup::~RandomizedSpriteGroup() static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *scope, byte variable, uint32 parameter, bool *available) { - /* First handle variables common with Action7/9/D */ uint32 value; - if (GetGlobalVariable(variable, &value, object.grffile)) return value; - - /* Non-common variable */ switch (variable) { case 0x0C: return object.callback; case 0x10: return object.callback_param1; @@ -79,8 +75,11 @@ static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *sc if (object.grffile == NULL) return 0; return object.grffile->GetParam(parameter); - /* Not a common variable, so evaluate the feature specific variables */ - default: return scope->GetVariable(variable, parameter, available); + default: + /* First handle variables common with Action7/9/D */ + if (variable < 0x40 && GetGlobalVariable(variable, &value, object.grffile)) return value; + /* Not a common variable, so evaluate the feature specific variables */ + return scope->GetVariable(variable, parameter, available); } } From 2a3d0cea500026950abbd3713c2458b9dd878864 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:18:13 +0000 Subject: [PATCH 52/58] (svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments --- src/newgrf_spritegroup.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 96ebdf093d..5a53e3b6a8 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -194,11 +194,9 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust *adjust, ScopeResolver value >>= adjust->shift_num; value &= adjust->and_mask; - if (adjust->type != DSGA_TYPE_NONE) value += (S)adjust->add_val; - switch (adjust->type) { - case DSGA_TYPE_DIV: value = (S)value / (S)adjust->divmod_val; break; - case DSGA_TYPE_MOD: value = (S)value % (S)adjust->divmod_val; break; + case DSGA_TYPE_DIV: value = ((S)value + (S)adjust->add_val) / (S)adjust->divmod_val; break; + case DSGA_TYPE_MOD: value = ((S)value + (S)adjust->add_val) % (S)adjust->divmod_val; break; case DSGA_TYPE_NONE: break; } From 29dca1be3b3902568cbd83c90b560b98441f244d Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:19:41 +0000 Subject: [PATCH 53/58] (svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent. --- src/newgrf_airport.cpp | 29 ++++++++++++----------------- src/newgrf_airporttiles.cpp | 15 --------------- src/newgrf_airporttiles.h | 14 +++++++++++++- src/newgrf_canal.cpp | 10 ++++------ src/newgrf_engine.cpp | 15 --------------- src/newgrf_engine.h | 12 +++++++++++- src/newgrf_generic.cpp | 29 ++++++++++------------------- src/newgrf_house.cpp | 22 ---------------------- src/newgrf_house.h | 16 +++++++++++++++- src/newgrf_industries.cpp | 17 ----------------- src/newgrf_industries.h | 13 ++++++++++++- src/newgrf_industrytiles.cpp | 12 ------------ src/newgrf_industrytiles.h | 11 ++++++++++- src/newgrf_object.cpp | 15 --------------- src/newgrf_object.h | 12 +++++++++++- src/newgrf_railtype.cpp | 12 ------------ src/newgrf_railtype.h | 11 ++++++++++- src/newgrf_spritegroup.cpp | 28 ---------------------------- src/newgrf_spritegroup.h | 20 ++++++++++++++++---- src/newgrf_station.cpp | 17 ----------------- src/newgrf_station.h | 12 +++++++++++- src/newgrf_town.cpp | 12 ------------ src/newgrf_town.h | 11 ++++++++++- 23 files changed, 145 insertions(+), 220 deletions(-) diff --git a/src/newgrf_airport.cpp b/src/newgrf_airport.cpp index 6db12f7373..0863d09861 100644 --- a/src/newgrf_airport.cpp +++ b/src/newgrf_airport.cpp @@ -26,7 +26,18 @@ struct AirportScopeResolver : public ScopeResolver { byte layout; ///< Layout of the airport to build. TileIndex tile; ///< Tile for the callback, only valid for airporttile callbacks. - AirportScopeResolver(ResolverObject &ro, TileIndex tile, Station *st, byte airport_id, byte layout); + /** + * Constructor of the scope resolver for an airport. + * @param ro Surrounding resolver. + * @param tile %Tile for the callback, only valid for airporttile callbacks. + * @param st %Station of the airport for which the callback is run, or \c NULL for build gui. + * @param airport_id Type of airport for which the callback is run. + * @param layout Layout of the airport to build. + */ + AirportScopeResolver(ResolverObject &ro, TileIndex tile, Station *st, byte airport_id, byte layout) + : ScopeResolver(ro), st(st), airport_id(airport_id), layout(layout), tile(tile) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; @@ -242,22 +253,6 @@ AirportResolverObject::AirportResolverObject(TileIndex tile, Station *st, byte a this->root_spritegroup = AirportSpec::Get(airport_id)->grf_prop.spritegroup[0]; } -/** - * Constructor of the scope resolver for an airport. - * @param ro Surrounding resolver. - * @param tile %Tile for the callback, only valid for airporttile callbacks. - * @param st %Station of the airport for which the callback is run, or \c NULL for build gui. - * @param airport_id Type of airport for which the callback is run. - * @param layout Layout of the airport to build. - */ -AirportScopeResolver::AirportScopeResolver(ResolverObject &ro, TileIndex tile, Station *st, byte airport_id, byte layout) : ScopeResolver(ro) -{ - this->st = st; - this->airport_id = airport_id; - this->layout = layout; - this->tile = tile; -} - SpriteID GetCustomAirportSprite(const AirportSpec *as, byte layout) { AirportResolverObject object(INVALID_TILE, NULL, as->GetIndex(), layout); diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp index 5eb24f670f..2d3a5129c9 100644 --- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -222,21 +222,6 @@ AirportTileResolverObject::AirportTileResolverObject(const AirportTileSpec *ats, this->root_spritegroup = ats->grf_prop.spritegroup[0]; } -/** - * Constructor of the scope resolver specific for airport tiles. - * @param ats Specification of the airport tiles. - * @param tile %Tile for the callback, only valid for airporttile callbacks. - * @param st Station of the airport for which the callback is run, or \c NULL for build gui. - */ -AirportTileScopeResolver::AirportTileScopeResolver(ResolverObject &ro, const AirportTileSpec *ats, TileIndex tile, Station *st) : ScopeResolver(ro) -{ - assert(st != NULL); - - this->st = st; - this->airport_id = st->airport.type; - this->tile = tile; -} - uint16 GetAirportTileCallback(CallbackID callback, uint32 param1, uint32 param2, const AirportTileSpec *ats, Station *st, TileIndex tile, int extra_data = 0) { AirportTileResolverObject object(ats, tile, st, callback, param1, param2); diff --git a/src/newgrf_airporttiles.h b/src/newgrf_airporttiles.h index 4d25aa9240..dc04642037 100644 --- a/src/newgrf_airporttiles.h +++ b/src/newgrf_airporttiles.h @@ -17,6 +17,7 @@ #include "newgrf_animation_type.h" #include "newgrf_commons.h" #include "newgrf_spritegroup.h" +#include "station_base.h" /** Scope resolver for handling the tiles of an airport. */ struct AirportTileScopeResolver : public ScopeResolver { @@ -24,7 +25,18 @@ struct AirportTileScopeResolver : public ScopeResolver { byte airport_id; ///< Type of airport for which the callback is run. TileIndex tile; ///< Tile for the callback, only valid for airporttile callbacks. - AirportTileScopeResolver(ResolverObject &ro, const AirportTileSpec *ats, TileIndex tile, Station *st); + /** + * Constructor of the scope resolver specific for airport tiles. + * @param ats Specification of the airport tiles. + * @param tile %Tile for the callback, only valid for airporttile callbacks. + * @param st Station of the airport for which the callback is run, or \c NULL for build gui. + */ + AirportTileScopeResolver(ResolverObject &ro, const AirportTileSpec *ats, TileIndex tile, Station *st) + : ScopeResolver(ro), st(st), tile(tile) + { + assert(st != NULL); + this->airport_id = st->airport.type; + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; diff --git a/src/newgrf_canal.cpp b/src/newgrf_canal.cpp index cba19cbdba..3438bb9850 100644 --- a/src/newgrf_canal.cpp +++ b/src/newgrf_canal.cpp @@ -25,7 +25,10 @@ WaterFeature _water_feature[CF_END]; struct CanalScopeResolver : public ScopeResolver { TileIndex tile; ///< Tile containing the canal. - CanalScopeResolver(ResolverObject &ro, TileIndex tile); + CanalScopeResolver(ResolverObject &ro, TileIndex tile) + : ScopeResolver(ro), tile(tile) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; @@ -110,11 +113,6 @@ struct CanalResolverObject : public ResolverObject { return group->loaded[0]; } -CanalScopeResolver::CanalScopeResolver(ResolverObject &ro, TileIndex tile) : ScopeResolver(ro) -{ - this->tile = tile; -} - /** * Canal resolver constructor. * @param feature Which canal feature we want. diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 94c8df1d13..660b7e476b 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -937,21 +937,6 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object, return in_motion ? group->loaded[set] : group->loading[set]; } -/** - * Scope resolver of a single vehicle. - * @param ro Surrounding resolver. - * @param engine_type Engine type - * @param v %Vehicle being resolved. - * @param info_view Indicates if the item is being drawn in an info window. - */ -VehicleScopeResolver::VehicleScopeResolver(ResolverObject &ro, EngineID engine_type, const Vehicle *v, bool info_view) - : ScopeResolver(ro) -{ - this->v = v; - this->self_type = engine_type; - this->info_view = info_view; -} - /** * Get the grf file associated with an engine type. * @param engine_type Engine to query. diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h index 6406b0f4e3..51adb0b7fb 100644 --- a/src/newgrf_engine.h +++ b/src/newgrf_engine.h @@ -26,7 +26,17 @@ struct VehicleScopeResolver : public ScopeResolver { EngineID self_type; ///< Type of the vehicle. bool info_view; ///< Indicates if the item is being drawn in an info window. - VehicleScopeResolver(ResolverObject &ro, EngineID engine_type, const Vehicle *v, bool info_view); + /** + * Scope resolver of a single vehicle. + * @param ro Surrounding resolver. + * @param engine_type Engine type + * @param v %Vehicle being resolved. + * @param info_view Indicates if the item is being drawn in an info window. + */ + VehicleScopeResolver(ResolverObject &ro, EngineID engine_type, const Vehicle *v, bool info_view) + : ScopeResolver(ro), v(v), self_type(engine_type), info_view(info_view) + { + } void SetVehicle(const Vehicle *v) { this->v = v; } diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp index 9bd77239aa..6606422154 100644 --- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -31,7 +31,16 @@ struct GenericScopeResolver : public ScopeResolver { uint8 count; uint8 station_size; - GenericScopeResolver(ResolverObject &ro, bool ai_callback); + /** + * Generic scope resolver. + * @param ro Surrounding resolver. + * @param ai_callback Callback comes from the AI. + */ + GenericScopeResolver(ResolverObject &ro, bool ai_callback) + : ScopeResolver(ro), cargo_type(0), default_selection(0), src_industry(0), dst_industry(0), distance(0), + event(), count(0), station_size(0), ai_callback(ai_callback) + { + } /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; @@ -145,24 +154,6 @@ GenericResolverObject::GenericResolverObject(bool ai_callback, CallbackID callba { } -/** - * Generic scope resolver. - * @param ro Surrounding resolver. - * @param ai_callback Callback comes from the AI. - */ -GenericScopeResolver::GenericScopeResolver(ResolverObject &ro, bool ai_callback) : ScopeResolver(ro) -{ - this->cargo_type = 0; - this->default_selection = 0; - this->src_industry = 0; - this->dst_industry = 0; - this->distance = 0; - this->event = (AIConstructionEvent)0; - this->count = 0; - this->station_size = 0; - this->ai_callback = ai_callback; -} - /** * Follow a generic feature callback list and return the first successful diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index bcd83f2f19..ebdd858a4d 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -31,28 +31,6 @@ static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX]; HouseOverrideManager _house_mngr(NEW_HOUSE_OFFSET, NUM_HOUSES, INVALID_HOUSE_ID); -/** - * Constructor of a house scope resolver. - * @param ro Surrounding resolver. - * @param house_id House type being queried. - * @param tile %Tile containing the house. - * @param town %Town containing the house. - * @param not_yet_constructed House is still under construction. - * @param initial_random_bits Random bits during construction checks. - * @param watched_cargo_triggers Cargo types that triggered the watched cargo callback. - */ -HouseScopeResolver::HouseScopeResolver(ResolverObject &ro, HouseID house_id, TileIndex tile, Town *town, - bool not_yet_constructed, uint8 initial_random_bits, uint32 watched_cargo_triggers) - : ScopeResolver(ro) -{ - this->house_id = house_id; - this->tile = tile; - this->town = town; - this->not_yet_constructed = not_yet_constructed; - this->initial_random_bits = initial_random_bits; - this->watched_cargo_triggers = watched_cargo_triggers; -} - /** * Retrieve the grf file associated with a house. * @param house_id House to query. diff --git a/src/newgrf_house.h b/src/newgrf_house.h index efc0c6cbb3..0ac868d1e7 100644 --- a/src/newgrf_house.h +++ b/src/newgrf_house.h @@ -27,8 +27,22 @@ struct HouseScopeResolver : public ScopeResolver { uint16 initial_random_bits; ///< Random bits during construction checks. uint32 watched_cargo_triggers; ///< Cargo types that triggered the watched cargo callback. + /** + * Constructor of a house scope resolver. + * @param ro Surrounding resolver. + * @param house_id House type being queried. + * @param tile %Tile containing the house. + * @param town %Town containing the house. + * @param not_yet_constructed House is still under construction. + * @param initial_random_bits Random bits during construction checks. + * @param watched_cargo_triggers Cargo types that triggered the watched cargo callback. + */ HouseScopeResolver(ResolverObject &ro, HouseID house_id, TileIndex tile, Town *town, - bool not_yet_constructed, uint8 initial_random_bits, uint32 watched_cargo_triggers); + bool not_yet_constructed, uint8 initial_random_bits, uint32 watched_cargo_triggers) + : ScopeResolver(ro), house_id(house_id), tile(tile), town(town), not_yet_constructed(not_yet_constructed), + initial_random_bits(initial_random_bits), watched_cargo_triggers(watched_cargo_triggers) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index 9f227a9f58..7815ba36af 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -457,23 +457,6 @@ TownScopeResolver *IndustriesResolverObject::GetTown() return this->town_scope; } -/** - * Scope resolver for industries. - * @param ro Surrounding resolver. - * @param tile %Tile owned by the industry. - * @param industry %Industry being resolved. - * @param type Type of the industry. - * @param random_bits Random bits of the new industry. - */ -IndustriesScopeResolver::IndustriesScopeResolver(ResolverObject &ro, TileIndex tile, Industry *industry, IndustryType type, uint32 random_bits) - : ScopeResolver(ro) -{ - this->tile = tile; - this->industry = industry; - this->type = type; - this->random_bits = random_bits; -} - /** * Perform an industry callback. * @param callback The callback to perform. diff --git a/src/newgrf_industries.h b/src/newgrf_industries.h index 45b0333a67..fa809fcd73 100644 --- a/src/newgrf_industries.h +++ b/src/newgrf_industries.h @@ -21,7 +21,18 @@ struct IndustriesScopeResolver : public ScopeResolver { IndustryType type; ///< Type of the industry. uint32 random_bits; ///< Random bits of the new industry. - IndustriesScopeResolver(ResolverObject &ro, TileIndex tile, Industry *industry, IndustryType type, uint32 random_bits = 0); + /** + * Scope resolver for industries. + * @param ro Surrounding resolver. + * @param tile %Tile owned by the industry. + * @param industry %Industry being resolved. + * @param type Type of the industry. + * @param random_bits Random bits of the new industry. + */ + IndustriesScopeResolver(ResolverObject &ro, TileIndex tile, Industry *industry, IndustryType type, uint32 random_bits = 0) + : ScopeResolver(ro), tile(tile), industry(industry), type(type), random_bits(random_bits) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index b4b8f77c43..69c4b1d07d 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -146,18 +146,6 @@ IndustryTileResolverObject::IndustryTileResolverObject(IndustryGfx gfx, TileInde this->root_spritegroup = GetIndustryTileSpec(gfx)->grf_prop.spritegroup[0]; } -/** - * Constructor of the scope resolver for the industry tile. - * @param ro Surrounding resolver. - * @param industry %Industry owning the tile. - * @param tile %Tile of the industry. - */ -IndustryTileScopeResolver::IndustryTileScopeResolver(ResolverObject &ro, Industry *industry, TileIndex tile) : ScopeResolver(ro) -{ - this->industry = industry; - this->tile = tile; -} - static void IndustryDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, byte rnd_colour, byte stage, IndustryGfx gfx) { const DrawTileSprites *dts = group->ProcessRegisters(&stage); diff --git a/src/newgrf_industrytiles.h b/src/newgrf_industrytiles.h index 2af064054d..6051c1062b 100644 --- a/src/newgrf_industrytiles.h +++ b/src/newgrf_industrytiles.h @@ -21,7 +21,16 @@ struct IndustryTileScopeResolver : public ScopeResolver { Industry *industry; ///< Industry owning the tiles. TileIndex tile; ///< %Tile being resolved. - IndustryTileScopeResolver(ResolverObject &ro, Industry *industry, TileIndex tile); + /** + * Constructor of the scope resolver for the industry tile. + * @param ro Surrounding resolver. + * @param industry %Industry owning the tile. + * @param tile %Tile of the industry. + */ + IndustryTileScopeResolver(ResolverObject &ro, Industry *industry, TileIndex tile) + : ScopeResolver(ro), industry(industry), tile(tile) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp index 058d5e0c00..78bbc52443 100644 --- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -128,21 +128,6 @@ bool NewGRFClass::IsUIAvailable(uint index) const INSTANTIATE_NEWGRF_CLASS_METHODS(ObjectClass, ObjectSpec, ObjectClassID, OBJECT_CLASS_MAX) -/** - * Constructor of an object scope resolver. - * @param ro Surrounding resolver. - * @param obj Object being resolved. - * @param tile %Tile of the object. - * @param view View of the object. - */ -ObjectScopeResolver::ObjectScopeResolver(ResolverObject &ro, Object *obj, TileIndex tile, uint8 view) - : ScopeResolver(ro) -{ - this->obj = obj; - this->tile = tile; - this->view = view; -} - /* virtual */ uint32 ObjectScopeResolver::GetRandomBits() const { return IsValidTile(this->tile) && IsTileType(this->tile, MP_OBJECT) ? GetObjectRandomBits(this->tile) : 0; diff --git a/src/newgrf_object.h b/src/newgrf_object.h index cbd06b6f6d..69e1a3299c 100644 --- a/src/newgrf_object.h +++ b/src/newgrf_object.h @@ -104,7 +104,17 @@ struct ObjectScopeResolver : public ScopeResolver { TileIndex tile; ///< The tile related to the object. uint8 view; ///< The view of the object. - ObjectScopeResolver(ResolverObject &ro, Object *obj, TileIndex tile, uint8 view = 0); + /** + * Constructor of an object scope resolver. + * @param ro Surrounding resolver. + * @param obj Object being resolved. + * @param tile %Tile of the object. + * @param view View of the object. + */ + ObjectScopeResolver(ResolverObject &ro, Object *obj, TileIndex tile, uint8 view = 0) + : ScopeResolver(ro), obj(obj), tile(tile), view(view) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp index 8a074db974..624b0eca84 100644 --- a/src/newgrf_railtype.cpp +++ b/src/newgrf_railtype.cpp @@ -67,18 +67,6 @@ return NULL; } -/** - * Constructor of the railtype scope resolvers. - * @param ro Surrounding resolver. - * @param tile %Tile containing the track. For track on a bridge this is the southern bridgehead. - * @param context Are we resolving sprites for the upper halftile, or on a bridge? - */ -RailTypeScopeResolver::RailTypeScopeResolver(ResolverObject &ro, TileIndex tile, TileContext context) : ScopeResolver(ro) -{ - this->tile = tile; - this->context = context; -} - /** * Resolver object for rail types. * @param rti Railtype. NULL in NewGRF Inspect window. diff --git a/src/newgrf_railtype.h b/src/newgrf_railtype.h index 4c68e7d1db..5fadcd2ab5 100644 --- a/src/newgrf_railtype.h +++ b/src/newgrf_railtype.h @@ -21,7 +21,16 @@ struct RailTypeScopeResolver : public ScopeResolver { TileIndex tile; ///< Tracktile. For track on a bridge this is the southern bridgehead. TileContext context; ///< Are we resolving sprites for the upper halftile, or on a bridge? - RailTypeScopeResolver(ResolverObject &ro, TileIndex tile, TileContext context); + /** + * Constructor of the railtype scope resolvers. + * @param ro Surrounding resolver. + * @param tile %Tile containing the track. For track on a bridge this is the southern bridgehead. + * @param context Are we resolving sprites for the upper halftile, or on a bridge? + */ + RailTypeScopeResolver(ResolverObject &ro, TileIndex tile, TileContext context) + : ScopeResolver(ro), tile(tile), context(context) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 5a53e3b6a8..cb70a88bf7 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -83,13 +83,6 @@ static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *sc } } -ScopeResolver::ScopeResolver(ResolverObject &ro) - : ro(ro) -{ -} - -ScopeResolver::~ScopeResolver() {} - /** * Get a few random bits. Default implementation has no random bits. * @return Random bits. @@ -129,27 +122,6 @@ ScopeResolver::~ScopeResolver() {} */ /* virtual */ void ScopeResolver::StorePSA(uint reg, int32 value) {} -/** - * Resolver constructor. - * @param grffile NewGRF file associated with the object (or \c NULL if none). - * @param callback Callback code being resolved (default value is #CBID_NO_CALLBACK). - * @param callback_param1 First parameter (var 10) of the callback (only used when \a callback is also set). - * @param callback_param2 Second parameter (var 18) of the callback (only used when \a callback is also set). - */ -ResolverObject::ResolverObject(const GRFFile *grffile, CallbackID callback, uint32 callback_param1, uint32 callback_param2) - : default_scope(*this) -{ - this->callback = callback; - this->callback_param1 = callback_param1; - this->callback_param2 = callback_param2; - this->ResetState(); - - this->grffile = grffile; - this->root_spritegroup = NULL; -} - -ResolverObject::~ResolverObject() {} - /** * Get the real sprites of the grf. * @param group Group to get. diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index a0ae6ce511..4d290b1377 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -288,8 +288,8 @@ struct IndustryProductionSpriteGroup : SpriteGroup { struct ScopeResolver { ResolverObject &ro; ///< Surrounding resolver object. - ScopeResolver(ResolverObject &ro); - virtual ~ScopeResolver(); + ScopeResolver(ResolverObject &ro) : ro(ro) {} + virtual ~ScopeResolver() {} virtual uint32 GetRandomBits() const; virtual uint32 GetTriggers() const; @@ -305,8 +305,20 @@ struct ScopeResolver { * to get the results of callbacks, rerandomisations or normal sprite lookups. */ struct ResolverObject { - ResolverObject(const GRFFile *grffile, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0); - virtual ~ResolverObject(); + /** + * Resolver constructor. + * @param grffile NewGRF file associated with the object (or \c NULL if none). + * @param callback Callback code being resolved (default value is #CBID_NO_CALLBACK). + * @param callback_param1 First parameter (var 10) of the callback (only used when \a callback is also set). + * @param callback_param2 Second parameter (var 18) of the callback (only used when \a callback is also set). + */ + ResolverObject(const GRFFile *grffile, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0) + : default_scope(*this), callback(callback), callback_param1(callback_param1), callback_param2(callback_param2), grffile(grffile), root_spritegroup(NULL) + { + this->ResetState(); + } + + virtual ~ResolverObject() {} ScopeResolver default_scope; ///< Default implementation of the grf scope. diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index 091182185e..41ef7af75c 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -578,23 +578,6 @@ StationResolverObject::~StationResolverObject() delete this->town_scope; } -/** - * Constructor for station scopes. - * @param ro Surrounding resolver. - * @param statspec Station (type) specification. - * @param st Instance of the station. - * @param tile %Tile of the station. - */ -StationScopeResolver::StationScopeResolver(ResolverObject &ro, const StationSpec *statspec, BaseStation *st, TileIndex tile) - : ScopeResolver(ro) -{ - this->tile = tile; - this->st = st; - this->statspec = statspec; - this->cargo_type = CT_INVALID; - this->axis = INVALID_AXIS; -} - /** * Resolve sprites for drawing a station tile. * @param statspec Station spec diff --git a/src/newgrf_station.h b/src/newgrf_station.h index f6a39efb15..5413a4c08f 100644 --- a/src/newgrf_station.h +++ b/src/newgrf_station.h @@ -30,7 +30,17 @@ struct StationScopeResolver : public ScopeResolver { CargoID cargo_type; ///< Type of cargo of the station. Axis axis; ///< Station axis, used only for the slope check callback. - StationScopeResolver(ResolverObject &ro, const StationSpec *statspec, BaseStation *st, TileIndex tile); + /** + * Constructor for station scopes. + * @param ro Surrounding resolver. + * @param statspec Station (type) specification. + * @param st Instance of the station. + * @param tile %Tile of the station. + */ + StationScopeResolver(ResolverObject &ro, const StationSpec *statspec, BaseStation *st, TileIndex tile) + : ScopeResolver(ro), tile(tile), st(st), statspec(statspec), cargo_type(CT_INVALID), axis(INVALID_AXIS) + { + } /* virtual */ uint32 GetRandomBits() const; /* virtual */ uint32 GetTriggers() const; diff --git a/src/newgrf_town.cpp b/src/newgrf_town.cpp index 2f48eb757d..820e2be689 100644 --- a/src/newgrf_town.cpp +++ b/src/newgrf_town.cpp @@ -16,18 +16,6 @@ #include "safeguards.h" -/** - * Resolver of a town scope. - * @param ro Surrounding resolver. - * @param t %Town of the scope. - * @param readonly Scope may change persistent storage of the town. - */ -TownScopeResolver::TownScopeResolver(ResolverObject &ro, Town *t, bool readonly) : ScopeResolver(ro) -{ - this->t = t; - this->readonly = readonly; -} - /* virtual */ uint32 TownScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const { switch (variable) { diff --git a/src/newgrf_town.h b/src/newgrf_town.h index 145571e8ae..7c4fb5395c 100644 --- a/src/newgrf_town.h +++ b/src/newgrf_town.h @@ -25,7 +25,16 @@ struct TownScopeResolver : public ScopeResolver { Town *t; ///< %Town of the scope. bool readonly; ///< When set, persistent storage of the town is read-only, - TownScopeResolver(ResolverObject &ro, Town *t, bool readonly); + /** + * Resolver of a town scope. + * @param ro Surrounding resolver. + * @param t %Town of the scope. + * @param readonly Scope may change persistent storage of the town. + */ + TownScopeResolver(ResolverObject &ro, Town *t, bool readonly) + : ScopeResolver(ro), t(t), readonly(readonly) + { + } virtual uint32 GetVariable(byte variable, uint32 parameter, bool *available) const; virtual void StorePSA(uint reg, int32 value); From 30f73d907a35a5264e5ca415cee58365cd22f8d8 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:21:27 +0000 Subject: [PATCH 54/58] (svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent. --- src/newgrf.cpp | 59 +++++++++++++++++++++++++++++++++----- src/newgrf_spritegroup.cpp | 22 +++++++++++--- src/newgrf_spritegroup.h | 2 ++ 3 files changed, 72 insertions(+), 11 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 704892e5cf..41d7195918 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -12,6 +12,7 @@ #include "stdafx.h" #include +#include #include "debug.h" #include "fileio_func.h" @@ -4687,16 +4688,60 @@ static void NewSpriteGroup(ByteReader *buf) group->adjusts = MallocT(group->num_adjusts); MemCpyT(group->adjusts, adjusts.Begin(), group->num_adjusts); - group->num_ranges = buf->ReadByte(); - if (group->num_ranges > 0) group->ranges = CallocT(group->num_ranges); - - for (uint i = 0; i < group->num_ranges; i++) { - group->ranges[i].group = GetGroupFromGroupID(setid, type, buf->ReadWord()); - group->ranges[i].low = buf->ReadVarSize(varsize); - group->ranges[i].high = buf->ReadVarSize(varsize); + std::vector ranges; + ranges.resize(buf->ReadByte()); + for (uint i = 0; i < ranges.size(); i++) { + ranges[i].group = GetGroupFromGroupID(setid, type, buf->ReadWord()); + ranges[i].low = buf->ReadVarSize(varsize); + ranges[i].high = buf->ReadVarSize(varsize); } group->default_group = GetGroupFromGroupID(setid, type, buf->ReadWord()); + group->error_group = ranges.size() > 0 ? ranges[0].group : group->default_group; + + /* Sort ranges ascending. When ranges overlap, this may required clamping or splitting them */ + std::vector bounds; + for (uint i = 0; i < ranges.size(); i++) { + bounds.push_back(ranges[i].low); + if (ranges[i].high != UINT32_MAX) bounds.push_back(ranges[i].high + 1); + } + std::sort(bounds.begin(), bounds.end()); + bounds.erase(std::unique(bounds.begin(), bounds.end()), bounds.end()); + + std::vector target; + for (uint j = 0; j < bounds.size(); ++j) { + uint32 v = bounds[j]; + const SpriteGroup *t = NULL; + for (uint i = 0; i < ranges.size(); i++) { + if (ranges[i].low <= v && v <= ranges[i].high) { + t = ranges[i].group; + } + } + target.push_back(t); + } + assert(target.size() == bounds.size()); + + std::vector optimised; + for (uint j = 0; j < bounds.size(); ) { + if (target[j]) { + DeterministicSpriteGroupRange r; + r.group = target[j]; + r.low = bounds[j]; + while (j < bounds.size() && target[j] == r.group) { + j++; + } + r.high = j < bounds.size() ? bounds[j] - 1 : UINT32_MAX; + optimised.push_back(r); + } else { + j++; + } + } + + group->num_ranges = optimised.size(); + if (group->num_ranges > 0) { + group->ranges = MallocT(group->num_ranges); + MemCpyT(group->ranges, &optimised.front(), group->num_ranges); + } break; } diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index cb70a88bf7..8f44ef9c5e 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -10,6 +10,7 @@ /** @file newgrf_spritegroup.cpp Handling of primarily NewGRF action 2. */ #include "stdafx.h" +#include #include "debug.h" #include "newgrf_spritegroup.h" #include "core/pool_func.hpp" @@ -201,6 +202,11 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust *adjust, ScopeResolver } +static bool RangeHighComparator(const DeterministicSpriteGroupRange& range, uint32 value) +{ + return range.high < value; +} + const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) const { uint32 last_value = 0; @@ -232,7 +238,7 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con if (!available) { /* Unsupported variable: skip further processing and return either * the group from the first range or the default group. */ - return SpriteGroup::Resolve(this->num_ranges > 0 ? this->ranges[0].group : this->default_group, object, false); + return SpriteGroup::Resolve(this->error_group, object, false); } switch (this->size) { @@ -254,9 +260,17 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con return &nvarzero; } - for (i = 0; i < this->num_ranges; i++) { - if (this->ranges[i].low <= value && value <= this->ranges[i].high) { - return SpriteGroup::Resolve(this->ranges[i].group, object, false); + if (this->num_ranges > 4) { + DeterministicSpriteGroupRange *lower = std::lower_bound(this->ranges + 0, this->ranges + this->num_ranges, value, RangeHighComparator); + if (lower != this->ranges + this->num_ranges && lower->low <= value) { + assert(lower->low <= value && value <= lower->high); + return SpriteGroup::Resolve(lower->group, object, false); + } + } else { + for (i = 0; i < this->num_ranges; i++) { + if (this->ranges[i].low <= value && value <= this->ranges[i].high) { + return SpriteGroup::Resolve(this->ranges[i].group, object, false); + } } } diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index 4d290b1377..b2e764599d 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -181,6 +181,8 @@ struct DeterministicSpriteGroup : SpriteGroup { /* Dynamically allocated, this is the sole owner */ const SpriteGroup *default_group; + const SpriteGroup *error_group; // was first range, before sorting ranges + protected: const SpriteGroup *Resolve(ResolverObject &object) const; }; From 6b088d37bf8ce585367c52748f7ed8ea0fdca95e Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:23:26 +0000 Subject: [PATCH 55/58] (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. --- src/tile_type.h | 2 ++ src/vehicle.cpp | 47 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/tile_type.h b/src/tile_type.h index 0d720925da..eb5e8234c4 100644 --- a/src/tile_type.h +++ b/src/tile_type.h @@ -18,6 +18,8 @@ static const uint TILE_PIXELS = 32; ///< Pixel distan static const uint TILE_HEIGHT = 8; ///< Height of a height level in world coordinate AND in pixels in #ZOOM_LVL_BASE. static const uint MAX_BUILDING_PIXELS = 200; ///< Maximum height of a building in pixels in #ZOOM_LVL_BASE. (Also applies to "bridge buildings" on the bridge floor.) +static const int MAX_VEHICLE_PIXEL_X = 70; ///< Maximum width of a vehicle in pixels in #ZOOM_LVL_BASE. +static const int MAX_VEHICLE_PIXEL_Y = 70; ///< Maximum height of a vehicle in pixels in #ZOOM_LVL_BASE. static const uint MAX_TILE_HEIGHT = 255; ///< Maximum allowed tile height diff --git a/src/vehicle.cpp b/src/vehicle.cpp index e4a8c7bf1f..be11e05be3 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -57,7 +57,30 @@ #include "safeguards.h" -#define GEN_HASH(x, y) ((GB((y), 6 + ZOOM_LVL_SHIFT, 6) << 6) + GB((x), 7 + ZOOM_LVL_SHIFT, 6)) +/* Number of bits in the hash to use from each vehicle coord */ +static const uint GEN_HASHX_BITS = 6; +static const uint GEN_HASHY_BITS = 6; + +/* Size of each hash bucket */ +static const uint GEN_HASHX_BUCKET_BITS = 7; +static const uint GEN_HASHY_BUCKET_BITS = 6; + +/* Compute hash for vehicle coord */ +#define GEN_HASHX(x) GB((x), GEN_HASHX_BUCKET_BITS + ZOOM_LVL_SHIFT, GEN_HASHX_BITS) +#define GEN_HASHY(y) (GB((y), GEN_HASHY_BUCKET_BITS + ZOOM_LVL_SHIFT, GEN_HASHY_BITS) << GEN_HASHX_BITS) +#define GEN_HASH(x, y) (GEN_HASHY(y) + GEN_HASHX(x)) + +/* Maximum size until hash repeats */ +static const int GEN_HASHX_SIZE = 1 << (GEN_HASHX_BUCKET_BITS + GEN_HASHX_BITS + ZOOM_LVL_SHIFT); +static const int GEN_HASHY_SIZE = 1 << (GEN_HASHY_BUCKET_BITS + GEN_HASHY_BITS + ZOOM_LVL_SHIFT); + +/* Increments to reach next bucket in hash table */ +static const int GEN_HASHX_INC = 1; +static const int GEN_HASHY_INC = 1 << GEN_HASHX_BITS; + +/* Mask to wrap-around buckets */ +static const uint GEN_HASHX_MASK = (1 << GEN_HASHX_BITS) - 1; +static const uint GEN_HASHY_MASK = ((1 << GEN_HASHY_BITS) - 1) << GEN_HASHX_BITS; VehicleID _new_vehicle_id; uint16 _returned_refit_capacity; ///< Stores the capacity after a refit operation. @@ -618,7 +641,7 @@ static void UpdateVehicleTileHash(Vehicle *v, bool remove) v->hash_tile_current = new_hash; } -static Vehicle *_vehicle_viewport_hash[0x1000]; +static Vehicle *_vehicle_viewport_hash[1 << (GEN_HASHX_BITS + GEN_HASHY_BITS)]; static void UpdateVehicleViewportHash(Vehicle *v, int x, int y) { @@ -1088,26 +1111,26 @@ void ViewportAddVehicles(DrawPixelInfo *dpi) /* The hash area to scan */ int xl, xu, yl, yu; - if (dpi->width + (70 * ZOOM_LVL_BASE) < (1 << (7 + 6 + ZOOM_LVL_SHIFT))) { - xl = GB(l - (70 * ZOOM_LVL_BASE), 7 + ZOOM_LVL_SHIFT, 6); - xu = GB(r, 7 + ZOOM_LVL_SHIFT, 6); + if (dpi->width + (MAX_VEHICLE_PIXEL_X * ZOOM_LVL_BASE) < GEN_HASHX_SIZE) { + xl = GEN_HASHX(l - MAX_VEHICLE_PIXEL_X * ZOOM_LVL_BASE); + xu = GEN_HASHX(r); } else { /* scan whole hash row */ xl = 0; - xu = 0x3F; + xu = GEN_HASHX_MASK; } - if (dpi->height + (70 * ZOOM_LVL_BASE) < (1 << (6 + 6 + ZOOM_LVL_SHIFT))) { - yl = GB(t - (70 * ZOOM_LVL_BASE), 6 + ZOOM_LVL_SHIFT, 6) << 6; - yu = GB(b, 6 + ZOOM_LVL_SHIFT, 6) << 6; + if (dpi->height + (MAX_VEHICLE_PIXEL_Y * ZOOM_LVL_BASE) < GEN_HASHY_SIZE) { + yl = GEN_HASHY(t - MAX_VEHICLE_PIXEL_Y * ZOOM_LVL_BASE); + yu = GEN_HASHY(b); } else { /* scan whole column */ yl = 0; - yu = 0x3F << 6; + yu = GEN_HASHY_MASK; } - for (int y = yl;; y = (y + (1 << 6)) & (0x3F << 6)) { - for (int x = xl;; x = (x + 1) & 0x3F) { + for (int y = yl;; y = (y + GEN_HASHY_INC) & GEN_HASHY_MASK) { + for (int x = xl;; x = (x + GEN_HASHX_INC) & GEN_HASHX_MASK) { const Vehicle *v = _vehicle_viewport_hash[x + y]; // already masked & 0xFFF while (v != NULL) { From 25a2b98b4c690fcf2efb536ece32732a31b5706c Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:25:26 +0000 Subject: [PATCH 56/58] (svn r27987) -Change: Increase maximum allowed vehicle sprite size to reduce clipping of ships. --- src/tile_type.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tile_type.h b/src/tile_type.h index eb5e8234c4..c02ba4fc45 100644 --- a/src/tile_type.h +++ b/src/tile_type.h @@ -18,8 +18,8 @@ static const uint TILE_PIXELS = 32; ///< Pixel distan static const uint TILE_HEIGHT = 8; ///< Height of a height level in world coordinate AND in pixels in #ZOOM_LVL_BASE. static const uint MAX_BUILDING_PIXELS = 200; ///< Maximum height of a building in pixels in #ZOOM_LVL_BASE. (Also applies to "bridge buildings" on the bridge floor.) -static const int MAX_VEHICLE_PIXEL_X = 70; ///< Maximum width of a vehicle in pixels in #ZOOM_LVL_BASE. -static const int MAX_VEHICLE_PIXEL_Y = 70; ///< Maximum height of a vehicle in pixels in #ZOOM_LVL_BASE. +static const int MAX_VEHICLE_PIXEL_X = 192; ///< Maximum width of a vehicle in pixels in #ZOOM_LVL_BASE. +static const int MAX_VEHICLE_PIXEL_Y = 96; ///< Maximum height of a vehicle in pixels in #ZOOM_LVL_BASE. static const uint MAX_TILE_HEIGHT = 255; ///< Maximum allowed tile height From 23b21b15eb60b768383312f0e7616bb40ca421df Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 13:34:28 +0000 Subject: [PATCH 57/58] (svn r27988) -Codechange: Extent hg- and gitignore for .vs --- .gitignore | 1 + .hgignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 4bf58b05c1..a6be172bab 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ docs/source/* media/openttd.desktop media/openttd.desktop.install objs/* +projects/.vs projects/Debug projects/Release projects/*.ncb diff --git a/.hgignore b/.hgignore index 17b2557f80..3cf61bde69 100644 --- a/.hgignore +++ b/.hgignore @@ -22,6 +22,7 @@ Makefile.bundle media/openttd.desktop media/openttd.desktop.install objs/* +projects/.vs projects/*.ncb projects/*.suo projects/*.sdf From a537fd5d0e2a7af3ae5865ce09910fcb1b9253be Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Mar 2018 15:08:51 +0000 Subject: [PATCH 58/58] (svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases: - nvar=0 is meant to return the calculated result. - Missing references resolve to NULL and got identified with the default result. - Missing 'break' broke overlapping cases. - Splitting into non-overlapping cases could result in more than 256 cases. --- src/newgrf.cpp | 7 +++++-- src/newgrf_spritegroup.cpp | 2 +- src/newgrf_spritegroup.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 41d7195918..d06d1c40a5 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -4698,6 +4698,8 @@ static void NewSpriteGroup(ByteReader *buf) group->default_group = GetGroupFromGroupID(setid, type, buf->ReadWord()); group->error_group = ranges.size() > 0 ? ranges[0].group : group->default_group; + /* nvar == 0 is a special case -- we turn our value into a callback result */ + group->calculated_result = ranges.size() == 0; /* Sort ranges ascending. When ranges overlap, this may required clamping or splitting them */ std::vector bounds; @@ -4711,10 +4713,11 @@ static void NewSpriteGroup(ByteReader *buf) std::vector target; for (uint j = 0; j < bounds.size(); ++j) { uint32 v = bounds[j]; - const SpriteGroup *t = NULL; + const SpriteGroup *t = group->default_group; for (uint i = 0; i < ranges.size(); i++) { if (ranges[i].low <= v && v <= ranges[i].high) { t = ranges[i].group; + break; } } target.push_back(t); @@ -4723,7 +4726,7 @@ static void NewSpriteGroup(ByteReader *buf) std::vector optimised; for (uint j = 0; j < bounds.size(); ) { - if (target[j]) { + if (target[j] != group->default_group) { DeterministicSpriteGroupRange r; r.group = target[j]; r.low = bounds[j]; diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 8f44ef9c5e..a5d689bbf9 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -252,7 +252,7 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con object.last_value = last_value; - if (this->num_ranges == 0) { + if (this->calculated_result) { /* nvar == 0 is a special case -- we turn our value into a callback result */ if (value != CALLBACK_FAILED) value = GB(value, 0, 15); static CallbackResultSpriteGroup nvarzero(0, true); diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index b2e764599d..6adf7c2ac8 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -174,7 +174,8 @@ struct DeterministicSpriteGroup : SpriteGroup { VarSpriteGroupScope var_scope; DeterministicSpriteGroupSize size; uint num_adjusts; - byte num_ranges; + uint num_ranges; + bool calculated_result; DeterministicSpriteGroupAdjust *adjusts; DeterministicSpriteGroupRange *ranges; // Dynamically allocated