From e931f3061ff6cd88cd7250c933cff7a316a0b988 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 6 Nov 2022 23:16:38 +0000 Subject: [PATCH 01/10] Fix: Dereference of past-the-end iterator in linkgraph overlay tooltip (#10145) --- src/linkgraph/linkgraph_gui.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp index c32c5d395a..a5366b55e3 100644 --- a/src/linkgraph/linkgraph_gui.cpp +++ b/src/linkgraph/linkgraph_gui.cpp @@ -379,16 +379,20 @@ bool LinkGraphOverlay::ShowTooltip(Point pt, TooltipCloseCondition close_cond) char *buf_end = buf; buf[0] = 0; /* Fill buf with more information if this is a bidirectional link. */ + uint32 back_time = 0; auto k = this->cached_links[j->first].find(i->first); - const auto &back = k->second; - if (k != this->cached_links[j->first].end() && back.Usage() > 0) { - SetDParam(0, back.cargo); - SetDParam(1, back.Usage()); - SetDParam(2, back.Usage() * 100 / (back.capacity + 1)); - buf_end = GetString(buf, STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION, lastof(buf)); + if (k != this->cached_links[j->first].end()) { + const auto &back = k->second; + back_time = back.time; + if (back.Usage() > 0) { + SetDParam(0, back.cargo); + SetDParam(1, back.Usage()); + SetDParam(2, back.Usage() * 100 / (back.capacity + 1)); + buf_end = GetString(buf, STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION, lastof(buf)); + } } /* Add information about the travel time if known. */ - const auto time = link.time ? back.time ? ((link.time + back.time) / 2) : link.time : back.time; + const auto time = link.time ? back_time ? ((link.time + back_time) / 2) : link.time : back_time; if (time > 0) { SetDParam(0, time); buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION, lastof(buf)); From b6a899eb2b8f85245e3ad1df7e76274844c3bb7e Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 7 Nov 2022 18:48:23 +0000 Subject: [PATCH 02/10] Update: Translations from eints slovak: 62 changes by legitalk --- src/lang/slovak.txt | 99 ++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 0e26fdc817..0cb959ca90 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -289,9 +289,9 @@ STR_UNITS_HEIGHT_METRIC :{COMMA} m STR_UNITS_HEIGHT_SI :{COMMA} m # Common window strings -STR_LIST_FILTER_TITLE :{BLACK}Filtrovací reťazec: -STR_LIST_FILTER_OSKTITLE :{BLACK}Vložiť filtrovací reťazec -STR_LIST_FILTER_TOOLTIP :{BLACK}Vložiť kľúčové slovo pre filtrovanie zoznamu +STR_LIST_FILTER_TITLE :{BLACK}Filter: +STR_LIST_FILTER_OSKTITLE :{BLACK}Vložiť aspoň jedno klúčové slovo pre filtrovanie +STR_LIST_FILTER_TOOLTIP :{BLACK}Vložiť aspoň jedno klúčové slovo pre filtrovanie STR_TOOLTIP_GROUP_ORDER :{BLACK}Zvoľ druh zoskupenia STR_TOOLTIP_SORT_ORDER :{BLACK}Spôsob triedenia (zostupný/vzostupný) @@ -442,7 +442,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Stavba c STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Výstavba električkovej trate STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Sadiť stromy. Shift zobrazí odhadovanú cenu STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Umiestniť popis -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Umiestniť objekt. Shift zobrazí odhadovanú cenu +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Umiestniť objekt. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu # Scenario editor file menu ###length 7 @@ -1063,6 +1063,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Nastaven STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Zaškrtnite toto políčko, aby ste povolili vertikálnu synchronizáciu. Zmeny budú uplatnené až po reštarte hry. Funguje iba ak je zapnutá hardvérová akcelerácia. +STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Aktuálny ovládač: {STRING} STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Veľkosť rozhrania STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Výber veľkosti prvkov rozhrania @@ -1195,15 +1196,16 @@ STR_TERRAIN_TYPE_CUSTOM :Vlastná výšk STR_TERRAIN_TYPE_CUSTOM_VALUE :Vlastná výška ({NUM}) ###length 4 +STR_CITY_APPROVAL_LENIENT :Zhovievavý STR_CITY_APPROVAL_TOLERANT :Tolerantný STR_CITY_APPROVAL_HOSTILE :Odmietavý -STR_CITY_APPROVAL_PERMISSIVE :Pozitívny +STR_CITY_APPROVAL_PERMISSIVE :Povoľný (nemá vplyv na akcie spoločnosti) STR_WARNING_NO_SUITABLE_AI :{WHITE}Nieje dostupné žiadne použiteľné AI...{}Niekoľko AI je možné stiahnuť cez 'Online obsah' # Settings tree window STR_CONFIG_SETTING_TREE_CAPTION :{WHITE}Nastavenia -STR_CONFIG_SETTING_FILTER_TITLE :{BLACK}Filtrovací reťazec: +STR_CONFIG_SETTING_FILTER_TITLE :{BLACK}Filter: STR_CONFIG_SETTING_EXPAND_ALL :{BLACK}Rozbaliť všetko STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Zabaliť všetko STR_CONFIG_SETTING_RESET_ALL :Resetovať všetky hodnoty @@ -1298,8 +1300,8 @@ STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Ak je povolené STR_CONFIG_SETTING_DISASTERS :Havárie: {STRING} STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Vypne alebo zapne katastrofy, ktoré môžu občas zablokovať alebo zničiť vozidlá alebo infraštruktúru -STR_CONFIG_SETTING_CITY_APPROVAL :Postoj mestskej správy k reštrukturalizácii v oblasti: {STRING} -STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Zvoľte ako veľmi ovplyvňuje hluk a poškodzovanie prostredia spoločnosťami ich hodnotenie v meste a ich budúce možnosti výstavby v oblasti vlastnenej mestom +STR_CONFIG_SETTING_CITY_APPROVAL :Postoj miestnej samosprávy: {STRING} +STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Zvoľte ako veľmi ovplyvňuje hluk a poškodzovanie prostredia spoločnosťami ich hodnotenie v meste a ich budúce možnosti výstavby v meste STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Limit výšky mapy: {STRING} STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT :Zvoľte maximálnu výšku terénu na mape. S "(automatický)" bude vybraná správna hodnota podľa generátora krajiny @@ -1573,7 +1575,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Zelená STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Tmavozelená STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Fialová +STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Farby prekrytia toku nákladu: {STRING} +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_HELPTEXT :Nastavte farebnú schému použitú pre prekrytie toku nákladu. ###length 4 +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :Zelenočervená +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Zelenomodrá +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Sivá až červená +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Odtiene šedej STR_CONFIG_SETTING_SCROLLMODE :Správanie pohľadu pri posúvaní myšou: {STRING} STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Reakcia na posúvanie (scrollovanie) na mape @@ -2529,13 +2537,13 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :čaká sa na ak STR_NETWORK_MESSAGE_CLIENT_LEAVING :odchádza STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} vstúpil do hry -STR_NETWORK_MESSAGE_CLIENT_JOINED_ID :*** {STRING} vstúpil do hry (klient č. {2:NUM}) -STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN :*** {STRING} sa pripojil do spoločnosti č. {2:NUM} +STR_NETWORK_MESSAGE_CLIENT_JOINED_ID :*** {0:STRING} vstúpil do hry (klient č. {2:NUM}) +STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN :*** {0:STRING} sa pripojil do spoločnosti č. {2:NUM} STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} sa pripojil k pozorovateľom -STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} založil novú spoločnosť (č. {2:NUM}) -STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} opustil hru ({2:STRING}) +STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {0:STRING} založil novú spoločnosť (#{2:NUM}) +STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {0:STRING} opustil hru ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} zmenil/-a svoje meno na {STRING} -STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} dal {2:CURRENCY_LONG} spoločnosti {1:STRING} +STR_NETWORK_MESSAGE_GIVE_MONEY :*** {0:STRING} dal {2:CURRENCY_LONG} spoločnosti {1:STRING} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Server ukončil reláciu STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Server sa reštartuje...{}Čakajte prosím... STR_NETWORK_MESSAGE_KICKED :*** Hráč {STRING} bol vyhodený. Dôvod: ({STRING}) @@ -2650,6 +2658,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}preťažené # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} na prepravu za mesiac z {STATION} do {STATION} ({COMMA}% kapacity){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} na prepravu naspäť ({COMMA}% kapacity) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Priemerný čas cesty: {NUM}{NBSP}d{P eň ni ní} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Ukázať oblasť pokrytia @@ -2659,6 +2670,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nezvýra STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Zobraziť oblasť pokrytia stavanej plochy STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Prijíma: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Dodáva: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Náklady na údržbu: {GOLD}{CURRENCY_SHORT}/rok # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Spojiť stanicu @@ -2846,11 +2858,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Úprava STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Znížiť roh políčka. Ťahaním znížite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Zvýšiť roh políčka. Ťahaním zvýšite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Vyrovnať výšku terénu podľa vybraného rohu. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Zakúpiť pozemok pre budúce použitie. Shift zobrazí odhadovanú cenu +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Zakúpiť pozemok pre budúce použitie. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Výber objektu -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Vyberte objekt na vybudovanie. Shift zobrazí odhadovanú cenu +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Vyberte objekt na vybudovanie. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Vyberte triedu objektu na vybudovanie STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Náhľad objektu STR_OBJECT_BUILD_SIZE :{BLACK}Rozmery: {GOLD}{NUM} x {NUM} políčok @@ -3158,7 +3170,7 @@ STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Detaily STR_SAVELOAD_DETAIL_NOT_AVAILABLE :{BLACK}Informácia nie je k dispozícii STR_SAVELOAD_DETAIL_COMPANY_INDEX :{SILVER}{COMMA}: {WHITE}{STRING} STR_SAVELOAD_DETAIL_GRFSTATUS :{SILVER}NewGRF: {WHITE}{STRING} -STR_SAVELOAD_FILTER_TITLE :{BLACK}Filtrovací reťazec: +STR_SAVELOAD_FILTER_TITLE :{BLACK}Filter: STR_SAVELOAD_OVERWRITE_TITLE :{WHITE}Prepísanie súboru STR_SAVELOAD_OVERWRITE_WARNING :{YELLOW}Ste si istý, že chcete prepísať existujúci súbor? STR_SAVELOAD_DIRECTORY :{STRING} (Priečinok) @@ -3275,7 +3287,7 @@ STR_NEWGRF_SETTINGS_INFO_TITLE :{WHITE}Detailn STR_NEWGRF_SETTINGS_ACTIVE_LIST :{WHITE}Aktívne NewGRF súbory STR_NEWGRF_SETTINGS_INACTIVE_LIST :{WHITE}Neaktívne NewGRF súbory STR_NEWGRF_SETTINGS_SELECT_PRESET :{ORANGE}Vybrať predvoľbu: -STR_NEWGRF_FILTER_TITLE :{ORANGE}Filtrovací reťazec: +STR_NEWGRF_FILTER_TITLE :{ORANGE}Filter: STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP :{BLACK}Nahrať vybraný zoznam STR_NEWGRF_SETTINGS_PRESET_SAVE :{BLACK}Uložit zoznam STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP :{BLACK}Uložiť aktuálne nastavenie ako zoznam @@ -3379,15 +3391,15 @@ STR_NEWGRF_ERROR_MSG_FATAL :{RED}Kritická STR_NEWGRF_ERROR_FATAL_POPUP :{WHITE}Nastala závažná chyba NewGRF:{}{STRING} STR_NEWGRF_ERROR_POPUP :{WHITE}Vyskytla sa chyba NewGRF:{}{STRING} STR_NEWGRF_ERROR_VERSION_NUMBER :{1:STRING} nebude fungovať s TTDPatch verziou nahlásenou OpenTTD. -STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{1:STRING} je pre verziu {STRING} TTD. -STR_NEWGRF_ERROR_UNSET_SWITCH :{1:STRING} je navrhnutý pre použitie s {STRING} -STR_NEWGRF_ERROR_INVALID_PARAMETER :Neplatný parameter {1:STRING}: parameter {STRING} ({NUM}) -STR_NEWGRF_ERROR_LOAD_BEFORE :{1:STRING} musí byť načítaný pred {STRING} -STR_NEWGRF_ERROR_LOAD_AFTER :{1:STRING} musí byť načítaný po {STRING} -STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :{1:STRING} vyžaduje verziu OpenTTD {STRING} alebo vyššiu. +STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{1:STRING} je pre verziu {2:STRING} TTD +STR_NEWGRF_ERROR_UNSET_SWITCH :{1:STRING} je navrhnutý pre použitie s {2:STRING} +STR_NEWGRF_ERROR_INVALID_PARAMETER :Neplatný parameter {1:STRING}: parameter {2:STRING} ({3:NUM}) +STR_NEWGRF_ERROR_LOAD_BEFORE :{1:STRING} musí byť načítaný pred {2:STRING} +STR_NEWGRF_ERROR_LOAD_AFTER :{1:STRING} musí byť načítaný po {2:STRING} +STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :{1:STRING} vyžaduje verziu OpenTTD {2:STRING} alebo vyššiu STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :GRF súbor bol navrhnutý na preklad STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Načítaných priveľa súborov NewGRF. -STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC :Načítanie {1:STRING} ako statického NewGRF s {STRING} môže spôsobiť chybné zobrazenie. +STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC :Načítanie {1:STRING} ako statického NewGRF s {2:STRING} môže spôsobiť chybné zobrazenie STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Neočakávaný sprite (sprite {3:NUM}) STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Neznáma vlastnosť Action 0 {4:HEX} (sprite {3:NUM}) STR_NEWGRF_ERROR_INVALID_ID :Pokus o použitie neplatného ID (sprite {3:NUM}) @@ -3679,22 +3691,34 @@ STR_FINANCES_CAPTION :{WHITE}Financie STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 +STR_FINANCES_REVENUE_TITLE :Výnosy +STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Prevádzkové náklady +STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Kapitálové výdavky ###length 13 STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Výstavba STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Nové vozidlá -STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Prevádzka vlakov -STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Prevádzka cestných vozidiel -STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Prevádzka lietadiel -STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Prevádzka lodí +STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Vlaky +STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Cestné vozidlá +STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Lietadlá +STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Lode +STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Infraštruktúra +STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Vlaky +STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE :{GOLD}Cestné vozidlá +STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Lietadlá +STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Lode STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Úroky STR_FINANCES_SECTION_OTHER :{GOLD}Ostatné -STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} -STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG} +STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} +STR_FINANCES_ZERO_INCOME :{CURRENCY_LONG} +STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} +STR_FINANCES_NET_PROFIT :{WHITE}Čistý zisk STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Zostatok na účte v banke +STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Vlastné prostriedky STR_FINANCES_LOAN_TITLE :{WHITE}Úver +STR_FINANCES_INTEREST_RATE :{WHITE}Úroky: {BLACK}{NUM}% STR_FINANCES_MAX_LOAN :{WHITE}Maximálny úver: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Požičať {CURRENCY_LONG} @@ -3797,7 +3821,7 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO :{BLACK}Produkuj STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION :, {STRING}{STRING} STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Vyžaduje: -STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{STRING}{BLACK}{3:STRING} +STR_INDUSTRY_VIEW_ACCEPT_CARGO :{YELLOW}{0:STRING}{BLACK}{3:STRING} STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} čak{P á ajú á}{STRING} STR_CONFIG_GAME_PRODUCTION :{WHITE}Zmeniť produkciu (násobky 8, až do 2040) @@ -4086,7 +4110,7 @@ STR_ENGINE_PREVIEW_AIRCRAFT :{G=s}lietadlo STR_ENGINE_PREVIEW_SHIP :{G=z}loď STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Cena: {CURRENCY_LONG} Hmotnosť: {WEIGHT_SHORT}{}Rýchlosť: {VELOCITY} Výkon: {POWER}{}Prevádzkové náklady: {CURRENCY_LONG}/rok{}Kapacita: {CARGO_LONG} -STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Cena: {CURRENCY_LONG} Hmotnosť: {WEIGHT_SHORT}{}Rýchlosť: {VELOCITY} Sila: {POWER} Max. T.E.: {6:FORCE}{}Prevádzkové náklady: {4:CURRENCY_LONG}/yr{}Kapacita: {5:CARGO_LONG} +STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Cena: {0:CURRENCY_LONG} Váha: {1:WEIGHT_SHORT}{}Rýchlosť: {2:VELOCITY} Výkon: {3:POWER} Max. trakčná sila: {6:FORCE}{}Prevádzkové náklady: {4:CURRENCY_LONG}/rok{}Kapacita: {5:CARGO_LONG} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST :{BLACK}Cena: {CURRENCY_LONG} Max. Rýchlosť: {VELOCITY}{}Kapacita: {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST :{BLACK}Cena: {CURRENCY_LONG} Rýchlosť: {VELOCITY}{}Typ lietadla: {STRING}{}Kapacita: {CARGO_LONG}, {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST :{BLACK}Cena: {CURRENCY_LONG} Rýchlosť: {VELOCITY}{}Typ lietadla: {STRING}{}Kapacita: {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok @@ -4249,8 +4273,8 @@ STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Spoľahl STR_VEHICLE_INFO_BUILT_VALUE :{LTBLUE}{ENGINE} {BLACK}Vyrobený: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY_LONG} STR_VEHICLE_INFO_NO_CAPACITY :{BLACK}Kapacita: {LTBLUE}Žiadna{STRING} -STR_VEHICLE_INFO_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO_LONG}{3:STRING} -STR_VEHICLE_INFO_CAPACITY_MULT :{BLACK}Kapacita: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM}) +STR_VEHICLE_INFO_CAPACITY :{BLACK}Kapacita: {LTBLUE}{0:CARGO_LONG}{3:STRING} +STR_VEHICLE_INFO_CAPACITY_MULT :{BLACK}Kapacita: {LTBLUE}{0:CARGO_LONG}{3:STRING} (x{4:NUM}) STR_VEHICLE_INFO_CAPACITY_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING} STR_VEHICLE_INFO_FEEDER_CARGO_VALUE :{BLACK}Transfer kredity: {LTBLUE}{CURRENCY_LONG} @@ -4276,8 +4300,8 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Hodnota: {LTBLUE}{CURRENCY_LONG} STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Celkový náklad (kapacita) tohto vlaku: -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) -STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) +STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) (x{NUM}) STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Prázdny STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO_LONG} z {STATION} @@ -4516,7 +4540,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Tento ce STR_TIMETABLE_STATUS_START_AT :{BLACK}Tento cestovný poriadok začne {STRING} STR_TIMETABLE_STARTING_DATE :{BLACK}Začiatočný dátum -STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Vyberte dátum začiatku cestovného poriadku. Ctrl+klik nastaví počiatočný dátum tohto cestovného poriadku pre všetky vozidlá zdieľajúce tieto príkazy na základe ich relatívneho poradia, ak je cestovný poriadok kompletne vyplnený +STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Vyberte dátum začiatku cestovného poriadku. Ctrl+klik rozdelí od daného dátumu rovnomerne všetky vozidlá zdieľajúce tieto príkazy na základe ich relatívneho poradia, ak je cestovný poriadok kompletne vyplnený STR_TIMETABLE_CHANGE_TIME :{BLACK}Zmeniť čas STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Zmeniť dĺžku trvania označeného príkazu @@ -4973,6 +4997,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}V ceste STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... sídlo spoločnosti v ceste STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}Tento pozemok nie je možné kúpiť... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... už to vlastníš! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}... dosiahnutý stavebný limit objektu # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Nie je možné vytvoriť skupinu... From 8c4a70e05ea6ad1387961f96e377a00fac66fdd7 Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:54:04 +0000 Subject: [PATCH 03/10] Fix: Refresh company window when switching companies (#9910) --- src/company_cmd.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 681912f17c..e2ea0a20f1 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -115,8 +115,11 @@ void SetLocalCompany(CompanyID new_company) _current_company = _local_company = new_company; - /* Delete any construction windows... */ - if (switching_company) CloseConstructionWindows(); + if (switching_company) { + InvalidateWindowClassesData(WC_COMPANY); + /* Delete any construction windows... */ + CloseConstructionWindows(); + } /* ... and redraw the whole screen. */ MarkWholeScreenDirty(); From b7abaa55a3843a1d1ccd4e1be05a4e50e98b5289 Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Tue, 8 Nov 2022 11:11:24 +0000 Subject: [PATCH 04/10] Codechange: Improve performance when calculating company value (#9901) --- src/economy.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/economy.cpp b/src/economy.cpp index bc3fa29894..5e8318fd0d 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -101,6 +101,8 @@ Economy _economy; Prices _price; static PriceMultipliers _price_base_multiplier; +extern int GetAmountOwnedBy(const Company *c, Owner owner); + /** * Calculate the value of the company. That is the value of all * assets (vehicles, stations, shares) and money minus the loan, @@ -115,18 +117,12 @@ Money CalculateCompanyValue(const Company *c, bool including_loan) Money owned_shares_value = 0; for (const Company *co : Company::Iterate()) { - uint8 shares_owned = 0; + int shares_owned = GetAmountOwnedBy(co, c->index); - for (uint8 i = 0; i < 4; i++) { - if (co->share_owners[i] == c->index) { - shares_owned++; - } - } - - owned_shares_value += (CalculateCompanyValueExcludingShares(co) / 4) * shares_owned; + if (shares_owned > 0) owned_shares_value += (CalculateCompanyValueExcludingShares(co) / 4) * shares_owned; } - return std::max(owned_shares_value + CalculateCompanyValueExcludingShares(c), 1); + return owned_shares_value + CalculateCompanyValueExcludingShares(c); } Money CalculateCompanyValueExcludingShares(const Company *c, bool including_loan) @@ -2018,8 +2014,6 @@ static void DoAcquireCompany(Company *c) delete c; } -extern int GetAmountOwnedBy(const Company *c, Owner owner); - /** * Acquire shares in an opposing company. * @param flags type of operation From d738cd235f50c1878a6355b8eb18d75334791a18 Mon Sep 17 00:00:00 2001 From: larryfenn Date: Tue, 8 Nov 2022 06:13:16 -0500 Subject: [PATCH 05/10] Change: Automatic screenshot numbering with a filename ending in '#' (#9781) --- src/console_cmds.cpp | 1 + src/screenshot.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 2936a8a147..1718ecce26 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -1493,6 +1493,7 @@ DEF_CONSOLE_CMD(ConScreenShot) IConsolePrint(CC_HELP, " 'minimap' makes a top-viewed minimap screenshot of the whole world which represents one tile by one pixel."); IConsolePrint(CC_HELP, " 'no_con' hides the console to create the screenshot (only useful in combination with 'viewport')."); IConsolePrint(CC_HELP, " 'size' sets the width and height of the viewport to make a screenshot of (only useful in combination with 'normal' or 'big')."); + IConsolePrint(CC_HELP, " A filename ending in # will prevent overwriting existing files and will number files counting upwards."); return true; } diff --git a/src/screenshot.cpp b/src/screenshot.cpp index e4cce7e1ed..bec7cc7c6b 100644 --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -681,8 +681,16 @@ static const char *MakeScreenshotName(const char *default_fn, const char *ext, b } } - /* Add extension to screenshot file */ size_t len = strlen(_screenshot_name); + + /* Handle user-specified filenames ending in # with automatic numbering */ + if (StrEndsWith(_screenshot_name, "#")) { + generate = true; + len -= 1; + _screenshot_name[len] = '\0'; + } + + /* Add extension to screenshot file */ seprintf(&_screenshot_name[len], lastof(_screenshot_name), ".%s", ext); const char *screenshot_dir = crashlog ? _personal_dir.c_str() : FiosGetScreenshotDir(); From 60ccab3c528bc4b46a341a82b4005a13ec435032 Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:44:17 +0000 Subject: [PATCH 06/10] Fix #9908: Close company windows only after all its infrastructure is removed (#9912) --- src/company_cmd.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index e2ea0a20f1..6d3f5b6256 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -892,8 +892,6 @@ CommandCost CmdCompanyCtrl(DoCommandFlag flags, CompanyCtrlAction cca, CompanyID if (!(flags & DC_EXEC)) return CommandCost(); - /* Delete any open window of the company */ - CloseCompanyWindows(c->index); CompanyNewsInformation *cni = new CompanyNewsInformation(c); /* Show the bankrupt news */ From 62a15734fec1398536191680bc81e00b294b8fc7 Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Tue, 8 Nov 2022 09:23:12 -0700 Subject: [PATCH 07/10] Codechange: Rename mapgen Sea Level string --- src/genworld_gui.cpp | 4 ++-- src/lang/english.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index d352418047..f0583d9874 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -94,7 +94,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = { NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_LAND_GENERATOR, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_TERRAIN_TYPE, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_VARIETY, STR_NULL), SetFill(1, 1), - NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_QUANTITY_OF_SEA_LAKES, STR_NULL), SetFill(1, 1), + NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_SEA_LEVEL, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_BORDER_TYPE, STR_NULL), SetFill(1, 1), @@ -882,7 +882,7 @@ struct GenerateLandscapeWindow : public Window { if ((uint)index == CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY) { this->widget_id = widget; SetDParam(0, _settings_newgame.game_creation.custom_sea_level); - ShowQueryString(STR_JUST_INT, STR_MAPGEN_QUANTITY_OF_SEA_LAKES, 3, this, CS_NUMERAL, QSF_NONE); + ShowQueryString(STR_JUST_INT, STR_MAPGEN_SEA_LEVEL, 3, this, CS_NUMERAL, QSF_NONE); } _settings_newgame.difficulty.quantity_sea_lakes = index; break; diff --git a/src/lang/english.txt b/src/lang/english.txt index c1984d20f1..34ea3b6775 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Decrease STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Land generator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrain type: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Sea level: +STR_MAPGEN_SEA_LEVEL :{BLACK}Sea level: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rivers: STR_MAPGEN_SMOOTHNESS :{BLACK}Smoothness: STR_MAPGEN_VARIETY :{BLACK}Variety distribution: From 31d08421abc8ed514f07c57084b917eb1a0d4ac6 Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Tue, 8 Nov 2022 09:23:51 -0700 Subject: [PATCH 08/10] Update: Rename mapgen Sea Level string in other language files --- 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_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/frisian.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/latin.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/persian.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/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index b2d358992d..192daeafb7 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2899,7 +2899,7 @@ STR_MAPGEN_DATE :{BLACK}Datum: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Hoev. nywerhede: STR_MAPGEN_LAND_GENERATOR :{BLACK}Land genereerder: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrein tipe: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Seevlak: +STR_MAPGEN_SEA_LEVEL :{BLACK}Seevlak: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Riviere: STR_MAPGEN_SMOOTHNESS :{BLACK}Gladheid: STR_MAPGEN_VARIETY :{BLACK}Verskeidenheid verspreiding: diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 4be0eb353f..c13422ad45 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2655,7 +2655,7 @@ STR_MAPGEN_DESERT_COVERAGE :{BLACK}مدى STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}مولد الخريطة: STR_MAPGEN_TERRAIN_TYPE :{BLACK} نوع التضاريس -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}مستوى البحر +STR_MAPGEN_SEA_LEVEL :{BLACK}مستوى البحر STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}انهار: STR_MAPGEN_SMOOTHNESS :{BLACK} النعومة: STR_MAPGEN_VARIETY :{BLACK}توزيع التنوع: diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 575ae17029..2cebdb853f 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -2727,7 +2727,7 @@ STR_MAPGEN_DATE :{BLACK}Data: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Industria kopurua: STR_MAPGEN_LAND_GENERATOR :{BLACK}Paisaia sortzailea: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Lur mota: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Itsaso kopurua: +STR_MAPGEN_SEA_LEVEL :{BLACK}Itsaso kopurua: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Errekak: STR_MAPGEN_SMOOTHNESS :{BLACK}Leuntasuna: STR_MAPGEN_VARIETY :{BLACK}Barietateen distribuzioa: diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index a623331cbb..14e4d062bb 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -3249,7 +3249,7 @@ STR_MAPGEN_SNOW_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Паменшыць плошчу пяшчанага пакрыцця на 10% STR_MAPGEN_LAND_GENERATOR :{BLACK}Ґенэратар ляндшафту: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Тып ляндшафту: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Колькасьць азёраў/мораў: +STR_MAPGEN_SEA_LEVEL :{BLACK}Колькасьць азёраў/мораў: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Колькасьць рэк: STR_MAPGEN_SMOOTHNESS :{BLACK}Гладкасьць: STR_MAPGEN_VARIETY :{BLACK}Разнастайнасьць ляндшафту: diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index a03fc5f9f3..9c2adf6248 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3130,7 +3130,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Diminuir STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Gerador de terra STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipo de terreno -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nível do mar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nível do mar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rios: STR_MAPGEN_SMOOTHNESS :{BLACK}Regularidade STR_MAPGEN_VARIETY :{BLACK}Distribuição da variedade diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 6f4978b8a4..a4130eb900 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2782,7 +2782,7 @@ STR_MAPGEN_DATE :{BLACK}Дата STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Брой индустрии: STR_MAPGEN_LAND_GENERATOR :{BLACK}Земегенератор: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Тип на терен: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Морско ниво: +STR_MAPGEN_SEA_LEVEL :{BLACK}Морско ниво: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Реки: STR_MAPGEN_SMOOTHNESS :{BLACK}Полегатост: STR_MAPGEN_VARIETY :{BLACK}Разнообразност: diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 1781cc632b..a97b604207 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Redueix STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}{NBSP}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generació de terrenys: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipus de terreny: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nivell de mar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nivell de mar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Quantitat de rius: STR_MAPGEN_SMOOTHNESS :{BLACK}Suavitat: STR_MAPGEN_VARIETY :{BLACK}Varietat: diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 55080e7835..9e281d9206 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3066,7 +3066,7 @@ STR_MAPGEN_SNOW_COVERAGE_DOWN :{BLACK}Smanji p STR_MAPGEN_DESERT_COVERAGE :{BLACK}Pustinjska pokrivenost: STR_MAPGEN_LAND_GENERATOR :{BLACK}Izrađivač zemljišta: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Vrsta terena: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Razina mora: +STR_MAPGEN_SEA_LEVEL :{BLACK}Razina mora: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rijeke: STR_MAPGEN_SMOOTHNESS :{BLACK}Graduacija: STR_MAPGEN_VARIETY :{BLACK}Distribucija raznovrsnosti: diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 72b2bc754b..d32f2a64f6 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3222,7 +3222,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Zmenšit STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generátor krajiny: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Typ krajiny: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Četnost jezer: +STR_MAPGEN_SEA_LEVEL :{BLACK}Četnost jezer: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Řeky: STR_MAPGEN_SMOOTHNESS :{BLACK}Členitost krajiny: STR_MAPGEN_VARIETY :{BLACK}Rozmanitost terénu: diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 4dbb63bd30..e4553d8423 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3121,7 +3121,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Sænker STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Terrængenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terræntype: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Havniveau +STR_MAPGEN_SEA_LEVEL :{BLACK}Havniveau STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Floder: STR_MAPGEN_SMOOTHNESS :{BLACK}Blødhed: STR_MAPGEN_VARIETY :{BLACK}Varietet af distributionen: diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index cb6e62d0a0..f4f8650bce 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Verklein STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Landgenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terreintype: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Zeeniveau: +STR_MAPGEN_SEA_LEVEL :{BLACK}Zeeniveau: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rivieren: STR_MAPGEN_SMOOTHNESS :{BLACK}Gladheid: STR_MAPGEN_VARIETY :{BLACK}Landschapsvariatie: diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 4d89bf2496..cbe0ab07d4 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Decrease STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Land generator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrain type: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Sea level: +STR_MAPGEN_SEA_LEVEL :{BLACK}Sea level: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rivers: STR_MAPGEN_SMOOTHNESS :{BLACK}Smoothness: STR_MAPGEN_VARIETY :{BLACK}Variety distribution: diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index e66a289e71..9ae489a81e 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Decrease STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Land generator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrain type: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Sea level: +STR_MAPGEN_SEA_LEVEL :{BLACK}Sea level: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rivers: STR_MAPGEN_SMOOTHNESS :{BLACK}Smoothness: STR_MAPGEN_VARIETY :{BLACK}Variety distribution: diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 5d41a66f06..fa9b4fea94 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2398,7 +2398,7 @@ STR_MAPGEN_DATE :{BLACK}Dato: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Kiom da industrioj: STR_MAPGEN_LAND_GENERATOR :{BLACK}Landgenerilo: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terentipo: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Marnivelo: +STR_MAPGEN_SEA_LEVEL :{BLACK}Marnivelo: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Riveroj: STR_MAPGEN_SMOOTHNESS :{BLACK}Reguleco: STR_MAPGEN_VARIETY :{BLACK}Diverseca distribuo: diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 2787dc1a62..2f99ce115b 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3126,7 +3126,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Vähenda STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Maatekituse meetod: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Maapinna tüüp: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Merepinna tase: +STR_MAPGEN_SEA_LEVEL :{BLACK}Merepinna tase: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Jõgesid: STR_MAPGEN_SMOOTHNESS :{BLACK}Laugus: STR_MAPGEN_VARIETY :{BLACK}Iseärasuste jaotus: diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 727e795f66..f2f3bd6722 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -2553,7 +2553,7 @@ STR_MAPGEN_DATE :{BLACK}Dato: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Nr. av ídnaðum: STR_MAPGEN_LAND_GENERATOR :{BLACK}Lendis framleiðari: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Slag av lendi: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Sjóvarmáli: +STR_MAPGEN_SEA_LEVEL :{BLACK}Sjóvarmáli: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Løkar: STR_MAPGEN_SMOOTHNESS :{BLACK}Mjúkleiki: STR_MAPGEN_VARIETY :{BLACK}Fjølbroytnis útluting: diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 2305802b9f..0784fd4652 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3129,7 +3129,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Vähenn STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}{NBSP}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Maastogeneraattori: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Maaston tyyppi: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Merenpinta: +STR_MAPGEN_SEA_LEVEL :{BLACK}Merenpinta: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Joet: STR_MAPGEN_SMOOTHNESS :{BLACK}Tasaisuus: STR_MAPGEN_VARIETY :{BLACK}Vaihtelu: diff --git a/src/lang/french.txt b/src/lang/french.txt index a2ac1f2a19..e3a5602754 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3134,7 +3134,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Diminuer STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Générateur{NBSP}: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Type de terrain{NBSP}: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Niveau de la mer{NBSP}: +STR_MAPGEN_SEA_LEVEL :{BLACK}Niveau de la mer{NBSP}: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Nb. de rivières{NBSP}: STR_MAPGEN_SMOOTHNESS :{BLACK}Lissage{NBSP}: STR_MAPGEN_VARIETY :{BLACK}Variété de distribution{NBSP}: diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 61c272d95a..43c5f5ccfe 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -2705,7 +2705,7 @@ STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Oantal y STR_MAPGEN_SNOW_COVERAGE :{BLACK}Snie-oerflak: STR_MAPGEN_LAND_GENERATOR :{BLACK}Lângenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terreintype: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Seenivo: +STR_MAPGEN_SEA_LEVEL :{BLACK}Seenivo: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rivieren: STR_MAPGEN_SMOOTHNESS :{BLACK}Sljochtens: STR_MAPGEN_VARIETY :{BLACK}Lânskipsfariaasje: diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 729e1b3847..0274ccc40f 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -3078,7 +3078,7 @@ STR_MAPGEN_DATE :{BLACK}Ceann-la STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Gnìomhachasan: STR_MAPGEN_LAND_GENERATOR :{BLACK}Gineadair crutha-thìre: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Seòrsa a' chrutha-thìre: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Àirde na mara: +STR_MAPGEN_SEA_LEVEL :{BLACK}Àirde na mara: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Aibhnichean: STR_MAPGEN_SMOOTHNESS :{BLACK}Dè cho rèidh: STR_MAPGEN_VARIETY :{BLACK}Sgaoileadh caochlaidh: diff --git a/src/lang/galician.txt b/src/lang/galician.txt index f95e3c2afa..4025800042 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3130,7 +3130,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Disminu STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Xerador de terreo: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipo de terreo: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nivel do mar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nivel do mar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Ríos: STR_MAPGEN_SMOOTHNESS :{BLACK}Suavidade: STR_MAPGEN_VARIETY :{BLACK}Variedade: diff --git a/src/lang/german.txt b/src/lang/german.txt index 74907256a6..407dae78aa 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3134,7 +3134,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Wüstenb STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Landgenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Landschaftstyp: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Gewässermenge: +STR_MAPGEN_SEA_LEVEL :{BLACK}Gewässermenge: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Flüsse: STR_MAPGEN_SMOOTHNESS :{BLACK}Gleichmäßigkeit: STR_MAPGEN_VARIETY :{BLACK}Größe der Geländeformen: diff --git a/src/lang/greek.txt b/src/lang/greek.txt index a06983cc5d..2ab316c2b4 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3228,7 +3228,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Μείω STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Δημιουργός εδάφους: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Τύπος εδάφους: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Επίπεδο θάλασσας: +STR_MAPGEN_SEA_LEVEL :{BLACK}Επίπεδο θάλασσας: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Ποτάμια: STR_MAPGEN_SMOOTHNESS :{BLACK}Ομαλότητα: STR_MAPGEN_VARIETY :{BLACK}Διανομή ποικιλομορφίας: diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 6f38ba56cf..84ae492ec4 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -2862,7 +2862,7 @@ STR_MAPGEN_DATE :{BLACK} :תאר STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK} :מספר התעשיות STR_MAPGEN_LAND_GENERATOR :{BLACK} :מחולל פני שטח STR_MAPGEN_TERRAIN_TYPE :{BLACK} :סוג הקרקע -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK} :כמות ימים/אגמים +STR_MAPGEN_SEA_LEVEL :{BLACK} :כמות ימים/אגמים STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}נהרות: STR_MAPGEN_SMOOTHNESS :{BLACK} :חלקלקות STR_MAPGEN_VARIETY :{BLACK}הפצה מגוונת: diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 08953679e5..e52f0eab1d 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3197,7 +3197,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}A sivata STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Térkép generátor: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tereptípus: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Tengerszint: +STR_MAPGEN_SEA_LEVEL :{BLACK}Tengerszint: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Folyók: STR_MAPGEN_SMOOTHNESS :{BLACK}Simaság: STR_MAPGEN_VARIETY :{BLACK}Változatosság eloszlása: diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index c463a5ace6..206f8d5f7d 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2661,7 +2661,7 @@ STR_MAPGEN_DATE :{BLACK}Dags.: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Fjöldi iðnaða: STR_MAPGEN_LAND_GENERATOR :{BLACK}Landmyndun: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Gerð lands: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Magn sjávar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Magn sjávar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Ár: STR_MAPGEN_SMOOTHNESS :{BLACK}Sléttleiki lands: STR_MAPGEN_VARIETY :{BLACK}Fjölbreytileikadreifing: diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 2fc9114a5a..1795bc4e3c 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3129,7 +3129,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Kurangi STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Algoritma pulau: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Jenis dataran: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Area perairan: +STR_MAPGEN_SEA_LEVEL :{BLACK}Area perairan: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Sungai: STR_MAPGEN_SMOOTHNESS :{BLACK}Kehalusan: STR_MAPGEN_VARIETY :{BLACK}Macam penyebaran: diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 4a1cc5f3d0..fa541d522c 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -3112,7 +3112,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Laghdaig STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Talamh a chruthú: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Cineál tír-raoin: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Leibhéal na farraige: +STR_MAPGEN_SEA_LEVEL :{BLACK}Leibhéal na farraige: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Aibhneacha: STR_MAPGEN_SMOOTHNESS :{BLACK}Míne: STR_MAPGEN_VARIETY :{BLACK}Éagsúlacht: diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 33c8c59d5b..d0eab7c581 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3170,7 +3170,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Diminuis STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generatore: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipo di terreno: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Livello di mare: +STR_MAPGEN_SEA_LEVEL :{BLACK}Livello di mare: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Fiumi: STR_MAPGEN_SMOOTHNESS :{BLACK}Levigatezza: STR_MAPGEN_VARIETY :{BLACK}Varietà del terreno: diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 2d018390e9..ff627e6532 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3121,7 +3121,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}砂漠 STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}地形作成: STR_MAPGEN_TERRAIN_TYPE :{BLACK}地形種類: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}海水位: +STR_MAPGEN_SEA_LEVEL :{BLACK}海水位: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}河川: STR_MAPGEN_SMOOTHNESS :{BLACK}地形のなだらかさ: STR_MAPGEN_VARIETY :{BLACK}地形の地域性: diff --git a/src/lang/korean.txt b/src/lang/korean.txt index b1f12225e0..65cd65f3a7 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3134,7 +3134,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}사막 STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}지형 만들기: STR_MAPGEN_TERRAIN_TYPE :{BLACK}지형 종류: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}해수면: +STR_MAPGEN_SEA_LEVEL :{BLACK}해수면: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}강: STR_MAPGEN_SMOOTHNESS :{BLACK}지표면을 깎는 방식: STR_MAPGEN_VARIETY :{BLACK}산세 험준도: diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 89e1c06f9f..37d0604167 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -3051,7 +3051,7 @@ STR_MAPGEN_DATE :{BLACK}Dies: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Numerus industriarum: STR_MAPGEN_LAND_GENERATOR :{BLACK}Generatrum terrae: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Typus terrae: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Magnitudo maris: +STR_MAPGEN_SEA_LEVEL :{BLACK}Magnitudo maris: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Numerus fluviorum: STR_MAPGEN_SMOOTHNESS :{BLACK}Lenitas: STR_MAPGEN_VARIETY :{BLACK}Partitio Varietatis: diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index c0ea287010..083d1e79ad 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3134,7 +3134,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Samazin STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Zemes radītājs: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Apvidus reljefs: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Jūras līmenis: +STR_MAPGEN_SEA_LEVEL :{BLACK}Jūras līmenis: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Upes: STR_MAPGEN_SMOOTHNESS :{BLACK}Gludums: STR_MAPGEN_VARIETY :{BLACK}Dažādības sadalījums: diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 3429f4e6ce..32fa3552ec 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3277,7 +3277,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Sumažin STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generavimo algoritmas: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Vietovės tipas: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Jūros lygis: +STR_MAPGEN_SEA_LEVEL :{BLACK}Jūros lygis: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Upių kiekis: STR_MAPGEN_SMOOTHNESS :{BLACK}Jautrumas: STR_MAPGEN_VARIETY :{BLACK}Įvairovės paskirstymas: diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 807bbff8c5..34ea94e7c6 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3117,7 +3117,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Wüstenu STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Landgenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrain Typ: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Mieresspigel: +STR_MAPGEN_SEA_LEVEL :{BLACK}Mieresspigel: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Flëss: STR_MAPGEN_SMOOTHNESS :{BLACK}Mëllt: STR_MAPGEN_VARIETY :{BLACK}Vielfaltverdeelung: diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 420f4a5c2e..42b6ae8a9f 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -2561,7 +2561,7 @@ STR_MAPGEN_DATE :{BLACK}Tarikh: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Jumlah industri: STR_MAPGEN_LAND_GENERATOR :{BLACK}Janaan tanah: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Jenis rupa bumi: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Paras laut: +STR_MAPGEN_SEA_LEVEL :{BLACK}Paras laut: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Sungai: STR_MAPGEN_SMOOTHNESS :{BLACK}Kelicinan: STR_MAPGEN_VARIETY :{BLACK}Pembahagian variasi: diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 2e870ebdaa..1fcb335ffa 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3125,7 +3125,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Reduser STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Landskapsgenerator STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrengtype: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Havnivå: +STR_MAPGEN_SEA_LEVEL :{BLACK}Havnivå: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Elver: STR_MAPGEN_SMOOTHNESS :{BLACK}Jevnhet: STR_MAPGEN_VARIETY :{BLACK}Variasjonsspredning: diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 1727ff8aac..dcaf0d5aa4 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2731,7 +2731,7 @@ STR_MAPGEN_DATE :{BLACK}Dato: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Antal industriar: STR_MAPGEN_LAND_GENERATOR :{BLACK}Landskapsgenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrengtype -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Havflate: +STR_MAPGEN_SEA_LEVEL :{BLACK}Havflate: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Elver: STR_MAPGEN_SMOOTHNESS :{BLACK}Glattleik: STR_MAPGEN_VARIETY :{BLACK}Variasjonsdistrubusjon: diff --git a/src/lang/persian.txt b/src/lang/persian.txt index e40ecad40e..897dcc6cc9 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -2526,7 +2526,7 @@ STR_MAPGEN_DATE :{BLACK}تاری STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}تعداد صنایع: STR_MAPGEN_LAND_GENERATOR :{BLACK}سازنده زمین: STR_MAPGEN_TERRAIN_TYPE :{BLACK}نوع پستی/بلندی: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}سطح دریا: +STR_MAPGEN_SEA_LEVEL :{BLACK}سطح دریا: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}رودخانه ها: STR_MAPGEN_SMOOTHNESS :{BLACK}همواری: STR_MAPGEN_VARIETY :{BLACK}توزیع انواع: diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 8fd236361f..031b425e57 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3513,7 +3513,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Zmniejsz STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generator terenu: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Typ terenu: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Poziom wody: +STR_MAPGEN_SEA_LEVEL :{BLACK}Poziom wody: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Liczba rzek: STR_MAPGEN_SMOOTHNESS :{BLACK}Gładkość: STR_MAPGEN_VARIETY :{BLACK}Różnorodność: diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index bf64c0192a..7a4fa9e3ec 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3134,7 +3134,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Diminuir STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Criação do terreno: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipo de terreno: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nível do mar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nível do mar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rios: STR_MAPGEN_SMOOTHNESS :{BLACK}Suavidade: STR_MAPGEN_VARIETY :{BLACK}Variedade da distribuição: diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index b96d6e9b3d..2d6364d1d8 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3129,7 +3129,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Reduce STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generator de teren: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tip teren: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nivelul mării: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nivelul mării: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Râuri: STR_MAPGEN_SMOOTHNESS :{BLACK}Netezime: STR_MAPGEN_VARIETY :{BLACK}Distribuţia varietăţii: diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 7d1b228d34..708fe8408c 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3308,7 +3308,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Умен STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Генератор ландшафта: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Тип ландшафта: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Количество морей и озёр: +STR_MAPGEN_SEA_LEVEL :{BLACK}Количество морей и озёр: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Количество рек: STR_MAPGEN_SMOOTHNESS :{BLACK}Грубость ландшафта: STR_MAPGEN_VARIETY :{BLACK}Разнообразие ландшафта: diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 626b93b9e3..865d1cc5a0 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3312,7 +3312,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Smanji p STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Oblikovanje reljefa: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Vrsta terena: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nivo mora: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nivo mora: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Broj reka: STR_MAPGEN_SMOOTHNESS :{BLACK}Postepenost: STR_MAPGEN_VARIETY :{BLACK}Raznolikost: diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 6dd8c10c3c..3c07b7264e 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3129,7 +3129,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}减少 1 STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}生成地形： STR_MAPGEN_TERRAIN_TYPE :{BLACK}地形特点： -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}海洋面积： +STR_MAPGEN_SEA_LEVEL :{BLACK}海洋面积： STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}河流数量: STR_MAPGEN_SMOOTHNESS :{BLACK}平滑度： STR_MAPGEN_VARIETY :{BLACK}多样的分发： diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 0cb959ca90..ca9ca1ada6 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3201,7 +3201,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Zníži STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generátor krajiny: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Typ terénu: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Rozloha mora: +STR_MAPGEN_SEA_LEVEL :{BLACK}Rozloha mora: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Rieky: STR_MAPGEN_SMOOTHNESS :{BLACK}Členitosť: STR_MAPGEN_VARIETY :{BLACK}Rozmanitosť distribúcie: diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 4b8b8dc216..36d33d3091 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2978,7 +2978,7 @@ STR_MAPGEN_DATE :{BLACK}Datum: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Število industrij: STR_MAPGEN_LAND_GENERATOR :{BLACK}Ustvarjalec terena: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tip terena: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Morska gladina: +STR_MAPGEN_SEA_LEVEL :{BLACK}Morska gladina: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Reke: STR_MAPGEN_SMOOTHNESS :{BLACK}Glajenje: STR_MAPGEN_VARIETY :{BLACK}Raznolika distribucija: diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 4a1191cb17..5279aec895 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3130,7 +3130,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Reducir STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generador terreno: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipo de terreno -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nivel del mar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nivel del mar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Ríos: STR_MAPGEN_SMOOTHNESS :{BLACK}Uniformidad: STR_MAPGEN_VARIETY :{BLACK}Variedad: diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 1d95433933..0baae6179b 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Disminui STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Generador de terreno: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Tipo de terreno: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Nivel del mar: +STR_MAPGEN_SEA_LEVEL :{BLACK}Nivel del mar: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Ríos: STR_MAPGEN_SMOOTHNESS :{BLACK}Suavidad: STR_MAPGEN_VARIETY :{BLACK}Variedad: diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 257aa64eeb..86eb366afd 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3129,7 +3129,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Minska STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Landgenerator: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrängtyp: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Havsnivå +STR_MAPGEN_SEA_LEVEL :{BLACK}Havsnivå STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Flod: STR_MAPGEN_SMOOTHNESS :{BLACK}Jämnhet: STR_MAPGEN_VARIETY :{BLACK}Varierad distribution: diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 19c087e71e..699706b113 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -2785,7 +2785,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}பா STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}பூமி உருவாக்குனர்: STR_MAPGEN_TERRAIN_TYPE :{BLACK}நிலவகை: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}கடல் மட்டம்: +STR_MAPGEN_SEA_LEVEL :{BLACK}கடல் மட்டம்: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}ஆறுகள்: STR_MAPGEN_SMOOTHNESS :{BLACK}சமநிலை: STR_MAPGEN_VARIETY :{BLACK}பலவகை பரவல்: diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 65700422ef..0f6be234bf 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -2914,7 +2914,7 @@ STR_MAPGEN_SNOW_COVERAGE_UP :{BLACK}เพ STR_MAPGEN_DESERT_COVERAGE :{BLACK}การปกคลุมของทะเลทราย: STR_MAPGEN_LAND_GENERATOR :{BLACK}เครื่องมือสร้างสภาพพื้นดิน: STR_MAPGEN_TERRAIN_TYPE :{BLACK}ประเภทภูมิประเทศ: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}ระดับทะเล: +STR_MAPGEN_SEA_LEVEL :{BLACK}ระดับทะเล: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}แม่น้ำ: STR_MAPGEN_SMOOTHNESS :{BLACK}ความเรียบ: STR_MAPGEN_VARIETY :{BLACK}การกระจายความแตกต่าง: diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 690accc5e0..f614fdc554 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3129,7 +3129,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}將沙 STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}地形產生器： STR_MAPGEN_TERRAIN_TYPE :{BLACK}地形種類： -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}海平面： +STR_MAPGEN_SEA_LEVEL :{BLACK}海平面： STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}河流: STR_MAPGEN_SMOOTHNESS :{BLACK}平滑度： STR_MAPGEN_VARIETY :{BLACK}地形起伏分佈： diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 3b3a4d129b..49d2ac4245 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3130,7 +3130,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Çöl ö STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}%{NUM} STR_MAPGEN_LAND_GENERATOR :{BLACK}Harita üretici: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Arazi türü: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Deniz seviyesi: +STR_MAPGEN_SEA_LEVEL :{BLACK}Deniz seviyesi: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Nehirler: STR_MAPGEN_SMOOTHNESS :{BLACK}Düzlük seviyesi: STR_MAPGEN_VARIETY :{BLACK}Çeşitlilik dağılımı: diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 423c451175..6d3a2507ce 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3253,7 +3253,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Змен STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Ландшафт: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Тип ландшафту: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Рівень моря: +STR_MAPGEN_SEA_LEVEL :{BLACK}Рівень моря: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Ріки: STR_MAPGEN_SMOOTHNESS :{BLACK}Гладкість: STR_MAPGEN_VARIETY :{BLACK}Розподіл різноманітності: diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index afd7889cb9..cead6a1203 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3133,7 +3133,7 @@ STR_MAPGEN_DESERT_COVERAGE_DOWN :{BLACK}Giảm STR_MAPGEN_DESERT_COVERAGE_TEXT :{BLACK}{NUM}% STR_MAPGEN_LAND_GENERATOR :{BLACK}Tạo nền đất: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Kiểu nền đất: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Mực nước biển: +STR_MAPGEN_SEA_LEVEL :{BLACK}Mực nước biển: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Số sông/suối: STR_MAPGEN_SMOOTHNESS :{BLACK}Độ phẳng phiu: STR_MAPGEN_VARIETY :{BLACK}Phân bổ sự đa dạng: diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 502df8b3e2..fa1c6c2f7e 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -2828,7 +2828,7 @@ STR_MAPGEN_DATE :{BLACK}Dyddiad: STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Nifer diwydiannau: STR_MAPGEN_LAND_GENERATOR :{BLACK}Cynhyrchydd Tir: STR_MAPGEN_TERRAIN_TYPE :{BLACK}Math Tirwedd: -STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Lefel y Môr: +STR_MAPGEN_SEA_LEVEL :{BLACK}Lefel y Môr: STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Afonydd: STR_MAPGEN_SMOOTHNESS :{BLACK}Llyfnder: STR_MAPGEN_VARIETY :{BLACK}Dosbarthiad amrywiaeth: From ede0560f9b0f40fa2d10dd74eff0dfc8f74accff Mon Sep 17 00:00:00 2001 From: Aaron Kofsky Date: Tue, 8 Nov 2022 13:21:52 -0500 Subject: [PATCH 09/10] Feature: Add buttons to toggle music in the Game Options menu (#9727) --- src/settings_gui.cpp | 13 ++++++++++++- src/widgets/settings_widget.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index cc1c3515b8..3d09739476 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -39,6 +39,7 @@ #include "rev.h" #include "video/video_driver.hpp" #include "music/music_driver.hpp" +#include "gui.h" #include #include @@ -487,6 +488,11 @@ struct GameOptionsWindow : Window { break; } + case WID_GO_BASE_MUSIC_JUKEBOX: { + ShowMusicWindow(); + break; + } + default: { int selected; DropDownList list = this->BuildDropDownList(widget, &selected); @@ -731,7 +737,12 @@ static const NWidgetPart _nested_game_options_widgets[] = { NWidget(WWT_TEXT, COLOUR_GREY, WID_GO_BASE_MUSIC_STATUS), SetMinimalSize(150, 12), SetDataTip(STR_EMPTY, STR_NULL), SetFill(1, 0), NWidget(WWT_EMPTY, COLOUR_GREY, WID_GO_BASE_MUSIC_VOLUME), SetMinimalSize(67, 12), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), EndContainer(), - NWidget(WWT_TEXT, COLOUR_GREY, WID_GO_BASE_MUSIC_DESCRIPTION), SetMinimalSize(330, 0), SetDataTip(STR_EMPTY, STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetPadding(6, 0, 6, 0), + NWidget(NWID_HORIZONTAL), SetPIP(0, 30, 7), + NWidget(WWT_TEXT, COLOUR_GREY, WID_GO_BASE_MUSIC_DESCRIPTION), SetMinimalSize(330, 0), SetDataTip(STR_EMPTY, STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetPadding(6, 0, 6, 0), + NWidget(NWID_VERTICAL), SetPIP(0, 0, 0), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_JUKEBOX), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_MUSIC, STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW), SetPadding(6, 0, 6, 0), + EndContainer(), + EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL), diff --git a/src/widgets/settings_widget.h b/src/widgets/settings_widget.h index 2a83ec657a..8caffece90 100644 --- a/src/widgets/settings_widget.h +++ b/src/widgets/settings_widget.h @@ -30,6 +30,7 @@ enum GameOptionsWidgets { WID_GO_BASE_SFX_DESCRIPTION = WID_GO_BASE_SFX_TEXTFILE + TFT_END, ///< Description of selected base SFX. WID_GO_BASE_MUSIC_DROPDOWN, ///< Use to select a base music set. WID_GO_BASE_MUSIC_VOLUME, ///< Change music volume. + WID_GO_BASE_MUSIC_JUKEBOX, ///< Open the jukebox. WID_GO_BASE_MUSIC_STATUS, ///< Info about corrupted files etc. WID_GO_BASE_MUSIC_TEXTFILE, ///< Open base music readme, changelog (+1) or license (+2). WID_GO_BASE_MUSIC_DESCRIPTION = WID_GO_BASE_MUSIC_TEXTFILE + TFT_END, ///< Description of selected base music set. From 019dcb7b7b010ce85260aa075f859d63fa020868 Mon Sep 17 00:00:00 2001 From: Didac Perez Parera Date: Tue, 8 Nov 2022 10:23:34 -0800 Subject: [PATCH 10/10] Change: Let AI developers edit non-editable AI/Game Script Parameters (#8895) --- src/ai/ai_gui.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 1168092f19..9ec0942fb8 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -592,7 +592,10 @@ struct AISettingsWindow : public Window { private: bool IsEditableItem(const ScriptConfigItem &config_item) const { - return _game_mode == GM_MENU || ((this->slot != OWNER_DEITY) && !Company::IsValidID(this->slot)) || (config_item.flags & SCRIPTCONFIG_INGAME) != 0; + return _game_mode == GM_MENU + || ((this->slot != OWNER_DEITY) && !Company::IsValidID(this->slot)) + || (config_item.flags & SCRIPTCONFIG_INGAME) != 0 + || _settings_client.gui.ai_developer_tools; } };