From 2dd2910ab3253385c257c412057743ada843dfae Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Sat, 21 Oct 2023 08:35:52 -0400 Subject: [PATCH 01/28] Feature: Cheat to fix station ratings at 100% (#11346) --- src/cheat_gui.cpp | 2 ++ src/cheat_type.h | 1 + src/lang/english.txt | 1 + src/saveload/cheat_sl.cpp | 2 ++ src/saveload/saveload.h | 2 ++ src/station_base.h | 3 ++- src/station_cmd.cpp | 6 +++++- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp index 8ac25550a4..88bed5e387 100644 --- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -163,6 +163,7 @@ enum CheatNumbers { CHT_CROSSINGTUNNELS, ///< Allow tunnels to cross each other. CHT_NO_JETCRASH, ///< Disable jet-airplane crashes. CHT_SETUP_PROD, ///< Allow manually editing of industry production. + CHT_STATION_RATING, ///< Fix station ratings at 100%. CHT_EDIT_MAX_HL, ///< Edit maximum allowed heightlevel CHT_CHANGE_DATE, ///< Do time traveling. @@ -196,6 +197,7 @@ static const CheatEntry _cheats_ui[] = { {SLE_BOOL, STR_CHEAT_CROSSINGTUNNELS, &_cheats.crossing_tunnels.value, &_cheats.crossing_tunnels.been_used, nullptr }, {SLE_BOOL, STR_CHEAT_NO_JETCRASH, &_cheats.no_jetcrash.value, &_cheats.no_jetcrash.been_used, nullptr }, {SLE_BOOL, STR_CHEAT_SETUP_PROD, &_cheats.setup_prod.value, &_cheats.setup_prod.been_used, &ClickSetProdCheat }, + {SLE_BOOL, STR_CHEAT_STATION_RATING, &_cheats.station_rating.value, &_cheats.station_rating.been_used, nullptr }, {SLE_UINT8, STR_CHEAT_EDIT_MAX_HL, &_settings_game.construction.map_height_limit, &_cheats.edit_max_hl.been_used, &ClickChangeMaxHlCheat }, {SLE_INT32, STR_CHEAT_CHANGE_DATE, &TimerGameCalendar::year, &_cheats.change_date.been_used, &ClickChangeDateCheat }, }; diff --git a/src/cheat_type.h b/src/cheat_type.h index 8ca032c860..8c5dc981b1 100644 --- a/src/cheat_type.h +++ b/src/cheat_type.h @@ -32,6 +32,7 @@ struct Cheats { Cheat change_date; ///< changes date ingame Cheat setup_prod; ///< setup raw-material production in game Cheat edit_max_hl; ///< edit the maximum heightlevel; this is a cheat because of the fact that it needs to reset NewGRF game state and doing so as a simple configuration breaks the expectation of many + Cheat station_rating; ///< Fix station ratings at 100% }; extern Cheats _cheats; diff --git a/src/lang/english.txt b/src/lang/english.txt index 7933975ccb..a8ed981464 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2194,6 +2194,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Edit the STR_CHEAT_CHANGE_DATE :{LTBLUE}Change date: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Change current year STR_CHEAT_SETUP_PROD :{LTBLUE}Enable modifying production values: {ORANGE}{STRING1} +STR_CHEAT_STATION_RATING :{LTBLUE}Fix station ratings at 100%: {ORANGE}{STRING1} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Colour Scheme diff --git a/src/saveload/cheat_sl.cpp b/src/saveload/cheat_sl.cpp index 939a734aaf..ef1d43c9cd 100644 --- a/src/saveload/cheat_sl.cpp +++ b/src/saveload/cheat_sl.cpp @@ -33,6 +33,8 @@ static const SaveLoad _cheats_desc[] = { SLE_VAR(Cheats, setup_prod.value, SLE_BOOL), SLE_VAR(Cheats, edit_max_hl.been_used, SLE_BOOL), SLE_VAR(Cheats, edit_max_hl.value, SLE_BOOL), + SLE_CONDVAR(Cheats, station_rating.been_used, SLE_BOOL, SLV_STATION_RATING_CHEAT, SL_MAX_VERSION), + SLE_CONDVAR(Cheats, station_rating.value, SLE_BOOL, SLV_STATION_RATING_CHEAT, SL_MAX_VERSION), }; diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 3e4953a061..bde63020eb 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -362,6 +362,8 @@ enum SaveLoadVersion : uint16_t { SLV_REMOVE_LOADED_AT_XY, ///< 318 PR#11276 Remove loaded_at_xy variable from CargoPacket. SLV_CARGO_TRAVELLED, ///< 319 PR#11283 CargoPacket now tracks how far it travelled inside a vehicle. + SLV_STATION_RATING_CHEAT, ///< 320 PR#11346 Add cheat to fix station ratings at 100%. + SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/station_base.h b/src/station_base.h index 2426694b39..86b43fbf14 100644 --- a/src/station_base.h +++ b/src/station_base.h @@ -19,7 +19,8 @@ #include "newgrf_storage.h" #include "bitmap_type.h" -static const byte INITIAL_STATION_RATING = 175; +static const uint8_t INITIAL_STATION_RATING = 175; +static const uint8_t MAX_STATION_RATING = 255; /** * Flow statistics telling how much flow should be sent along a link. This is diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 59a6df468a..bb4faef811 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -64,6 +64,7 @@ #include "timer/timer.h" #include "timer/timer_game_calendar.h" #include "timer/timer_game_tick.h" +#include "cheat_type.h" #include "table/strings.h" @@ -3650,7 +3651,10 @@ static void UpdateStationRating(Station *st) */ uint waiting_avg = waiting / (num_dests + 1); - if (HasBit(cs->callback_mask, CBM_CARGO_STATION_RATING_CALC)) { + if (_cheats.station_rating.value) { + ge->rating = rating = MAX_STATION_RATING; + skip = true; + } else if (HasBit(cs->callback_mask, CBM_CARGO_STATION_RATING_CALC)) { /* Perform custom station rating. If it succeeds the speed, days in transit and * waiting cargo ratings must not be executed. */ From 81ecbaaa33ab2737de09e79afd26e100031f483e Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 19 Oct 2023 15:24:47 +0100 Subject: [PATCH 02/28] Codechange: Hide multiplayer headers by setting width to zero. Zero-width is how widgets are hidden elsewhere. This removes the need for an extra array to lookup if a header is hidden. --- src/network/network_gui.cpp | 61 +++++++++--------------------------- src/widgets/network_widget.h | 1 - 2 files changed, 14 insertions(+), 48 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 6ca3f7ef0f..58e05b75e3 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -86,7 +86,6 @@ static const ServerListPosition SLP_INVALID = -1; /** Full blown container to make it behave exactly as we want :) */ class NWidgetServerListHeader : public NWidgetContainer { static const uint MINIMUM_NAME_WIDTH_BEFORE_NEW_HEADER = 150; ///< Minimum width before adding a new header - bool visible[6]; ///< The visible headers public: NWidgetServerListHeader() : NWidgetContainer(NWID_HORIZONTAL) { @@ -105,17 +104,10 @@ public: + GetSpriteSize(SPR_BLOT, nullptr, ZOOM_LVL_OUT_4X).width, 12); leaf->SetFill(0, 1); this->Add(leaf); - - /* First and last are always visible, the rest is implicitly zeroed */ - this->visible[0] = true; - *lastof(this->visible) = true; } void SetupSmallestSize(Window *w, bool init_array) override { - /* Oh yeah, we ought to be findable! */ - w->nested_array[WID_NG_HEADER] = this; - this->smallest_y = 0; // Biggest child. this->fill_x = 1; this->fill_y = 0; @@ -147,16 +139,14 @@ public: this->current_y = given_height; given_width -= this->tail->smallest_x; - NWidgetBase *child_wid = this->head->next; /* The first and last widget are always visible, determine which other should be visible */ - for (uint i = 1; i < lengthof(this->visible) - 1; i++) { - if (given_width > ScaleGUITrad(MINIMUM_NAME_WIDTH_BEFORE_NEW_HEADER) + child_wid->smallest_x && this->visible[i - 1]) { - this->visible[i] = true; + for (NWidgetBase *child_wid = this->head->next; child_wid->next != nullptr; child_wid = child_wid->next) { + if (given_width > ScaleGUITrad(MINIMUM_NAME_WIDTH_BEFORE_NEW_HEADER) + child_wid->smallest_x && child_wid->prev->current_x != 0) { given_width -= child_wid->smallest_x; + child_wid->current_x = child_wid->smallest_x; /* Make visible. */ } else { - this->visible[i] = false; + child_wid->current_x = 0; /* Make invisible. */ } - child_wid = child_wid->next; } /* All remaining space goes to the first (name) widget */ @@ -164,25 +154,17 @@ public: /* Now assign the widgets to their rightful place */ uint position = 0; // Place to put next child relative to origin of the container. - uint i = rtl ? lengthof(this->visible) - 1 : 0; - child_wid = rtl ? this->tail : this->head; - while (child_wid != nullptr) { - if (this->visible[i]) { + for (NWidgetBase *child_wid = rtl ? this->tail : this->head; child_wid != nullptr; child_wid = rtl ? child_wid->prev : child_wid->next) { + if (child_wid->current_x != 0) { child_wid->AssignSizePosition(sizing, x + position, y, child_wid->current_x, this->current_y, rtl); position += child_wid->current_x; } - - child_wid = rtl ? child_wid->prev : child_wid->next; - i += rtl ? -1 : 1; } } void Draw(const Window *w) override { - int i = 0; for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - if (!this->visible[i++]) continue; - child_wid->Draw(w); } } @@ -191,25 +173,12 @@ public: { if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; - int i = 0; for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - if (!this->visible[i++]) continue; NWidgetCore *nwid = child_wid->GetWidgetFromPos(x, y); if (nwid != nullptr) return nwid; } return nullptr; } - - /** - * Checks whether the given widget is actually visible. - * @param widget the widget to check for visibility - * @return true iff the widget is visible. - */ - bool IsWidgetVisible(NetworkGameWidgets widget) const - { - assert((uint)(widget - WID_NG_NAME) < lengthof(this->visible)); - return this->visible[widget - WID_NG_NAME]; - } }; class NetworkGameWindow : public Window { @@ -410,10 +379,8 @@ protected: /* only draw details if the server is online */ if (cur_item->status == NGLS_ONLINE) { - const NWidgetServerListHeader *nwi_header = this->GetWidget(WID_NG_HEADER); - - if (nwi_header->IsWidgetVisible(WID_NG_CLIENTS)) { - Rect clients = this->GetWidget(WID_NG_CLIENTS)->GetCurrentRect(); + if (const NWidgetBase *nwid = this->GetWidget(WID_NG_CLIENTS); nwid->current_x != 0) { + Rect clients = nwid->GetCurrentRect(); SetDParam(0, cur_item->info.clients_on); SetDParam(1, cur_item->info.clients_max); SetDParam(2, cur_item->info.companies_on); @@ -421,26 +388,26 @@ protected: DrawString(clients.left, clients.right, y + text_y_offset, STR_NETWORK_SERVER_LIST_GENERAL_ONLINE, TC_FROMSTRING, SA_HOR_CENTER); } - if (nwi_header->IsWidgetVisible(WID_NG_MAPSIZE)) { + if (const NWidgetBase *nwid = this->GetWidget(WID_NG_MAPSIZE); nwid->current_x != 0) { /* map size */ - Rect mapsize = this->GetWidget(WID_NG_MAPSIZE)->GetCurrentRect(); + Rect mapsize = nwid->GetCurrentRect(); SetDParam(0, cur_item->info.map_width); SetDParam(1, cur_item->info.map_height); DrawString(mapsize.left, mapsize.right, y + text_y_offset, STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT, TC_FROMSTRING, SA_HOR_CENTER); } - if (nwi_header->IsWidgetVisible(WID_NG_DATE)) { + if (const NWidgetBase *nwid = this->GetWidget(WID_NG_DATE); nwid->current_x != 0) { /* current date */ - Rect date = this->GetWidget(WID_NG_DATE)->GetCurrentRect(); + Rect date = nwid->GetCurrentRect(); TimerGameCalendar::YearMonthDay ymd; TimerGameCalendar::ConvertDateToYMD(cur_item->info.game_date, &ymd); SetDParam(0, ymd.year); DrawString(date.left, date.right, y + text_y_offset, STR_JUST_INT, TC_BLACK, SA_HOR_CENTER); } - if (nwi_header->IsWidgetVisible(WID_NG_YEARS)) { + if (const NWidgetBase *nwid = this->GetWidget(WID_NG_YEARS); nwid->current_x != 0) { /* number of years the game is running */ - Rect years = this->GetWidget(WID_NG_YEARS)->GetCurrentRect(); + Rect years = nwid->GetCurrentRect(); TimerGameCalendar::YearMonthDay ymd_cur, ymd_start; TimerGameCalendar::ConvertDateToYMD(cur_item->info.game_date, &ymd_cur); TimerGameCalendar::ConvertDateToYMD(cur_item->info.start_date, &ymd_start); diff --git a/src/widgets/network_widget.h b/src/widgets/network_widget.h index 8bfc3818f5..766d72e473 100644 --- a/src/widgets/network_widget.h +++ b/src/widgets/network_widget.h @@ -19,7 +19,6 @@ enum NetworkGameWidgets { WID_NG_FILTER_LABEL, ///< Label in front of the filter/search edit box. WID_NG_FILTER, ///< Panel with the edit box to enter the search text. - WID_NG_HEADER, ///< Header container of the matrix. WID_NG_NAME, ///< 'Name' button. WID_NG_CLIENTS, ///< 'Clients' button. WID_NG_MAPSIZE, ///< 'Map size' button. From af41c5cb4edf51e7b2a8086cd7ebe9bfac1fe0cb Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 19 Oct 2023 19:50:43 +0100 Subject: [PATCH 03/28] Codechange: Hide toolbar buttons by setting width to zero. Zero-width is how widgets are hidden elsewhere. This removes the need for an extra array to lookup if a button is hidden. --- src/toolbar_gui.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 70a6ed2d21..17020c435b 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1358,7 +1358,6 @@ static MenuClickedProc * const _menu_clicked_procs[] = { /** Full blown container to make it behave exactly as we want :) */ class NWidgetToolbarContainer : public NWidgetContainer { - bool visible[WID_TN_END]; ///< The visible headers protected: uint spacers; ///< Number of spacer widgets in this toolbar @@ -1420,16 +1419,13 @@ public: this->current_y = given_height; /* Figure out what are the visible buttons */ - memset(this->visible, 0, sizeof(this->visible)); uint arrangable_count, button_count, spacer_count; const byte *arrangement = GetButtonArrangement(given_width, arrangable_count, button_count, spacer_count); - for (uint i = 0; i < arrangable_count; i++) { - this->visible[arrangement[i]] = true; - } /* Create us ourselves a quick lookup table */ NWidgetBase *widgets[WID_TN_END]; for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { + child_wid->current_x = 0; /* Hide widget, it will be revealed in the next step. */ if (child_wid->type == NWID_SPACER) continue; widgets[((NWidgetCore*)child_wid)->index] = child_wid; } @@ -1461,6 +1457,8 @@ public: child_wid->current_x = button_space / (button_count - button_i); button_space -= child_wid->current_x; button_i++; + } else { + child_wid->current_x = child_wid->smallest_x; } child_wid->AssignSizePosition(sizing, x + position, y, child_wid->current_x, this->current_y, rtl); position += child_wid->current_x; @@ -1481,9 +1479,6 @@ public: bool rtl = _current_text_dir == TD_RTL; for (NWidgetBase *child_wid = rtl ? this->tail : this->head; child_wid != nullptr; child_wid = rtl ? child_wid->prev : child_wid->next) { - if (child_wid->type == NWID_SPACER) continue; - if (!this->visible[((NWidgetCore*)child_wid)->index]) continue; - child_wid->Draw(w); } } @@ -1493,9 +1488,6 @@ public: if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - if (child_wid->type == NWID_SPACER) continue; - if (!this->visible[((NWidgetCore*)child_wid)->index]) continue; - NWidgetCore *nwid = child_wid->GetWidgetFromPos(x, y); if (nwid != nullptr) return nwid; } From 59a2abd29872f8f87b9c7c6305285b231a0ad407 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 19 Oct 2023 19:58:43 +0100 Subject: [PATCH 04/28] Codechange: Use unified NWidgetContainer methods instead of duplicating. Most NWidgetContainer derivatives implemented Draw() and GetWidgetFromPos() the same way. Move this these to NWidgetContainer itself to avoid repeating. --- src/network/network_gui.cpp | 18 ------------------ src/smallmap_gui.cpp | 15 --------------- src/toolbar_gui.cpp | 16 +--------------- src/widget.cpp | 36 ++++++++++++++++++------------------ src/widget_type.h | 6 +++--- 5 files changed, 22 insertions(+), 69 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 58e05b75e3..fcfef1e93e 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -161,24 +161,6 @@ public: } } } - - void Draw(const Window *w) override - { - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - child_wid->Draw(w); - } - } - - NWidgetCore *GetWidgetFromPos(int x, int y) override - { - if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; - - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - NWidgetCore *nwid = child_wid->GetWidgetFromPos(x, y); - if (nwid != nullptr) return nwid; - } - return nullptr; - } }; class NetworkGameWindow : public Window { diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 9ce1a8a339..83ac2b5e08 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1763,21 +1763,6 @@ public: display->AssignSizePosition(ST_RESIZE, x, y, given_width, display_height, rtl); bar->AssignSizePosition(ST_RESIZE, x, y + display_height, given_width, bar_height, rtl); } - - NWidgetCore *GetWidgetFromPos(int x, int y) override - { - if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - NWidgetCore *widget = child_wid->GetWidgetFromPos(x, y); - if (widget != nullptr) return widget; - } - return nullptr; - } - - void Draw(const Window *w) override - { - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) child_wid->Draw(w); - } }; /** Widget parts of the smallmap display. */ diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 17020c435b..9976c894f1 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1477,21 +1477,7 @@ public: GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, PC_VERY_DARK_RED); GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, PC_DARK_RED, FILLRECT_CHECKER); - bool rtl = _current_text_dir == TD_RTL; - for (NWidgetBase *child_wid = rtl ? this->tail : this->head; child_wid != nullptr; child_wid = rtl ? child_wid->prev : child_wid->next) { - child_wid->Draw(w); - } - } - - NWidgetCore *GetWidgetFromPos(int x, int y) override - { - if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; - - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - NWidgetCore *nwid = child_wid->GetWidgetFromPos(x, y); - if (nwid != nullptr) return nwid; - } - return nullptr; + this->NWidgetContainer::Draw(w); } /** diff --git a/src/widget.cpp b/src/widget.cpp index a6a68ea919..3d8ad479e1 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1303,6 +1303,24 @@ void NWidgetContainer::FillNestedArray(NWidgetBase **array, uint length) } } +void NWidgetContainer::Draw(const Window *w) +{ + for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { + child_wid->Draw(w); + } +} + +NWidgetCore *NWidgetContainer::GetWidgetFromPos(int x, int y) +{ + if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; + + for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { + NWidgetCore *nwid = child_wid->GetWidgetFromPos(x, y); + if (nwid != nullptr) return nwid; + } + return nullptr; +} + /** * Widgets stacked on top of each other. */ @@ -1465,24 +1483,6 @@ void NWidgetPIPContainer::SetPIP(uint8_t pip_pre, uint8_t pip_inter, uint8_t pip this->pip_post = ScaleGUITrad(this->uz_pip_post); } -void NWidgetPIPContainer::Draw(const Window *w) -{ - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - child_wid->Draw(w); - } -} - -NWidgetCore *NWidgetPIPContainer::GetWidgetFromPos(int x, int y) -{ - if (!IsInsideBS(x, this->pos_x, this->current_x) || !IsInsideBS(y, this->pos_y, this->current_y)) return nullptr; - - for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { - NWidgetCore *nwid = child_wid->GetWidgetFromPos(x, y); - if (nwid != nullptr) return nwid; - } - return nullptr; -} - /** Horizontal container widget. */ NWidgetHorizontal::NWidgetHorizontal(NWidContainerFlags flags) : NWidgetPIPContainer(NWID_HORIZONTAL, flags) { diff --git a/src/widget_type.h b/src/widget_type.h index 9191d1cfa6..ae71ca11e6 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -412,6 +412,9 @@ public: void Add(NWidgetBase *wid); void FillNestedArray(NWidgetBase **array, uint length) override; + void Draw(const Window *w) override; + NWidgetCore *GetWidgetFromPos(int x, int y) override; + /** Return whether the container is empty. */ inline bool IsEmpty() { return head == nullptr; } @@ -480,9 +483,6 @@ public: void AdjustPaddingForZoom() override; void SetPIP(uint8_t pip_pre, uint8_t pip_inter, uint8_t pip_post); - void Draw(const Window *w) override; - NWidgetCore *GetWidgetFromPos(int x, int y) override; - protected: NWidContainerFlags flags; ///< Flags of the container. uint8_t pip_pre; ///< Amount of space before first widget. From ac42dea7b254ce7632e3879f6fcfd148f83ac528 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 19 Sep 2023 00:47:47 +0200 Subject: [PATCH 05/28] Codechange: Remove unused parameter for Height() DropDownListItem::Height does not need to take an argument so remove it Signed-off-by: Bernhard Reutner-Fischer --- src/company_gui.cpp | 2 +- src/settings_gui.cpp | 2 +- src/toolbar_gui.cpp | 2 +- src/widgets/dropdown.cpp | 11 +++++------ src/widgets/dropdown_type.h | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 8a2d85cbf5..b36d099b27 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -597,7 +597,7 @@ public: return ScaleGUITrad(28) + WidgetDimensions::scaled.hsep_normal + GetStringBoundingBox(this->String()).width + WidgetDimensions::scaled.dropdowntext.Horizontal(); } - uint Height(uint) const override + uint Height() const override { return std::max(FONT_HEIGHT_NORMAL, ScaleGUITrad(12) + WidgetDimensions::scaled.vsep_normal); } diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 5876b1979c..847d75ac47 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -475,7 +475,7 @@ struct GameOptionsWindow : Window { Dimension string_dim; int width = ddli->Width(); string_dim.width = width + padding.width; - string_dim.height = ddli->Height(width) + padding.height; + string_dim.height = ddli->Height() + padding.height; *size = maxdim(*size, string_dim); } } diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 9976c894f1..23d2c73929 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -147,7 +147,7 @@ public: return GetStringBoundingBox(STR_COMPANY_NAME_COMPANY_NUM).width + this->icon_size.width + this->lock_size.width + WidgetDimensions::scaled.dropdowntext.Horizontal() + WidgetDimensions::scaled.hsep_wide; } - uint Height(uint) const override + uint Height() const override { return std::max(std::max(this->icon_size.height, this->lock_size.height) + WidgetDimensions::scaled.imgbtn.Vertical(), (uint)FONT_HEIGHT_NORMAL); } diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 665d8ebe07..43be78dbec 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -67,7 +67,7 @@ DropDownListIconItem::DropDownListIconItem(SpriteID sprite, PaletteID pal, Strin this->sprite_y = dim.height; } -uint DropDownListIconItem::Height(uint) const +uint DropDownListIconItem::Height() const { return std::max(this->dim.height, (uint)FONT_HEIGHT_NORMAL); } @@ -158,7 +158,7 @@ struct DropdownWindow : Window { /* Total length of list */ int list_height = 0; for (const auto &item : this->list) { - list_height += item->Height(items_width); + list_height += item->Height(); } /* Capacity is the average number of items visible */ @@ -213,14 +213,13 @@ struct DropdownWindow : Window { const Rect &r = this->GetWidget(WID_DM_ITEMS)->GetCurrentRect().Shrink(WidgetDimensions::scaled.fullbevel); int y = _cursor.pos.y - this->top - r.top - WidgetDimensions::scaled.fullbevel.top; - int width = r.Width(); int pos = this->vscroll->GetPosition(); for (const auto &item : this->list) { /* Skip items that are scrolled up */ if (--pos >= 0) continue; - int item_height = item->Height(width); + int item_height = item->Height(); if (y < item_height) { if (item->masked || !item->Selectable()) return false; @@ -244,7 +243,7 @@ struct DropdownWindow : Window { int y = ir.top; int pos = this->vscroll->GetPosition(); for (const auto &item : this->list) { - int item_height = item->Height(ir.Width()); + int item_height = item->Height(); /* Skip items that are scrolled up */ if (--pos >= 0) continue; @@ -353,7 +352,7 @@ void ShowDropDownListAt(Window *w, DropDownList &&list, int selected, int button uint height = 0; for (const auto &item : list) { - height += item->Height(width); + height += item->Height(); max_item_width = std::max(max_item_width, item->Width()); } diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 9f3cc11bb2..19da6acfcd 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -27,7 +27,7 @@ public: virtual ~DropDownListItem() = default; virtual bool Selectable() const { return false; } - virtual uint Height([[maybe_unused]] uint) const { return FONT_HEIGHT_NORMAL; } + virtual uint Height() const { return FONT_HEIGHT_NORMAL; } virtual uint Width() const { return 0; } virtual void Draw(const Rect &r, bool sel, Colours bg_colour) const; }; @@ -61,7 +61,7 @@ class DropDownListIconItem : public DropDownListStringItem { public: DropDownListIconItem(SpriteID sprite, PaletteID pal, StringID string, int result, bool masked); - uint Height(uint width) const override; + uint Height() const override; uint Width() const override; void Draw(const Rect &r, bool sel, Colours bg_colour) const override; void SetDimension(Dimension d); From f32058e4e5fc5dab1792e174c182ae010d1a9baa Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 21 Oct 2023 18:37:29 +0000 Subject: [PATCH 06/28] Update: Translations from eints --- src/lang/afrikaans.txt | 4 ---- src/lang/arabic_egypt.txt | 4 ---- src/lang/basque.txt | 4 ---- src/lang/belarusian.txt | 4 ---- src/lang/brazilian_portuguese.txt | 4 ---- src/lang/bulgarian.txt | 4 ---- src/lang/catalan.txt | 4 ---- src/lang/croatian.txt | 4 ---- src/lang/czech.txt | 4 ---- src/lang/danish.txt | 4 ---- src/lang/dutch.txt | 4 ---- src/lang/english_AU.txt | 4 ---- src/lang/english_US.txt | 4 ---- src/lang/esperanto.txt | 4 ---- src/lang/estonian.txt | 4 ---- src/lang/faroese.txt | 4 ---- src/lang/finnish.txt | 4 ---- src/lang/french.txt | 4 ---- src/lang/frisian.txt | 4 ---- src/lang/gaelic.txt | 4 ---- src/lang/galician.txt | 4 ---- src/lang/german.txt | 4 ---- src/lang/greek.txt | 4 ---- src/lang/hebrew.txt | 4 ---- src/lang/hungarian.txt | 4 ---- src/lang/icelandic.txt | 4 ---- src/lang/indonesian.txt | 4 ---- src/lang/irish.txt | 4 ---- src/lang/italian.txt | 4 ---- src/lang/japanese.txt | 4 ---- src/lang/korean.txt | 4 ---- src/lang/latin.txt | 4 ---- src/lang/latvian.txt | 4 ---- src/lang/lithuanian.txt | 4 ---- src/lang/luxembourgish.txt | 4 ---- src/lang/malay.txt | 4 ---- src/lang/norwegian_bokmal.txt | 4 ---- src/lang/norwegian_nynorsk.txt | 4 ---- src/lang/persian.txt | 4 ---- src/lang/polish.txt | 4 ---- src/lang/portuguese.txt | 4 ---- src/lang/romanian.txt | 4 ---- src/lang/russian.txt | 4 ---- src/lang/serbian.txt | 4 ---- src/lang/simplified_chinese.txt | 4 ---- src/lang/slovak.txt | 4 ---- src/lang/slovenian.txt | 4 ---- src/lang/spanish.txt | 4 ---- src/lang/spanish_MX.txt | 4 ---- src/lang/swedish.txt | 4 ---- src/lang/tamil.txt | 4 ---- src/lang/thai.txt | 4 ---- src/lang/traditional_chinese.txt | 4 ---- src/lang/turkish.txt | 4 ---- src/lang/ukrainian.txt | 4 ---- src/lang/urdu.txt | 4 ---- src/lang/vietnamese.txt | 4 ---- src/lang/welsh.txt | 4 ---- 58 files changed, 232 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 9b8b0df3a0..b4326b3c01 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -882,10 +882,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuwe {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Maak die groepvenster oop en fokus op die voertuiggroep -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} aanvaar nie meer {STRING} nie -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} aanvaar nie meer {STRING} of {STRING} nie -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} aanvaar nou {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} aanvaar nou {STRING} en {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsidie-aanbod het verval:{}{}{STRING} van {STRING} tot {STRING} sal nou nie 'n subsidie aantrek nie. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidie onttrek:{}{}{STRING} diens van {STRING} tot {STRING} is nie meer gesubsideieer nie. diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 74c2a1855b..a6cefea289 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -872,10 +872,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}جديد {STRING} الآن متاح ! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} لم تعد تقبل {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION}لم تعد تقبل {STRING} او {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} الآن تقبل {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION}الآن تقبل {STRING} و {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK} اعلان عن انتهاء عرض{}{} نقل {STRING} من {STRING} الى {STRING} لن يعطي ارباح اضافية بعد الآن . STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK} تم سحب العرض{}{} نقل {STRING} من {STRING} الى {STRING} لم يعد معروض diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 3ff33f8c38..4d4e700f28 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -858,10 +858,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} berri bat orain erabilgarri! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ez du gehiago {STRING} onartzen -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ez du gehiago {STRING} edo {STRING} onartzen -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} orain {STRING} onartzen du -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION}{STRING} eta {STRING} orain onartzen ditu STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsidio eskaintza agortu egin da:{}{}{STRING} {STRING}tik {STRING}ra doanarentzat ez dago subsidiorik orain. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidioa kenduta:{}{}{STRING} Ez dago subsidiorik {STRING}(e)tik {STRING}(e)ra garraiatzeagatik. diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 72f79a995c..2c0e135195 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -1191,10 +1191,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}З'яв STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Адчыніць акно групаў транспарта і абраць групу, да якой прыналежыць гэты транспартны сродак -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} больш не прымае {STRING.acc} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} больш не прымае {STRING.acc} ды {STRING.acc} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} цяпер прымае {STRING.acc} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} цяпер прымае {STRING.acc} ды {STRING.acc} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Прапанова субсыдыі мінула:{}{}Перавозка {STRING.gen} па маршруце {STRING} — {STRING} субсыдыявацца больш ня будзе. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Тэрмін субсыдыі сышоў:{}{}Перавозка {STRING.gen} па маршруце {STRING} — {STRING} больш не субсыдуецца. diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 4d9ee20d7f..edcac91262 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -925,10 +925,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G o STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abrir a janela do grupo focado no grupo do veículo -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} não aceita mais {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} não aceita mais {STRING} ou {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} agora aceita {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} agora aceita {STRING} e {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}A oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} agora não irá atrair um subsídio STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsídio removido:{}{} Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 2e0c77af0b..5e7613290d 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -864,10 +864,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Нов {STRING} е на разположение! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} вече не приема {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} вече не приема {STRING} или {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} вече приема {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} вече приема {STRING} и {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Предложението за субсидия изтече:{}{}Превозът на {STRING} от {STRING} до {STRING} повече няма да получава субсидия. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Анулирана субсидия:{}{}Превозът на {STRING} от {STRING} до {STRING} вече не се субсидира. diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 9f0dd98122..5c5cc88bd9 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -925,10 +925,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}No{G u v STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Obre la finestra del grup amb el focus en el vehicle. -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ja no accepta més {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ja no accepta més {STRING} ni {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} ara accepta {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} ara accepta {STRING} i {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta de subvenció caducada:{}{}El transport de {STRING} des de {STRING} fins a {STRING} no tindrà subvenció STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvenció retirada:{}{}El transport de {STRING} des de {STRING} fins a {STRING} ja no està subvencionat diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 12d46ffc16..af8aa8195a 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -981,10 +981,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novi {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otvori prozor grupe fokusiran na grupu odabranog vozila -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} više ne prihvaća {STRING.aku} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} više ne prihvaća {STRING.aku} ili {STRING.aku} -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 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 diff --git a/src/lang/czech.txt b/src/lang/czech.txt index afe43d495c..8e58c745a5 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -992,10 +992,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G ý STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otevřít okno skupin s předvybranou skupinou daného vozidla -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} už dále nepřijímá {STRING.acc} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} už dále nepřijímá {STRING.acc} ani {STRING.acc} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} nyní přijímá {STRING.acc} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} nyní přijímá {STRING.acc} a {STRING.acc} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} nebude dále nabízena STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z{NBSP}{STRING.gen} do {STRING.gen} již nebude dále poskytována diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 591476210e..fde0f61348 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRI STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Åbn gruppevinduet med fokus på dette fartøjs gruppe -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} accepterer ikke længere {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} accepterer ikke længere {STRING} eller {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} accepterer nu {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} accepterer nu {STRING} og {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Licitation af tilskudsordning udløbet:{}{}{STRING} fra {STRING} til {STRING} vil ikke længere udløse tilskud. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Tilskudsordning tilbagetrukket:{}{}{STRING} fra {STRING} til {STRING} modtager ikke længere tilskud. diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 1fd74d2418..b5277d81c6 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nieuw {S STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Groepsvenster openen met focus op groep van voertuig -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} accepteert geen {STRING} meer -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} accepteert geen {STRING} of {STRING} meer -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} accepteert voortaan {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} accepteert voortaan {STRING} en {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidie ingetrokken:{}{}{STRING}route van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 20523e2f27..7613f92384 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Open the group window focused on the vehicle's group -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} no longer accepts {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} no longer accepts {STRING} or {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} now accepts {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} now accepts {STRING} and {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidy withdrawn:{}{}{STRING} service from {STRING} to {STRING} is no longer subsidised diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 30e7eefbd6..eec8c4b1d9 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Open the group window focused on the vehicle's group -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} no longer accepts {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} no longer accepts {STRING} or {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} now accepts {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} now accepts {STRING} and {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidy withdrawn:{}{}{STRING} service from {STRING} to {STRING} is no longer subsidized diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 0e83240e87..ae5ffd4564 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -982,10 +982,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nova {STRING} nun haveblas! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ne plu akceptas {STRING.n} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ne plu akceptas {STRING.n} aŭ {STRING.n} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} nun akceptas {STRING.n} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} nun akceptas {STRING.n} kaj {STRING.n} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subvencia oferto ne plu validas:{}{}Transportado de {STRING} de {STRING} al {STRING} ne estos subvenciata. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvencio retiriĝis:{}{}Servo de {STRING} de {STRING} al {STRING} ne plu estas subvenciata. diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 167ba7bf9d..764c40eaa5 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -962,10 +962,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uus {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Ava sõiduki jaole fokuseeritud jaoaken -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Jaam {STATION} ei võta enam vastu veost {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Jaam {STATION} ei võta enam vastu veoseid {STRING}, ega {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}Jaam {STATION} võtab nüüd vastu veost {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Jaam {STATION} võtab nüüd vastu veoseid {STRING} ja {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Toetuse pakkumine lõppes:{}{}{STRING.g} kohast {STRING} kohta {STRING} veoste eest ei maksta enam toetusi STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Toetuse maksmise aeg sai läbi:{}{}{STRING}kohast {STRING} kohta {STRING} eest ei maksta enam edaspidi toetust diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index e1d125f5e4..36ae981bd5 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -838,10 +838,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nýtt {STRING} til sølu! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} tekur ikki longur ímóti {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} tekur ikki longur ímóti hvørki {STRING} ella {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} tekur nú ímóti {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} tekur nú ímóti bæði {STRING} og {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Tilboð um stuðul útgingi:{}{}{STRING} frá {STRING} til {STRING} fær nú ongan stuðul STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Stuðul tikin aftur:{}{}{STRING} flutningur frá {STRING} til {STRING} er ikki stuðla longur diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 558d9b7c29..946e3f5e02 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uusi {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Avaa ryhmäikkuna kulkuneuvon ryhmään kohdistettuna -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ei ota enää vastaan {STRING}. -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ei ota enää vastaan {STRING} tai {STRING}. -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} ottaa nyt vastaan {STRING}. -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} ottaa nyt vastaan {STRING} ja {STRING}. STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Tukitarjous päättynyt:{}{}{STRING} välillä {STRING} – {STRING} ei enää tulla tukemaan STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Tuki vedetty pois:{}{}{STRING} välillä {STRING}-{STRING} ei enää tueta diff --git a/src/lang/french.txt b/src/lang/french.txt index a7f79e1ef1..662bb042ec 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -925,10 +925,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nouv{G 0 STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Ouvrir la fenêtre de groupe de ce véhicule -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} n'accepte plus {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} n'accepte plus {STRING} ou {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} accepte désormais {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} accepte désormais {STRING} et {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offre de subvention expirée{NBSP}:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est désormais plus subventionné STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Abandon de la subvention{NBSP}:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est plus subventionné diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 43fe6879c6..01e4102390 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -870,10 +870,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Neie {STRING} is no beskikber! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} akseptearret gjin {STRING} mear -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} akseptearret gjin {STRING} en {STRING} mear -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} akseptearrret no {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} akseptearret no {STRING} en {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsydzje oanbieding ferrûn:{}{}{STRING} fan {STRING} nei {STRING} sil no net in subsydzje krije. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsydzje ôfrûn:{}{}{STRING} tsjinst fan {STRING} nei {STRING} krijt gjin subsydzje mear. diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 860d1d4492..75675ec84d 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -1071,10 +1071,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Tha {STRING} ùr ri fhaighinn a-nis! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Cha ghabh {STATION} ri {STRING} tuilleadh -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Cha ghabh {STATION} ri {STRING} no {STRING} tuilleadh -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}Gabhaidh {STATION} ri {STRING} a-nis -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Gabhaidh {STATION} ri {STRING} is {STRING} a-nis STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Dh'fhalbh an ùine air tairgse tarrail:{}{}Chan fhaighear tarrail airson {STRING} a thoirt bho {STRING} gu {STRING} a-nis STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Chaidh tarrail a tharraing:{}{}Chan fhaigh seirbheis {STRING} bho {STRING} gu {STRING} tarrail a-nis diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 6fff3255e1..c382a18147 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -907,10 +907,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nova {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abre a fiestra de grupo enfocada no grupo do vehículo. -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} xa non acepta máis {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} xa non acepta máis {STRING} nin {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} agora acepta {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} agora acepta {STRING} e {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta de subvención expirada:{}{}{STRING} dende {STRING} ata {STRING} non será subvencionada. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvención reitrada:{}{}O servizo de transporte de {STRING} dende {STRING} ata {STRING} xa non ten subvención. diff --git a/src/lang/german.txt b/src/lang/german.txt index 62ac1ee6b8..c47d31e2bd 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Neue{G r STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Das Gruppenfenster mit der bereits ausgewählten Fahrzeuggruppe öffnen -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} nimmt kein{G "en" "e" "" "e"} {STRING} mehr an -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} nimmt kein{G "en" "e" "" "e"} {STRING} und kein{G "en" "e" "" "e"} {STRING} mehr an -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} nimmt jetzt auch {STRING} an -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} nimmt jetzt auch {STRING} und {STRING} an STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subventionsangebot abgelaufen:{}{}{STRING}transport von {STRING} nach {STRING} wird nicht mehr subventioniert STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subventionsende:{}{}{STRING}transport von {STRING} nach {STRING} wird nicht mehr subventioniert diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 6d618e91ba..d638ce30e5 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1011,10 +1011,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ένα STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Ανοίξτε το παράθυρο ομάδων εστιασμένος στην ομάδα του οχήματος -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια ούτε {STRING} ούτε {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}Ο σταθμός {STATION} τώρα δέχεται {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Ο σταθμός {STATION} τώρα δέχεται {STRING} και {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Έληξε η προσφορά επιδότησης:{}{}{STRING} από {G τον τη το} {STRING} πρός {G τον τη το} {STRING} δεν θα επιδοτείται πλέον. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Η επιδότηση αποσύρθηκε:{}{}Η υπηρεσια για {STRING.subs} απο το {STRING} προς το {STRING} δεν επιδοτείται πλέον. diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 858c138eb5..37808e9c00 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -887,10 +887,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} חדש זמין כעת - {ENGINE}! -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} אינה מקבלת יותר {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} אינה מקבלת יותר {STRING} או {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} מקבלת כעת {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} מקבלת כעת {STRING} ו{STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}פג תוקף הצעת סובסידיה:{}{}סובסידיה של הובלת {STRING.plural} מ{STRING} אל {STRING} לא תזכה עוד בסיבסוד. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}סובסידיה הוסרה:{}{}שירות הובלת {STRING.plural} מ{STRING} אל {STRING} אינו מסובסד יותר. diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 92df8d2847..2aa0d99cbd 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -974,10 +974,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Új {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Ide kattintva megnyílik a járműlista, kijelölve a jármű csoportját -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} többé nem fogad el {STRING.t} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} többé nem fogad el {STRING.t} és {STRING.t} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} most már elfogad {STRING.t} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} most már elfogad {STRING.t} és {STRING.t} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}A támogatás határideje lejárt:{}{}{STRING} szállításáért {STRING} és {STRING} között már nem jár támogatás STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Támogatás visszavonva:{}{}{STRING} szállítása {STRING} és {STRING} között már nem támogatott diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 3a28a5ec1d..ded7f91cba 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -837,10 +837,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ný {STRING} er nú fáanleg! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} tekur ekki lengur við {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} tekur ekki lengur við {STRING} eða {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} tekur nú við {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} tekur nú við {STRING} og {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Tilboð til samstarfssamnings runnið út:{}{}{STRING} frá {STRING} til {STRING} mun ekki vera samningsbundið. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Samsarfssamningur gerður ógildur:{}{} {STRING}flutningur frá {STRING} til {STRING} er ekki lengur samningsbundinn. diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index fdbd0b3e49..31f89c66c1 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -910,10 +910,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Membuka jendela grup yang berfokus pada rombongan kendaraan -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} tidak lagi menerima {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} tidak lagi menerima {STRING} atau {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} Sekarang menerima {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} Sekarang menerima {STRING} dan {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Penawaran subsidi berakhir:{}{}Jasa transportasi {STRING} dari {STRING} ke {STRING} mulai sekarang tidak lagi mendapat subsidi STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidi berakhir:{}{}Jasa transportasi {STRING} dari {STRING} ke {STRING} tidak lagi mendapat subsidi diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 80cdb83161..b8cb62430a 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -894,10 +894,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Tá {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Oscail fuinneog an ghrúpa atá dírithe ar ghrúpa na feithicle -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Ní ghlacann {STATION} le {STRING} a thuilleadh -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Ní ghlacann {STATION} le {STRING} ná le {STRING} a thuilleadh -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}Glacann {STATION} le {STRING} anois -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Glacann {STATION} le {STRING} agus le {STRING} anois STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Fóirdheontas a tairiscíodh imithe as dáta:{}{}Ní thabharfar fóirdheontas ar {STRING} ó {STRING} go {STRING} anois. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Fóirdheontas tarraingte siar:{}{}Ní thabharfar fóirdheontas ar sheirbhís {STRING} ó {STRING} go {STRING} a thuilleadh. diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 931c7f0568..06348ee053 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -926,10 +926,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuov{G o STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Apri la finestra del gruppo focalizzata sul gruppo del veicolo -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} non accetta più {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} non accetta più {STRING} né {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} adesso accetta {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} adesso accetta {STRING} e {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offerta di sussidio scaduta:{}{}Il trasporto di {STRING} da {STRING} a {STRING} non darà più diritto a sovvenzioni STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Sussidio terminato:{}{}Il trasporto di {STRING} da {STRING} a {STRING} non è più sovvenzionato diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 1bdf9b4135..7538a96484 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -906,10 +906,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}車両のグループに焦点を合わせたグループウィンドウを開きます -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION}は今後{STRING}を受入れません -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION}は今後{STRING}と{STRING}を受入れません -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION}は今後{STRING}を受入れます -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION}は今後{STRING}と{STRING}を受入れます STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}助成金交付案失効:{}{1:STRING}から{2:STRING}に{0:STRING}を運ぶ便の{}助成金交付案は失効しました STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}助成金支払満了:{}{1:STRING}から{2:STRING}に{0:STRING}を運ぶ便の{}助成金は終了しました diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 231ec2ba12..0de6f84f25 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -925,10 +925,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}새로 STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}이 차량이 속한 차량 그룹 목록 열기 -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION}에서 더 이상 {STRING}{G 1 "을" "를"} 받지 않습니다. -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION}에서 더 이상 {STRING}/{STRING}{G 2 "을" "를"} 받지 않습니다. -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION}에서 이제 {STRING}{G 1 "을" "를"} 받을 수 있습니다. -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION}에서 이제 {STRING}/{STRING}{G 2 "을" "를"} 받을 수 있습니다. STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}보조금 지급 종료:{}{}{1:STRING}에서 {2:STRING}까지의 {0:STRING} 수송은{}더 이상 보조금을 지급하지 않습니다. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}보조금 지급 만료:{}{}{1:STRING}에서 {2:STRING}까지의{}{0:STRING} 수송 보조금은 더 이상 지급되지 않습니다. diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 6720798682..8b50d75df6 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -1062,10 +1062,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G us a um i ae a} {STRING} parabil{G 0 is is e es es ia}! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} non diutius {STRING.acc} accipit -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} non diutius {STRING.acc} {STRING.acc}que accipit -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} nunc {STRING.acc} accipit -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} nunc {STRING.acc} {STRING.acc}que accipit STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Condicio subsidii discedit:{}{}Vectura {STRING.gen} a {STRING.abl} ad {STRING.acc} non diutius subveniatur STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidium retractum:{}{}Vectura {STRING.gen} a {STRING.abl} ad {STRING.acc} non diutius subvenietur diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 92348e778a..89c799a510 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -907,10 +907,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Tagad ir STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Atvērt grupas logu, fokusēts uz transportlīdzekļu grupu -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} vairs nepieņem {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} vairs nepieņem {STRING} vai {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} pieņem {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} pieņem {STRING} un {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsīdijas piedāvājums beidzies:{}{}{STRING} no {STRING} uz {STRING} subsidēšana ir atcelta STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidēšana atcelta:{}{}{STRING} pārvadājumi no {STRING} uz {STRING} turpmāk vairs netiek subsidēti diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index dffc9da79f..bdf66b8d25 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1105,10 +1105,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Naujas{S STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Atverti grupių langą, susijusį su šia transporto priemone -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} nebepriima {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} nebepriima {STRING} arba {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} jau priima {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} jau priima {STRING} ir {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsidijų pasiūlymas baigėsi:{}{}{STRING.ko} pervežimas iš {STRING.ko} į {STRING.ka} daugiau nebesubsidijuojamas. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidijų laikas baigėsi:{}{}{STRING.ko} transportavimas iš {STRING} į {STRING} daugiau nebesubsidijuojamas. diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 96c8f2b3c7..c1d2a414ee 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -905,10 +905,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Neie/Nei STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Maach d'Gruppefenster op, fokusséiert op der Gefiergrupp -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} akzeptéiert {STRING} net méi -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} akzeptéiert {STRING} oder {STRING} net méi -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} akzeptéiert elo {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} akzeptéiert elo {STRING} an {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subside ofgelaaf:{}{}{STRING} vun {STRING} op {STRING} gëtt net méi subventionéiert STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subside entzunn:{}{}{STRING} Service vun {STRING} op {STRING} gëtt net méi subventionéiert diff --git a/src/lang/malay.txt b/src/lang/malay.txt index a90ae1f310..973a3cf2d4 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -842,10 +842,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} baru kini boleh boleh dibeli! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} tidak lagi menerima {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} tidak lagi menerima {STRING} or {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} kini menerima {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} kini menerima {STRING} dan {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Tempoh tawaran subsidi tamat:{}{}{STRING} dari {STRING} ke {STRING} tidak akan diberi subsidi. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidi ditarik:{}{}Servis {STRING} dari {STRING} ke {STRING} tidak akan diberi subsidi. diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 2d4efd0bb4..0d31c09f6e 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -898,10 +898,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny{G "" STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Vis gruppe- og kjøretøyliste basert på kjøretøyets gruppe -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} godtar ikke lenger {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} godtar ikke lenger {STRING} eller {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} godtar nå {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} godtar nå {STRING} og {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsidietilbud har gått ut:{}{}{STRING} fra {STRING} til {STRING} vil ikke subsidieres. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidie er trukket tilbake:{}{}Transport av {STRING} fra {STRING} til {STRING} subsidieres ikke lenger. diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index a382891062..65281d60c5 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -868,10 +868,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING}type er tilgjengeleg! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} godtek ikkje lenger {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} godtek ikkje lenger {STRING} eller {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} godtek no {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} godtek no {STRING} og {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Tilbod om subsidie har gått ut:{}{}{STRING} frå {STRING} til {STRING} får ikkje lenger subsidiar STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidie trekt attende:{}{}{STRING} teneste frå {STRING} til {STRING} får ikkje lenger subsidiar diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 70a36a9bcd..c35a3c27c6 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -858,10 +858,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK} {STRING} جدید هم اکنون قابل دسترسی است! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} دیگر {STRING} قبول نمی کند -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} دیگر {STRING} و {STRING} قبول نمی کند -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} از این پس {STRING} را هم قبول می کند -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} {STRING} و {STRING} را از این به بعد قبول می کند STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}پیشنهاد یارانه باطل شد:{}{}{STRING} از {STRING} به {STRING} دیگر یارانه ای به همراه نخواهد داشت STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}یارانه بازپس گرفته شد:{}{}{STRING} خدمات از {STRING} به {STRING} دیگر شامل یارانه نمی باشند diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 5dc4c4faaa..78da7055cd 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1304,10 +1304,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Dostępn STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otwórz grupę okien skoncentrowanych na grupie pojazdów -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} nie akceptuje już {STRING.d} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} nie akceptuje już {STRING.d} ani {STRING.d} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} już akceptuje {STRING.b} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} już akceptuje {STRING.b} i {STRING.b} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Dotacja wygasła:{}{}{STRING} z {STRING} do {STRING} nie będzie już dotowane STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Koniec dotacji:{}{}Przewóz {STRING.d} z {STRING} do {STRING} nie jest już dotowany diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 8f3095400b..bf4fa03769 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -925,10 +925,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo mod STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abrir a janela de grupo focada no grupo do veículo -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} não aceita mais {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} não aceita mais {STRING} ou {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} agora aceita {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} agora aceita {STRING} e {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta de subsídio expirou:{}{}Ligação de {STRING} d{G 1 e o a os as} {STRING} para{G 2 "" " o" " a" " os" " as"} {STRING} já não será subsidiada. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsídio retirado:{}{}Ligação de {STRING} d{G 1 e o a os as} {STRING} para{G 2 "" " o" " a" " os" " as"} {STRING} já não é subsidiada. diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index f3f5382ed8..9bd81beac8 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Un nou t STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Deschide fereastra grupului fixată pe grupul vehiculului -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} nu mai acceptă {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} nu mai acceptă {STRING} sau {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} acceptă acum {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} acceptă acum {STRING} şi {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Ofertă expirată:{}{}Transportul de {STRING} de la {STRING} la {STRING} nu va mai fi subvenţionat STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Ofertă retrasă:{}{}Transportul de {STRING} de la {STRING} la {STRING} nu va mai fi subvenţionat diff --git a/src/lang/russian.txt b/src/lang/russian.txt index cae8f3268e..44f9fb24ca 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1069,10 +1069,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Нача STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Открыть окно групп транспорта и выбрать группу, к которой принадлежит это транспортное средство -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} больше не принимает {STRING.acc} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} больше не принимает {STRING.acc} и {STRING.acc} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} теперь принимает {STRING.acc} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} теперь принимает {STRING.acc} и {STRING.acc} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Предложение субсидии истекло:{}{}Перевозка {STRING.gen} по маршруту {STRING} - {STRING} субсидироваться не будет. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Срок субсидии истёк:{}{}Перевозка {STRING.gen} по маршруту {STRING} - {STRING} больше не субсидируется. diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 1c386d7bde..66d8bb03a2 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1100,10 +1100,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G "" STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otvori grupni prozor fokusiran na grupu vozila -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} više ne prihvata {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} više ne prihvata ni {STRING} ni {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} od sada prihvata {STRING.aku} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} od sada prihvata {STRING.aku} i {STRING.aku} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Ponuda subvencije istekla:{}{}Prevoz {STRING.gen} iz {STRING} u {STRING} se više neće stimulisati STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvencija povučena:{}{}Usluga prevoza {STRING.gen} između stanica {STRING} i {STRING} više nije u opticaju diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index cf5b22a0b3..797ac1c6a3 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}新 {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}打开该运输工具所属的组 -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} 将不再接受 {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} 将不再接受 {STRING} 和 {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} 开始接受 {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} 开始接受 {STRING} 和 {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}财政补贴项目到期：{}{}将 {STRING} 从 {STRING} 运送到 {STRING} 将不再获得财政补贴。 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}财政补贴项目流标：{}{}将 {STRING} 从 {STRING} 运送到 {STRING} 将不是财政补贴项目。 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 27561605d3..771e389bf5 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -990,10 +990,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G " STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otvoriť okno skupiny zamerané na skupinu vozidla -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} už neprijíma {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} už neprijíma {STRING} alebo {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} teraz prijíma {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} teraz prijíma {STRING} a {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Ponuka dotácie skončila:{}{}Preprava {STRING.g} z {STRING} do {STRING} už nebude dotovaná STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Dotácie stiahnuté:{}{}Preprava {STRING.g} z {STRING} do {STRING} už nie je dotovaná diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index ba981b528c..fb6d0ea0a3 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1022,10 +1022,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo! {STRING} sedaj na razpolago! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ne sprejema več {STRING.r} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ne sprejema več {STRING.r} ali {STRING.r} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} sedaj sprejema {STRING.t} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} sedaj sprejema {STRING.t} in {STRING.t} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Ponudba subvencije potekla:{}{}Prevoz {STRING.r} od {STRING} do {STRING} ni več subvencioniran STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvencija zaključena:{}{}Prevoz {STRING.r} od {STRING} do {STRING} ni več subvencioniran diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index d10bd46d85..f6d78a7abd 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -906,10 +906,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}¡Nuev{G STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abre la lista de vehículos centrada en el grupo del vehículo -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 subvención terminada:{}{}{STRING} de {STRING} a {STRING} ya no conlleva una subvención STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subvención retirada:{}{}El servicio de {STRING} desde {STRING} a {STRING} ya no está subvencionado diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index e5640938ef..bbadbdcc55 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -906,10 +906,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}¡Nuev{G STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abrir la ventana de este vehículo -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} de {STRING} hacia {STRING} ya no está subsidiado diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 60c081cb1c..b84763ea53 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -923,10 +923,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRI STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Öppna gruppfönstret fokuserat på fordonets grupp -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} tar inte längre emot {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} tar inte längre emot {STRING} eller {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} tar nu emot {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} tar nu emot {STRING} och {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subventionen har gått ut:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subventionen gäller inte längre:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 993933b841..1160675b29 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -870,10 +870,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}புதிய {STRING} இப்போது கிடைக்கும்! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} இனிமேல் {STRING} ஏற்றுக்கொள்ளாது -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} இனிமேல் {STRING} அல்லது {STRING} ஏற்றுக்கொள்ளாது -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} இப்போது {STRING} ஏற்றுக்கொள்கிறது -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} இப்போது {STRING} {STRING} ஆகியவற்றை ஏற்றுக்கொள்கிறது STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}மானியம் இனிமேல் தரப்படாது:{}{}{STRING} இருந்து {STRING} {STRING} வரை போக்குவரத்திற்கு மானியம் வழங்கப்படாது STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}மானியம் திரும்பப் பெறப்பட்டது :{}{} {STRING} இருந்து {STRING} வரை செல்லும் {STRING} சேவையிற்கு இனி மானியம் இல்லை diff --git a/src/lang/thai.txt b/src/lang/thai.txt index edb70a7225..1315f2ed37 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -876,10 +876,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}ให STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}เปิดแถบกลุ่มยาพาหนะที่ได้เลือกไว้ -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} ไม่ต้องการรับ {STRING} อีกต่อไป -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} ไม่รับ {STRING} หรือ {STRING} แล้ว -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} ขณะนี้ยอมรับ {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} ขณะนี้ยอมรับ {STRING} และ {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}ข้อเสนอสำหรับการอุดหนุนสิ้นสุด:{}{}{STRING} จาก {STRING} ถึง {STRING} จะไม่ได้รับการอุดหนุนอีกต่อไป. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}การอุดหนุนถูกถอดถอน:{}{}บริการ {STRING} จาก {STRING} ถึง {STRING} จะไม่ได้รับการสนับสนุนอีกต่อไป. diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index d4a2b9313f..debb93cc14 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}打開該運輸工具的群組 -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} 不再接受 {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} 不再接受 {STRING} 或 {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} 現在接受 {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} 現在接受 {STRING} 及 {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}補助過期：{}{}將 {STRING} 從 {STRING} 運到 {STRING} 現在起不再提供補助 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}補助結束：{}{}將 {STRING} 從 {STRING} 運到 {STRING} 的服務不再提供補助 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 2cab1d348a..3286d566b2 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -925,10 +925,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Yeni {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Aracın grubuna odaklanmış grup penceresini açın -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} artık {STRING} kabul etmiyor -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} artık {STRING} veya {STRING} kabul etmiyor -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} artık {STRING} kabul ediyor -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} artık {STRING} ve {STRING} kabul ediyor STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Teşvik önerisinin süresi doldu:{}{}{1:STRING} ile {2:STRING} arasındaki {0:STRING} taşıma hizmeti artık teşvik almayacak STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Hizmet teşviği geri çekildi:{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında artık teşvik sağlamayacak diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index e87588d383..5c1a77074c 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1034,10 +1034,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Відт STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Відкрити вікно групи з центром на групах транспорту -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} більше не приймає {STRING.z} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} більше не приймає {STRING.z} або {STRING.z} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} тепер приймає {STRING.z} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} тепер приймає {STRING.z} і {STRING.z} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Субсидія більше не пропонується:{}{}Перевезення {STRING.r} з {STRING} до {STRING} STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Субсидію скасовано:{}{}Перевезення {STRING.r} з {STRING.r} до {STRING.r} diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 491b42184f..5a1b33a8aa 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -837,10 +837,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}نئی {STRING} اب دستیاب ہے! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} مزید {STRING} قبول نہیں کرتا -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} مزید {STRING} یا {STRING} قبول نہیں کرتا -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} اب قبول کرتا ہے {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} اب {STRING} اور {STRING} قبول کرتا ہے STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}امداد کی پیشکش کی معیاد ختم:{}{}{STRING} {STRING} سے {STRING} تک اب کوئی امداد نہیں ملے گی STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}امداد ختم:{}{}{STRING} {STRING} سے {STRING} تک کئی گئی خدمت کی اب کوئی امداد نہیں ملے گی diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index a88373b672..522f624c70 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -924,10 +924,6 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Mở cửa sổ gom nhóm và hiện nhóm của phương tiện -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Ga, bến, cảng {STATION} không chấp nhận {STRING} nữa. -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Ga, bến, cảng {STATION} không chấp nhận {STRING} hoặc {STRING} nữa -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}{STATION} đã chấp nhận {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}{STATION} đã chấp nhận {STRING} và {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Lời đề nghị trợ cấp đã hết hạn:{}{}{STRING} từ {STRING} đến {STRING} bây giờ sẽ không có trợ cấp. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Trợ cấp đã hết:{}{}Dịch vụ vận chuyển {STRING} từ {STRING} đến {STRING} sẽ không được trợ cấp nữa. diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 8617cf2355..6adac2e441 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -877,10 +877,6 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Mae {STRING} newydd yn awr ar gael! - {ENGINE} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING} -STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING} na {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO :{WHITE}Mae {STATION} nawr yn derbyn {STRING} -STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Mae {STATION} nawr yn derbyn {STRING} a {STRING} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Cynnig cymhorthdal ar ben:{}{}Ni fydd cludo {STRING} o {STRING} i {STRING} yn derbyn cymhorthdal bellach STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Cymhorthdal wedi'i dynnu'n ôl:{}{}Ni fydd gwasanaeth {STRING} o {STRING} i {STRING} yn derbyn cymhorthdal bellach From 92ab114e13c08324a5522f4bf0e2b5403a6daa6a Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Sun, 22 Oct 2023 10:51:06 -0400 Subject: [PATCH 07/28] Fix f49ffaa: Use DateAtStartOfYear() to calculate max timetable start date (#11388) --- src/timetable_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index ec87aa21e3..8fe617ed70 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -305,7 +305,7 @@ CommandCost CmdSetTimetableStart(DoCommandFlag flags, VehicleID veh_id, bool tim /* Don't let a timetable start more than 15 years into the future or 1 year in the past. */ if (start_date < 0 || start_date > CalendarTime::MAX_DATE) return CMD_ERROR; - if (start_date - TimerGameCalendar::date > static_cast(MAX_TIMETABLE_START_YEARS) * CalendarTime::DAYS_IN_LEAP_YEAR) return CMD_ERROR; + if (start_date - TimerGameCalendar::date > TimerGameCalendar::DateAtStartOfYear(MAX_TIMETABLE_START_YEARS)) return CMD_ERROR; if (TimerGameCalendar::date - start_date > CalendarTime::DAYS_IN_LEAP_YEAR) return CMD_ERROR; if (timetable_all && !v->orders->IsCompleteTimetable()) return CommandCost(STR_ERROR_TIMETABLE_INCOMPLETE); if (timetable_all && start_date + total_duration / Ticks::DAY_TICKS > CalendarTime::MAX_DATE) return CMD_ERROR; From d1351fa0d2fba9ec7d49d817efd4acd667879133 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 22 Oct 2023 18:37:20 +0000 Subject: [PATCH 08/28] Update: Translations from eints english (au): 3 changes by krysclarke russian: 3 changes by Ln-Wolf finnish: 3 changes by hpiirai turkish: 4 changes by BeratSJ french: 3 changes by ottdfevr portuguese: 3 changes by azulcosta portuguese (brazilian): 3 changes by pasantoro --- src/lang/brazilian_portuguese.txt | 3 +++ src/lang/english_AU.txt | 3 +++ src/lang/finnish.txt | 3 +++ src/lang/french.txt | 3 +++ src/lang/portuguese.txt | 3 +++ src/lang/russian.txt | 3 +++ src/lang/turkish.txt | 4 ++++ 7 files changed, 22 insertions(+) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index edcac91262..14d2b73b5b 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -925,6 +925,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G o STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abrir a janela do grupo focado no grupo do veículo +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} já não aceita: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} agora aceita: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}A oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} agora não irá atrair um subsídio STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsídio removido:{}{} Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado @@ -2193,6 +2195,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Editar a STR_CHEAT_CHANGE_DATE :{LTBLUE}Alterar data: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Mudar ano atual STR_CHEAT_SETUP_PROD :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Fixar as classificações da estação em 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Esquema de cores diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 7613f92384..23f0e3d51b 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -924,6 +924,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Open the group window focused on the vehicle's group +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} no longer accepts: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} now accepts: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidy withdrawn:{}{}{STRING} service from {STRING} to {STRING} is no longer subsidised @@ -2192,6 +2194,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Edit the STR_CHEAT_CHANGE_DATE :{LTBLUE}Change date: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Change current year STR_CHEAT_SETUP_PROD :{LTBLUE}Enable modifying production values: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Fix station ratings at 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Colour Scheme diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 946e3f5e02..e178dcfae9 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -924,6 +924,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Uusi {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Avaa ryhmäikkuna kulkuneuvon ryhmään kohdistettuna +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} ei enää ota vastaan: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} ottaa nyt vastaan: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Tukitarjous päättynyt:{}{}{STRING} välillä {STRING} – {STRING} ei enää tulla tukemaan STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Tuki vedetty pois:{}{}{STRING} välillä {STRING}-{STRING} ei enää tueta @@ -2192,6 +2194,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Muuta su STR_CHEAT_CHANGE_DATE :{LTBLUE}Muuta päiväystä: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Muuta nykyistä vuotta STR_CHEAT_SETUP_PROD :{LTBLUE}Salli tuotantomäärien muuttaminen: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Asemien arviot ovat pysyvästi 100 %: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY}: Väriteema diff --git a/src/lang/french.txt b/src/lang/french.txt index 662bb042ec..17235a5973 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -925,6 +925,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nouv{G 0 STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Ouvrir la fenêtre de groupe de ce véhicule +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} n'accepte plus : {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} accepte désormais : {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offre de subvention expirée{NBSP}:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est désormais plus subventionné STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Abandon de la subvention{NBSP}:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est plus subventionné @@ -2193,6 +2195,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Modifier STR_CHEAT_CHANGE_DATE :{LTBLUE}Changer la date{NBSP}: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Modifier l'année courante STR_CHEAT_SETUP_PROD :{LTBLUE}Permettre la modification des valeurs de production{NBSP}: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Fixer la qualité de service de la station à 100 % : {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Couleur diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index bf4fa03769..3849dd48e6 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -925,6 +925,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Novo mod STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Abrir a janela de grupo focada no grupo do veículo +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} já não aceita: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} agora aceita: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Oferta de subsídio expirou:{}{}Ligação de {STRING} d{G 1 e o a os as} {STRING} para{G 2 "" " o" " a" " os" " as"} {STRING} já não será subsidiada. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsídio retirado:{}{}Ligação de {STRING} d{G 1 e o a os as} {STRING} para{G 2 "" " o" " a" " os" " as"} {STRING} já não é subsidiada. @@ -2193,6 +2195,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Editar a STR_CHEAT_CHANGE_DATE :{LTBLUE}Alterar data: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Alterar ano atual STR_CHEAT_SETUP_PROD :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Fixar as classificações da estação em 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Novo Esquema de Cores diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 44f9fb24ca..581cf3d78a 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1069,6 +1069,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Нача STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Открыть окно групп транспорта и выбрать группу, к которой принадлежит это транспортное средство +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} больше не принимает: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} теперь принимает: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Предложение субсидии истекло:{}{}Перевозка {STRING.gen} по маршруту {STRING} - {STRING} субсидироваться не будет. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Срок субсидии истёк:{}{}Перевозка {STRING.gen} по маршруту {STRING} - {STRING} больше не субсидируется. @@ -2343,6 +2345,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Изме STR_CHEAT_CHANGE_DATE :{LTBLUE}Изменение даты: {ORANGE} {DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Изменить текущий год STR_CHEAT_SETUP_PROD :{LTBLUE}Разрешить изменение производительности: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Рейтинг станций всегда 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}Цвета компании «{COMPANY}» diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 3286d566b2..385974049c 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -925,6 +925,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Yeni {ST STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Aracın grubuna odaklanmış grup penceresini açın +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} artık şunu kabul etmiyor: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} artık şunu kabul ediyor: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Teşvik önerisinin süresi doldu:{}{}{1:STRING} ile {2:STRING} arasındaki {0:STRING} taşıma hizmeti artık teşvik almayacak STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Hizmet teşviği geri çekildi:{}{}{STRING} taşıma hizmeti {STRING} -> {STRING} arasında artık teşvik sağlamayacak @@ -2193,6 +2195,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Haritada STR_CHEAT_CHANGE_DATE :{LTBLUE}Tarihi değiştir: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Yılı değiştir STR_CHEAT_SETUP_PROD :{LTBLUE}Üretim değerlerini değiştir: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}İstasyon derecelendirmelerini %100'e sabitle : {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Renk Düzeni @@ -3397,6 +3400,7 @@ STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Kaynak k STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{1:HEX}'deki {0:STRING} STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Nesne STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE :Ray türü +STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_ROAD_TYPE :Yol türü: STR_NEWGRF_INSPECT_QUERY_CAPTION :{WHITE}NewGRF değişkeni 60+x parametresi (onaltılı) From 9cdf66d3a1342b07a9ca8c860b75fb2511fb32a4 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 23 Oct 2023 18:38:04 +0000 Subject: [PATCH 09/28] Update: Translations from eints czech: 18 changes by vladoschreiner german: 27 changes by Wuzzy2 --- src/lang/czech.txt | 18 ++++++++++++++++++ src/lang/german.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 8e58c745a5..0c4ffad213 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -266,6 +266,10 @@ STR_COLOUR_WHITE :Bílá STR_COLOUR_RANDOM :Náhodná ###length 17 +STR_COLOUR_SECONDARY_DARK_BLUE :Tmavomodrá +STR_COLOUR_SECONDARY_BROWN :Hnědá +STR_COLOUR_SECONDARY_GREY :Šedá +STR_COLOUR_SECONDARY_WHITE :Bílá # Units used in OpenTTD @@ -992,6 +996,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G ý STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otevřít okno skupin s předvybranou skupinou daného vozidla +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} přijímá: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z{NBSP}{STRING.gen} do {STRING.gen} nebude dále nabízena STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z{NBSP}{STRING.gen} do {STRING.gen} již nebude dále poskytována @@ -1019,10 +1024,13 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Možnost STR_GAME_OPTIONS_TAB_GENERAL :Obecné STR_GAME_OPTIONS_TAB_GENERAL_TT :{BLACK}Zobrazit obecná nastavení STR_GAME_OPTIONS_TAB_GRAPHICS_TT :{BLACK}Zobrazit nastavení grafiky +STR_GAME_OPTIONS_TAB_SOUND :Zvuk STR_GAME_OPTIONS_VOLUME :Hlasitost STR_GAME_OPTIONS_MUSIC_VOLUME :Hudba +STR_GAME_OPTIONS_VOLUME_0 :0% +STR_GAME_OPTIONS_VOLUME_75 :75% STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Měna @@ -1117,6 +1125,7 @@ STR_GAME_OPTIONS_GUI_SCALE_3X :3x STR_GAME_OPTIONS_GUI_SCALE_4X :4x STR_GAME_OPTIONS_GUI_SCALE_5X :5x +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW :{BLACK}Náhled výsledků průzkumu STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP :{BLACK}Zobrazovat výsledek průzkumu z aktuálně běžící hry STR_GAME_OPTIONS_GRAPHICS :{BLACK}Grafiky @@ -1688,6 +1697,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :vypnutá STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Zavírat okno kliknutím pravým tlačítkem myši: {STRING} STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT :Zavírat okno kliknutím pravým tlačítkem na něj. Znemožňuje využívat nápovědu zobrazující se při stisknutí pravého tlačítka myši! ###length 3 +STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES :Ano STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Pro jméno uložené hry použít {STRING} formát STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Formát data v názvu uložené hry @@ -2202,6 +2212,10 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Opravdu STR_ABANDON_SCENARIO_QUERY :{YELLOW}Určite chceš opustit toto mapu? # Help window +STR_HELP_WINDOW_DOCUMENTS :{BLACK}Dokumenty +STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Nahlášené chyby +STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD +STR_HELP_WINDOW_COMMUNITY :{BLACK}Komunita # Cheat window STR_CHEATS :{WHITE}Cheaty @@ -2478,6 +2492,8 @@ STR_NETWORK_ASK_RELAY_NO :{BLACK}Ne STR_NETWORK_ASK_RELAY_YES_ONCE :{BLACK}Ano, toto jednou STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Ano, znovu se neptat +STR_NETWORK_ASK_SURVEY_TEXT :Chceš se zúčastnit automatického průzkumu?{}OpenTTD odešle výsledky průzkumu při ukončení hry.{}Toto nastavení můžeš kdykoliv změnit v "Nastavení". +STR_NETWORK_ASK_SURVEY_NO :Ne STR_NETWORK_ASK_SURVEY_YES :Ano STR_NETWORK_SPECTATORS :Pozorovatelé @@ -4740,6 +4756,8 @@ STR_TEXTFILE_VIEW_LICENCE :{BLACK}Licence STR_TEXTFILE_README_CAPTION :{WHITE}{STRING} readme {STRING} STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}{STRING} změny ve verzi {STRING} STR_TEXTFILE_LICENCE_CAPTION :{WHITE}{STRING} licence {STRING} +STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Náhled výsledků průzkumu +STR_TEXTFILE_GAME_MANUAL_CAPTION :{WHITE}OpenTTD dokument '{STRING}' # Vehicle loading indicators diff --git a/src/lang/german.txt b/src/lang/german.txt index c47d31e2bd..082a325684 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -524,6 +524,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Alle Nachrichte # About menu ###length 11 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gebietsinformationen +STR_ABOUT_MENU_HELP :Hilfe u. Anleitungen STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsole öffnen/schließen STR_ABOUT_MENU_AI_DEBUG :KI-/Skript-Debug @@ -924,6 +925,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Neue{G r STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Das Gruppenfenster mit der bereits ausgewählten Fahrzeuggruppe öffnen +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} akzeptiert nicht mehr: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} akzeptiert jetzt: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subventionsangebot abgelaufen:{}{}{STRING}transport von {STRING} nach {STRING} wird nicht mehr subventioniert STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subventionsende:{}{}{STRING}transport von {STRING} nach {STRING} wird nicht mehr subventioniert @@ -1423,6 +1426,8 @@ STR_CONFIG_SETTING_PLANE_CRASHES_NONE :Keine STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED :Verringert STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL :Normal +STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR :Bau von Bahnübergängen auf Straßen oder Schienen im Eigentum von Mitbewerbern erlauben: {STRING} +STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR_HELPTEXT :Bau von Bahnübergängen auf Straßen oder Schienen im Eigentum von Mitbewerbern erlauben STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :Bus- und Lkw-Haltestellen auf Straßen im Stadteigentum erlauben: {STRING} STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT :Erlaubt die Errichtung von Bus- und Lkw-Haltestellen auf Straßen im Stadteigentum @@ -2119,6 +2124,7 @@ STR_INTRO_MULTIPLAYER :{BLACK}Mehrspie STR_INTRO_GAME_OPTIONS :{BLACK}Spieleinstellungen STR_INTRO_HIGHSCORE :{BLACK}Bestenliste +STR_INTRO_HELP :{BLACK}Hilfe u. Anleitungen STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Einstellungen STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF-Einstellungen STR_INTRO_ONLINE_CONTENT :{BLACK}Erweiterungen herunterladen @@ -2140,6 +2146,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Spielzeu STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Spieleinstellungen anzeigen und/oder ändern STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Zeige die Bestenliste +STR_INTRO_TOOLTIP_HELP :{BLACK}Zugriff auf Dokumentation und Onlinehilfsmittel erhalten STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Einstellungen anzeigen STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}NewGRF-Einstellungen anzeigen und/oder ändern STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Prüfe, ob neue oder aktualisierte Erweiterungen zum Herunterladen bereitstehen @@ -2162,6 +2169,17 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Das Spi STR_ABANDON_SCENARIO_QUERY :{YELLOW}Soll das Szenario wirklich verlassen werden? # Help window +STR_HELP_WINDOW_CAPTION :{WHITE}Hilfe u. Anleitungen +STR_HELP_WINDOW_WEBSITES :{BLACK}Webseiten +STR_HELP_WINDOW_DOCUMENTS :{BLACK}Dokumente +STR_HELP_WINDOW_README :{BLACK}Liesmich +STR_HELP_WINDOW_CHANGELOG :{BLACK}Änderungsprotokoll +STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Bekannte Fehler +STR_HELP_WINDOW_LICENSE :{BLACK}Lizenz +STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD +STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Anleitung / Wiki +STR_HELP_WINDOW_BUGTRACKER :{BLACK}Einen Fehler melden +STR_HELP_WINDOW_COMMUNITY :{BLACK}Gemeinschaft # Cheat window STR_CHEATS :{WHITE}Cheats @@ -2177,6 +2195,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Die Maxi STR_CHEAT_CHANGE_DATE :{LTBLUE}Ändere Datum: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Ändert das Spieljahr STR_CHEAT_SETUP_PROD :{LTBLUE}Erlaube manuelles Ändern der Produktionsleistungen: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Stationsbewertungen bei 100% fixieren: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} – Farbschema @@ -2650,6 +2669,7 @@ STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Transpar STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Transparenz für Brücken einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Transparenz für Bauten wie Leuchttürme und Sendemasten einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Transparenz für Oberleitungen einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben +STR_TRANSPARENT_TEXT_TOOLTIP :{BLACK}Transparenz für Beladung und Kosten-/Einkommenstext umschalten. Strg+Klick zum Sperren STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Objekte unsichtbar statt transparent machen # Linkgraph legend window @@ -3380,6 +3400,7 @@ STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Inspizie STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING} bei {HEX} STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Objekt STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE :Gleisart +STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_ROAD_TYPE :Straßentyp STR_NEWGRF_INSPECT_QUERY_CAPTION :{WHITE}NewGRF-Variable 60+x Parameter (hexadecimal) @@ -4695,6 +4716,11 @@ STR_AI_SETTINGS_SETTING :{STRING}: {ORAN # Textfile window +STR_TEXTFILE_JUMPLIST :{WHITE}Inhaltsverzeichnis +STR_TEXTFILE_JUMPLIST_TOOLTIP :{BLACK}Schnell zu einem Abschnitt in der angezeigten Datei mittels dieser Liste springen +STR_TEXTFILE_JUMPLIST_ITEM :{WHITE}{STRING} +STR_TEXTFILE_NAVBACK_TOOLTIP :{BLACK}Zurück in Navigationshistorie gehen +STR_TEXTFILE_NAVFORWARD_TOOLTIP :{BLACK}Wieder vorwärts in Navigationshistorie gehen STR_TEXTFILE_WRAP_TEXT :{WHITE}Text umbrechen STR_TEXTFILE_WRAP_TEXT_TOOLTIP :{BLACK}Text des Fensters so umbrechen, dass es ohne Scrollen hineinpasst STR_TEXTFILE_VIEW_README :{BLACK}Liesmich anzeigen @@ -4705,6 +4731,7 @@ STR_TEXTFILE_README_CAPTION :{WHITE}{STRING} STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}{STRING}-Änderungen von {STRING} STR_TEXTFILE_LICENCE_CAPTION :{WHITE}{STRING}-Lizenz von {STRING} STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Vorschau des Umfragenergebnisses +STR_TEXTFILE_GAME_MANUAL_CAPTION :{WHITE}OpenTTD-Dokument „{STRING}“ # Vehicle loading indicators From 3d7f54472d68156946efa765a0702fd5a1898ae3 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 24 Oct 2023 18:38:34 +0000 Subject: [PATCH 10/28] Update: Translations from eints english (us): 3 changes by 2TallTyler danish: 3 changes by bscargo polish: 1 change by pAter-exe --- src/lang/danish.txt | 3 +++ src/lang/english_US.txt | 3 +++ src/lang/polish.txt | 1 + 3 files changed, 7 insertions(+) diff --git a/src/lang/danish.txt b/src/lang/danish.txt index fde0f61348..ceb80202de 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -924,6 +924,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRI STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Åbn gruppevinduet med fokus på dette fartøjs gruppe +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} accepterer ikke længere: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} accepterer nu: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Licitation af tilskudsordning udløbet:{}{}{STRING} fra {STRING} til {STRING} vil ikke længere udløse tilskud. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Tilskudsordning tilbagetrukket:{}{}{STRING} fra {STRING} til {STRING} modtager ikke længere tilskud. @@ -2192,6 +2194,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Rediger STR_CHEAT_CHANGE_DATE :{LTBLUE}Ændre dato: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Skift år STR_CHEAT_SETUP_PROD :{LTBLUE}Aktiver modifikation af produktion: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Ret stationsvurderinger til 100 %: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Farvetema diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index eec8c4b1d9..ceb896a25a 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -924,6 +924,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STR STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Open the group window focused on the vehicle's group +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} no longer accepts: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} now accepts: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidy withdrawn:{}{}{STRING} service from {STRING} to {STRING} is no longer subsidized @@ -2192,6 +2194,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Edit the STR_CHEAT_CHANGE_DATE :{LTBLUE}Change date: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Change current year STR_CHEAT_SETUP_PROD :{LTBLUE}Enable modifying production values: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Fix station ratings at 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Color Scheme diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 78da7055cd..f6c3b14c74 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2572,6 +2572,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Edytuj m STR_CHEAT_CHANGE_DATE :{LTBLUE}Zmień datę: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Zmień obecny rok STR_CHEAT_SETUP_PROD :{LTBLUE}Włącz modyfikowanie wielkości produkcji przedsiębiorstw: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Ustaw oceny stacji na 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Schemat kolorów From d19832569e7a36cfe74b138d397175b9c85dadef Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 14:08:07 +0100 Subject: [PATCH 11/28] Cleanup: No need to cast `const Font *` to itself. (#11395) --- src/gfx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gfx.cpp b/src/gfx.cpp index c980b838c1..15420ee655 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -521,7 +521,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left, * another size would be chosen it won't have truncated too little for * the truncation dots. */ - FontCache *fc = ((const Font*)line.GetVisualRun(0).GetFont())->fc; + FontCache *fc = line.GetVisualRun(0).GetFont()->fc; GlyphID dot_glyph = fc->MapCharToGlyph('.'); dot_width = fc->GetGlyphWidth(dot_glyph); dot_sprite = fc->GetGlyph(dot_glyph); @@ -570,7 +570,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left, bool draw_shadow = false; for (int run_index = 0; run_index < line.CountRuns(); run_index++) { const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index); - const Font *f = (const Font*)run.GetFont(); + const Font *f = run.GetFont(); FontCache *fc = f->fc; colour = f->colour; From f78c2c9810f463aac53148e28167fb830b8b759d Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 18:22:35 +0100 Subject: [PATCH 12/28] Fix: Incorrect title on framerate windows for AIs. --- src/framerate_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp index 40fbaf387c..4a6c687e31 100644 --- a/src/framerate_gui.cpp +++ b/src/framerate_gui.cpp @@ -738,7 +738,7 @@ static WindowDesc _framerate_display_desc( static const NWidgetPart _frametime_graph_window_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), - NWidget(WWT_CAPTION, COLOUR_GREY, WID_FGW_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetTextStyle(TC_WHITE), + NWidget(WWT_CAPTION, COLOUR_GREY, WID_FGW_CAPTION), SetDataTip(STR_JUST_STRING2, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetTextStyle(TC_WHITE), NWidget(WWT_STICKYBOX, COLOUR_GREY), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), From 375f24956cf9c8d315c512552f0f8e2ff167c530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Wed, 25 Oct 2023 21:20:45 +0200 Subject: [PATCH 13/28] Fix: [CI] Installed (and cached) vcpkg packages are never upgraded in release-linux workflow (#11396) Other workflows use a per image cache because images provide a fixed vcpkg clone. --- .github/workflows/release-linux.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index b44c7eabee..29eea834e9 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -116,6 +116,9 @@ jobs: cd /vcpkg ./bootstrap-vcpkg.sh -disableMetrics + # Once installed (and cached) a package will never be upgraded unless we do it ourselves. + ./vcpkg upgrade --no-dry-run + # Make Python3 available for other packages. ./vcpkg install python3 ln -sf $(pwd)/installed/x64-linux/tools/python3/python3.[0-9][0-9] /usr/bin/python3 From 8a49c0eb2c6c9ccb7843d448717ecb78d666fc62 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 22:12:37 +0100 Subject: [PATCH 14/28] Change: Use modalpopup spacing for network relay and survey windows. --- src/network/network_gui.cpp | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index fcfef1e93e..97ee785cb9 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -2372,15 +2372,13 @@ struct NetworkAskRelayWindow : public Window { { if (widget == WID_NAR_TEXT) { *size = GetStringBoundingBox(STR_NETWORK_ASK_RELAY_TEXT); - size->width += WidgetDimensions::scaled.frametext.Horizontal(); - size->height += WidgetDimensions::scaled.frametext.Vertical(); } } void DrawWidget(const Rect &r, int widget) const override { if (widget == WID_NAR_TEXT) { - DrawStringMultiLine(r.Shrink(WidgetDimensions::scaled.frametext), STR_NETWORK_ASK_RELAY_TEXT, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, STR_NETWORK_ASK_RELAY_TEXT, TC_FROMSTRING, SA_CENTER); } } @@ -2429,12 +2427,14 @@ static const NWidgetPart _nested_network_ask_relay_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_RED), NWidget(WWT_CAPTION, COLOUR_RED, WID_NAR_CAPTION), SetDataTip(STR_NETWORK_ASK_RELAY_CAPTION, STR_NULL), EndContainer(), - NWidget(WWT_PANEL, COLOUR_RED), SetPIP(0, 0, 8), - NWidget(WWT_TEXT, COLOUR_RED, WID_NAR_TEXT), SetAlignment(SA_HOR_CENTER), SetFill(1, 1), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 15, 10), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NAR_NO), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_RELAY_NO, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NAR_YES_ONCE), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_RELAY_YES_ONCE, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NAR_YES_ALWAYS), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_RELAY_YES_ALWAYS, STR_NULL), + NWidget(WWT_PANEL, COLOUR_RED), + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_TEXT, COLOUR_RED, WID_NAR_TEXT), SetAlignment(SA_HOR_CENTER), SetFill(1, 1), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NAR_NO), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_RELAY_NO, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NAR_YES_ONCE), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_RELAY_YES_ONCE, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NAR_YES_ALWAYS), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_RELAY_YES_ALWAYS, STR_NULL), + EndContainer(), EndContainer(), EndContainer(), }; @@ -2475,15 +2475,13 @@ struct NetworkAskSurveyWindow : public Window { { if (widget == WID_NAS_TEXT) { *size = GetStringBoundingBox(STR_NETWORK_ASK_SURVEY_TEXT); - size->width += WidgetDimensions::scaled.frametext.Horizontal(); - size->height += WidgetDimensions::scaled.frametext.Vertical(); } } void DrawWidget(const Rect &r, int widget) const override { if (widget == WID_NAS_TEXT) { - DrawStringMultiLine(r.Shrink(WidgetDimensions::scaled.frametext), STR_NETWORK_ASK_SURVEY_TEXT, TC_BLACK, SA_CENTER); + DrawStringMultiLine(r, STR_NETWORK_ASK_SURVEY_TEXT, TC_BLACK, SA_CENTER); } } @@ -2524,15 +2522,17 @@ static const NWidgetPart _nested_network_ask_survey_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY, WID_NAS_CAPTION), SetDataTip(STR_NETWORK_ASK_SURVEY_CAPTION, STR_NULL), EndContainer(), - NWidget(WWT_PANEL, COLOUR_GREY), SetPIP(0, 4, 8), - NWidget(WWT_TEXT, COLOUR_GREY, WID_NAS_TEXT), SetAlignment(SA_HOR_CENTER), SetFill(1, 1), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 15, 10), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NAS_PREVIEW), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_PREVIEW, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NAS_LINK), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_LINK, STR_NULL), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 15, 10), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NAS_NO), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_NO, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NAS_YES), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_YES, STR_NULL), + NWidget(WWT_PANEL, COLOUR_GREY), + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_TEXT, COLOUR_GREY, WID_NAS_TEXT), SetAlignment(SA_HOR_CENTER), SetFill(1, 1), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NAS_PREVIEW), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_PREVIEW, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NAS_LINK), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_LINK, STR_NULL), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NAS_NO), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_NO, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NAS_YES), SetMinimalSize(71, 12), SetFill(1, 1), SetDataTip(STR_NETWORK_ASK_SURVEY_YES, STR_NULL), + EndContainer(), EndContainer(), EndContainer(), }; From 19c314ea1f079633df4ffc3c69d23009e09241ed Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 22:12:38 +0100 Subject: [PATCH 15/28] Change: Use modalpopup spacing for buy company window. --- src/company_gui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/company_gui.cpp b/src/company_gui.cpp index b36d099b27..e1b95d2211 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -2803,12 +2803,12 @@ static const NWidgetPart _nested_buy_company_widgets[] = { NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, WID_BC_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE), - NWidget(NWID_VERTICAL), SetPIP(8, 8, 8), - NWidget(NWID_HORIZONTAL), SetPIP(8, 10, 8), + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BC_FACE), SetFill(0, 1), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BC_QUESTION), SetMinimalSize(240, 0), SetFill(1, 1), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(100, 10, 100), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(100, WidgetDimensions::unscaled.hsep_wide, 100), NWidget(WWT_TEXTBTN, COLOUR_LIGHT_BLUE, WID_BC_NO), SetMinimalSize(60, 12), SetDataTip(STR_QUIT_NO, STR_NULL), SetFill(1, 0), NWidget(WWT_TEXTBTN, COLOUR_LIGHT_BLUE, WID_BC_YES), SetMinimalSize(60, 12), SetDataTip(STR_QUIT_YES, STR_NULL), SetFill(1, 0), EndContainer(), From 616fb48e251fc9148dd215245dce5220aeacd1c6 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 22:12:38 +0100 Subject: [PATCH 16/28] Change: Use modalpopup spacing for engine preview window. --- src/engine_gui.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 3d1cf12781..0534ff9fda 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -57,12 +57,13 @@ static const NWidgetPart _nested_engine_preview_widgets[] = { NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetDataTip(STR_ENGINE_PREVIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE), - NWidget(WWT_EMPTY, INVALID_COLOUR, WID_EP_QUESTION), SetMinimalSize(300, 0), SetPadding(8, 8, 8, 8), SetFill(1, 0), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, 10, 85), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_EP_NO), SetDataTip(STR_QUIT_NO, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_EP_YES), SetDataTip(STR_QUIT_YES, STR_NULL), SetFill(1, 0), + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_EMPTY, INVALID_COLOUR, WID_EP_QUESTION), SetMinimalSize(300, 0), SetFill(1, 0), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, WidgetDimensions::unscaled.hsep_wide, 85), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_EP_NO), SetDataTip(STR_QUIT_NO, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_EP_YES), SetDataTip(STR_QUIT_YES, STR_NULL), SetFill(1, 0), + EndContainer(), EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 8), EndContainer(), }; From a601a1f406a963cab7d10645edf758ee020afaf2 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 22:12:39 +0100 Subject: [PATCH 17/28] Change: Use modalpopup spacing for goal question windows. --- src/goal_gui.cpp | 128 ++++++++++++++++++-------------------- src/widgets/goal_widget.h | 1 - 2 files changed, 61 insertions(+), 68 deletions(-) diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp index f1e30b6205..30f1206545 100644 --- a/src/goal_gui.cpp +++ b/src/goal_gui.cpp @@ -344,10 +344,8 @@ struct GoalQuestionWindow : public Window { this->CreateNestedTree(); if (this->buttons == 0) { this->GetWidget(WID_GQ_BUTTONS)->SetDisplayedPlane(SZSP_HORIZONTAL); - this->GetWidget(WID_GQ_BUTTON_SPACER)->SetDisplayedPlane(SZSP_HORIZONTAL); } else { this->GetWidget(WID_GQ_BUTTONS)->SetDisplayedPlane(this->buttons - 1); - this->GetWidget(WID_GQ_BUTTON_SPACER)->SetDisplayedPlane(0); } this->FinishInitNested(window_number); } @@ -395,7 +393,7 @@ struct GoalQuestionWindow : public Window { if (widget != WID_GQ_QUESTION) return; SetDParamStr(0, this->question); - size->height = GetStringHeight(STR_JUST_RAW_STRING, size->width) + WidgetDimensions::scaled.vsep_wide; + size->height = GetStringHeight(STR_JUST_RAW_STRING, size->width); } void DrawWidget(const Rect &r, int widget) const override @@ -414,23 +412,22 @@ static const NWidgetPart _nested_goal_question_widgets_question[] = { NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, WID_GQ_CAPTION), SetDataTip(STR_GOAL_QUESTION_CAPTION_QUESTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE), - NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetPadding(8, 8, 8, 8), SetFill(1, 0), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, 10, 85), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetFill(1, 0), + NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, WidgetDimensions::unscaled.hsep_wide, 85), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, WidgetDimensions::unscaled.hsep_wide, 65), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, WidgetDimensions::unscaled.hsep_wide, 25), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, 10, 65), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, 10, 25), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - EndContainer(), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTON_SPACER), - NWidget(NWID_SPACER), SetMinimalSize(0, 8), EndContainer(), EndContainer(), }; @@ -441,23 +438,22 @@ static const NWidgetPart _nested_goal_question_widgets_info[] = { NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, WID_GQ_CAPTION), SetDataTip(STR_GOAL_QUESTION_CAPTION_INFORMATION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE), - NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetPadding(8, 8, 8, 8), SetFill(1, 0), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, 10, 85), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetFill(1, 0), + NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, WidgetDimensions::unscaled.hsep_wide, 85), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, WidgetDimensions::unscaled.hsep_wide, 65), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, WidgetDimensions::unscaled.hsep_wide, 25), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, 10, 65), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, 10, 25), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - EndContainer(), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTON_SPACER), - NWidget(NWID_SPACER), SetMinimalSize(0, 8), EndContainer(), EndContainer(), }; @@ -468,23 +464,22 @@ static const NWidgetPart _nested_goal_question_widgets_warning[] = { NWidget(WWT_CAPTION, COLOUR_YELLOW, WID_GQ_CAPTION), SetDataTip(STR_GOAL_QUESTION_CAPTION_WARNING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_YELLOW), - NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetPadding(8, 8, 8, 8), SetFill(1, 0), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, 10, 85), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetFill(1, 0), + NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, WidgetDimensions::unscaled.hsep_wide, 85), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, WidgetDimensions::unscaled.hsep_wide, 65), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, WidgetDimensions::unscaled.hsep_wide, 25), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, 10, 65), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, 10, 25), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - EndContainer(), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTON_SPACER), - NWidget(NWID_SPACER), SetMinimalSize(0, 8), EndContainer(), EndContainer(), }; @@ -495,23 +490,22 @@ static const NWidgetPart _nested_goal_question_widgets_error[] = { NWidget(WWT_CAPTION, COLOUR_RED, WID_GQ_CAPTION), SetDataTip(STR_GOAL_QUESTION_CAPTION_ERROR, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_RED), - NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetPadding(8, 8, 8, 8), SetFill(1, 0), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, 10, 85), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.modalpopup), + NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetFill(1, 0), + NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(85, WidgetDimensions::unscaled.hsep_wide, 85), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, WidgetDimensions::unscaled.hsep_wide, 65), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, WidgetDimensions::unscaled.hsep_wide, 25), SetPadding(WidgetDimensions::unscaled.vsep_wide, 0, 0, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), + EndContainer(), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(65, 10, 65), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(25, 10, 25), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_1), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_2), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GQ_BUTTON_3), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0), - EndContainer(), - EndContainer(), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTON_SPACER), - NWidget(NWID_SPACER), SetMinimalSize(0, 8), EndContainer(), EndContainer(), }; diff --git a/src/widgets/goal_widget.h b/src/widgets/goal_widget.h index 27c5cf7222..303eaa69e9 100644 --- a/src/widgets/goal_widget.h +++ b/src/widgets/goal_widget.h @@ -29,7 +29,6 @@ enum GoalQuestionWidgets { WID_GQ_BUTTON_1, ///< First button. WID_GQ_BUTTON_2, ///< Second button. WID_GQ_BUTTON_3, ///< Third button. - WID_GQ_BUTTON_SPACER, ///< Selection to hide extra padding if there are no buttons }; #endif /* WIDGETS_GOAL_WIDGET_H */ From 5ae5c35f38dcb776d7c40ed010b17dfb54529b44 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 25 Oct 2023 22:12:39 +0100 Subject: [PATCH 18/28] Codechange: Remove redundant WWT_PANEL from bootstrap error windows. --- src/bootstrap_gui.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp index eba6b55623..0082c60008 100644 --- a/src/bootstrap_gui.cpp +++ b/src/bootstrap_gui.cpp @@ -68,11 +68,9 @@ static const NWidgetPart _nested_bootstrap_errmsg_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CAPTION, COLOUR_GREY, WID_BEM_CAPTION), SetDataTip(STR_MISSING_GRAPHICS_ERROR_TITLE, STR_NULL), EndContainer(), - NWidget(WWT_PANEL, COLOUR_GREY), - NWidget(WWT_PANEL, COLOUR_GREY, WID_BEM_MESSAGE), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BEM_QUIT), SetDataTip(STR_MISSING_GRAPHICS_ERROR_QUIT, STR_NULL), SetFill(1, 0), - EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY, WID_BEM_MESSAGE), EndContainer(), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BEM_QUIT), SetDataTip(STR_MISSING_GRAPHICS_ERROR_QUIT, STR_NULL), SetFill(1, 0), EndContainer(), }; @@ -178,12 +176,10 @@ static const NWidgetPart _bootstrap_query_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_MISSING_GRAPHICS_SET_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), - NWidget(WWT_PANEL, COLOUR_GREY), - NWidget(WWT_PANEL, COLOUR_GREY, WID_BAFD_QUESTION), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BAFD_YES), SetDataTip(STR_MISSING_GRAPHICS_YES_DOWNLOAD, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BAFD_NO), SetDataTip(STR_MISSING_GRAPHICS_NO_QUIT, STR_NULL), - EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY, WID_BAFD_QUESTION), EndContainer(), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BAFD_YES), SetDataTip(STR_MISSING_GRAPHICS_YES_DOWNLOAD, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BAFD_NO), SetDataTip(STR_MISSING_GRAPHICS_NO_QUIT, STR_NULL), EndContainer(), }; From 7b4ecb52415f16fd4c776559e75729a2ddad7909 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 26 Oct 2023 18:38:26 +0000 Subject: [PATCH 19/28] Update: Translations from eints korean: 3 changes by telk5093 slovak: 1 change by legitalk polish: 4 changes by pAter-exe --- src/lang/korean.txt | 3 +++ src/lang/polish.txt | 6 ++++-- src/lang/slovak.txt | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 0de6f84f25..e2ba9c5972 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -925,6 +925,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}새로 STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}이 차량이 속한 차량 그룹 목록 열기 +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION}에서 이제 다음 화물을 받지 않습니다: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION}에서 이제 다음 화물을 받습니다: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}보조금 지급 종료:{}{}{1:STRING}에서 {2:STRING}까지의 {0:STRING} 수송은{}더 이상 보조금을 지급하지 않습니다. STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}보조금 지급 만료:{}{}{1:STRING}에서 {2:STRING}까지의{}{0:STRING} 수송 보조금은 더 이상 지급되지 않습니다. @@ -2193,6 +2195,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}최대 STR_CHEAT_CHANGE_DATE :{LTBLUE}날짜 변경: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}현재의 연도를 변경 STR_CHEAT_SETUP_PROD :{LTBLUE}1차 산업시설 생산량 조절 허용: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}역 등급을 항상 100%로 고정: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - 색상 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index f6c3b14c74..5bddc6d9ad 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1304,6 +1304,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Dostępn STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otwórz grupę okien skoncentrowanych na grupie pojazdów +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} już nie akceptuje: {CARGO_LIST.d} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} zaczyna akceptować: {CARGO_LIST.b} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Dotacja wygasła:{}{}{STRING} z {STRING} do {STRING} nie będzie już dotowane STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Koniec dotacji:{}{}Przewóz {STRING.d} z {STRING} do {STRING} nie jest już dotowany @@ -3342,7 +3344,7 @@ STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID :{BLACK}Siatka 3 STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM :{BLACK}Losowo # Fund new industry window -STR_FUND_INDUSTRY_CAPTION :{WHITE}Fundowanie przedsiębiorstwa +STR_FUND_INDUSTRY_CAPTION :{WHITE}Fundowanie Przedsiębiorstw STR_FUND_INDUSTRY_SELECTION_TOOLTIP :{BLACK}Wybierz przedsiębiorstwo z listy STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES :{BLACK}Utwórz losowe przedsiębiorstwa STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP :{BLACK}Pokryj mapę losowo położonymi przedsiębiorstwami @@ -3934,7 +3936,7 @@ STR_TOWN_VIEW_DELETE_TOOLTIP :{BLACK}Skasuj t STR_TOWN_VIEW_RENAME_TOWN_BUTTON :Zmień nazwę miasta # Town local authority window -STR_LOCAL_AUTHORITY_CAPTION :{WHITE}Lokalne władze m. {TOWN} +STR_LOCAL_AUTHORITY_CAPTION :{WHITE}{TOWN} - lokalne władze STR_LOCAL_AUTHORITY_ZONE :{BLACK}Strefa STR_LOCAL_AUTHORITY_ZONE_TOOLTIP :{BLACK}Pokaż strefę granic władz lokalnych STR_LOCAL_AUTHORITY_COMPANY_RATINGS :{BLACK}Ocena transportu firmy: diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 771e389bf5..cea9f4af8e 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -990,6 +990,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nov{G " STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Otvoriť okno skupiny zamerané na skupinu vozidla +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} teraz prijíma: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Ponuka dotácie skončila:{}{}Preprava {STRING.g} z {STRING} do {STRING} už nebude dotovaná STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Dotácie stiahnuté:{}{}Preprava {STRING.g} z {STRING} do {STRING} už nie je dotovaná From 7b376493a29f61a5af21f28ffbb3860ed5895ea7 Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 27 Oct 2023 18:38:08 +0000 Subject: [PATCH 20/28] Update: Translations from eints dutch: 3 changes by Afoklala french: 1 change by ottdfevr --- src/lang/dutch.txt | 3 +++ src/lang/french.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index b5277d81c6..f153cef98c 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -924,6 +924,8 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nieuw {S STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP :{BLACK}Groepsvenster openen met focus op groep van voertuig +STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST :{WHITE}{STATION} accepteert niet langer: {CARGO_LIST} +STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION} accepteert nu: {CARGO_LIST} STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidie ingetrokken:{}{}{STRING}route van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd @@ -2192,6 +2194,7 @@ STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT :{WHITE}Wijzig d STR_CHEAT_CHANGE_DATE :{LTBLUE}Datum wijzigen: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Huidig jaar wijzigen STR_CHEAT_SETUP_PROD :{LTBLUE}Productiewaarden aanpassen toestaan: {ORANGE}{STRING} +STR_CHEAT_STATION_RATING :{LTBLUE}Stationsscores vastzetten op 100%: {ORANGE}{STRING} # Livery window STR_LIVERY_CAPTION :{WHITE}{COMPANY} - kleurenschema diff --git a/src/lang/french.txt b/src/lang/french.txt index 17235a5973..641e8f33cd 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1041,7 +1041,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :Autre STR_GAME_OPTIONS_RESOLUTION_ITEM :{NUM}x{NUM} STR_GAME_OPTIONS_VIDEO_ACCELERATION :{BLACK}Accélération matérielle -STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP :{BLACK}Cochez cette case permet à OpenTTD d'utiliser l'accélération matérielle, si possible. Un paramètre modifié ne sera pris en compte qu'au redémarrage du jeu +STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP :{BLACK}Cocher cette case permet à OpenTTD d'utiliser l'accélération matérielle, si possible. Un paramètre modifié ne sera pris en compte qu'au redémarrage du jeu STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Les paramètres ne prendront effet qu'après le redémarrage du jeu STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync From 062c19830bbde5e1c7d1cbf3fd53d6261aa8d4e9 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 28 Oct 2023 16:08:08 +0100 Subject: [PATCH 21/28] Fix: OpenTTD can fail to exit on an error due to mutex locks in threads. (#11398) --- src/openttd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 8b05cfe9af..b1808316c5 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -121,7 +121,7 @@ void UserErrorI(const std::string &str) EM_ASM(if (window["openttd_abort"]) openttd_abort()); #endif - exit(1); + _exit(1); } /** From 129e98fbab17ac8af3e5f4224fa176da3a5cbdf5 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 28 Oct 2023 16:08:44 +0100 Subject: [PATCH 22/28] Fix d42a78f: Some raw drop down list strings may need token processing. (#11400) Storing the raw string without processing though GetString() caused token processing to be skipped. --- src/widgets/dropdown.cpp | 7 +++++++ src/widgets/dropdown_type.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 43be78dbec..bca67a504e 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -36,6 +36,13 @@ DropDownListStringItem::DropDownListStringItem(StringID string, int result, bool { } +DropDownListStringItem::DropDownListStringItem(const std::string &string, int result, bool masked) : DropDownListItem(result, masked) +{ + /* A raw string may contain parsable tokens, so it needs to be passed through GetString. */ + SetDParamStr(0, string); + this->string = GetString(STR_JUST_RAW_STRING); +} + uint DropDownListStringItem::Width() const { return GetStringBoundingBox(this->String()).width + WidgetDimensions::scaled.dropdowntext.Horizontal(); diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 19da6acfcd..424b9906ae 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -37,10 +37,10 @@ public: */ class DropDownListStringItem : public DropDownListItem { public: - const std::string string; ///< String of item + std::string string; ///< String of item DropDownListStringItem(StringID string, int result, bool masked); - DropDownListStringItem(const std::string &string, int result, bool masked) : DropDownListItem(result, masked), string(string) {} + DropDownListStringItem(const std::string &string, int result, bool masked); bool Selectable() const override { return true; } uint Width() const override; From c0aa9a5f87fef455521a0e95b05040dad777fc55 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 28 Oct 2023 19:07:50 +0100 Subject: [PATCH 23/28] Add: Debug tool to draw widget outlines. (#11401) This is considered a developer tool and is controlled from the help menu (or default hotkey Ctrl-O). This draws a white dashed outline around widgets. NWidgetSpacer and (unused) WWT_EMPTY widgets are also filled with check pattern to highlight them, as they usually indicate a design issue. --- src/lang/english.txt | 3 +- src/main_gui.cpp | 6 +++ src/toolbar_gui.cpp | 17 +++++++- src/toolbar_gui.h | 1 + src/widget.cpp | 97 +++++++++++++++++++++++++++++++------------- 5 files changed, 93 insertions(+), 31 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index a8ed981464..69e4f3c989 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delete all messages # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information STR_ABOUT_MENU_HELP :Help & manuals STR_ABOUT_MENU_SEPARATOR : @@ -533,6 +533,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :About 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite aligner STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Toggle bounding boxes STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Toggle colouring of dirty blocks +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Toggle widget outlines # Place in highscore window ###length 15 diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 36578e4672..ec1648b08d 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -186,6 +186,7 @@ enum { GHK_CONSOLE, GHK_BOUNDING_BOXES, GHK_DIRTY_BLOCKS, + GHK_WIDGET_OUTLINES, GHK_CENTER, GHK_CENTER_ZOOM, GHK_RESET_OBJECT_TO_PLACE, @@ -307,6 +308,10 @@ struct MainWindow : Window case GHK_DIRTY_BLOCKS: ToggleDirtyBlocks(); return ES_HANDLED; + + case GHK_WIDGET_OUTLINES: + ToggleWidgetOutlines(); + return ES_HANDLED; } if (_game_mode == GM_MENU) return ES_NOT_HANDLED; @@ -467,6 +472,7 @@ struct MainWindow : Window Hotkey(WKC_BACKQUOTE, "console", GHK_CONSOLE), Hotkey('B' | WKC_CTRL, "bounding_boxes", GHK_BOUNDING_BOXES), Hotkey('I' | WKC_CTRL, "dirty_blocks", GHK_DIRTY_BLOCKS), + Hotkey('O' | WKC_CTRL, "widget_outlines", GHK_WIDGET_OUTLINES), Hotkey('C', "center", GHK_CENTER), Hotkey('Z', "center_zoom", GHK_CENTER_ZOOM), Hotkey(WKC_ESC, "reset_object_to_place", GHK_RESET_OBJECT_TO_PLACE), diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 23d2c73929..2fa08a805f 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1100,7 +1100,7 @@ static CallBackFunction PlaceLandBlockInfo() static CallBackFunction ToolbarHelpClick(Window *w) { - PopupMainToolbMenu(w, _game_mode == GM_EDITOR ? (int)WID_TE_HELP : (int)WID_TN_HELP, STR_ABOUT_MENU_LAND_BLOCK_INFO, _settings_client.gui.newgrf_developer_tools ? 11 : 8); + PopupMainToolbMenu(w, _game_mode == GM_EDITOR ? (int)WID_TE_HELP : (int)WID_TN_HELP, STR_ABOUT_MENU_LAND_BLOCK_INFO, _settings_client.gui.newgrf_developer_tools ? 12 : 8); return CBF_NONE; } @@ -1138,6 +1138,20 @@ void ToggleDirtyBlocks() } } +/** + * Toggle drawing of widget outlihes. + * @note has only an effect when newgrf_developer_tools are active. + */ +void ToggleWidgetOutlines() +{ + extern bool _draw_widget_outlines; + /* Always allow to toggle them off */ + if (_settings_client.gui.newgrf_developer_tools || _draw_widget_outlines) { + _draw_widget_outlines = !_draw_widget_outlines; + MarkWholeScreenDirty(); + } +} + /** * Set the starting year for a scenario. * @param year New starting year. @@ -1169,6 +1183,7 @@ static CallBackFunction MenuClickHelp(int index) case 8: ShowSpriteAlignerWindow(); break; case 9: ToggleBoundingBoxes(); break; case 10: ToggleDirtyBlocks(); break; + case 11: ToggleWidgetOutlines(); break; } return CBF_NONE; } diff --git a/src/toolbar_gui.h b/src/toolbar_gui.h index cede0a7c19..4c3f4360db 100644 --- a/src/toolbar_gui.h +++ b/src/toolbar_gui.h @@ -56,6 +56,7 @@ enum MainToolbarHotkeys { void AllocateToolbar(); void ToggleBoundingBoxes(); void ToggleDirtyBlocks(); +void ToggleWidgetOutlines(); extern uint _toolbar_width; diff --git a/src/widget.cpp b/src/widget.cpp index 3d8ad479e1..ebeefc55aa 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -915,6 +915,18 @@ int Window::SortButtonWidth() return NWidgetScrollbar::GetVerticalDimension().width + 1; } +bool _draw_widget_outlines; + +void DrawOutline(const Window *, const NWidgetBase *wid) +{ + if (!_draw_widget_outlines || wid->current_x == 0 || wid->current_y == 0) return; + + Rect r = wid->GetCurrentRect(); + GfxDrawLine(r.left, r.top, r.right, r.top, PC_WHITE, 1, 4); + GfxDrawLine(r.left, r.top, r.left, r.bottom, PC_WHITE, 1, 4); + GfxDrawLine(r.right, r.top, r.right, r.bottom, PC_WHITE, 1, 4); + GfxDrawLine(r.left, r.bottom, r.right, r.bottom, PC_WHITE, 1, 4); +} /** * @defgroup NestedWidgets Hierarchical widgets @@ -1308,6 +1320,8 @@ void NWidgetContainer::Draw(const Window *w) for (NWidgetBase *child_wid = this->head; child_wid != nullptr; child_wid = child_wid->next) { child_wid->Draw(w); } + + DrawOutline(w, this); } NWidgetCore *NWidgetContainer::GetWidgetFromPos(int x, int y) @@ -1420,6 +1434,7 @@ void NWidgetStacked::Draw(const Window *w) for (NWidgetBase *child_wid = this->head; child_wid != nullptr; plane++, child_wid = child_wid->next) { if (plane == this->shown_plane) { child_wid->Draw(w); + DrawOutline(w, this); return; } } @@ -1849,9 +1864,16 @@ void NWidgetSpacer::FillNestedArray(NWidgetBase **, uint) { } -void NWidgetSpacer::Draw(const Window *) +void NWidgetSpacer::Draw(const Window *w) { - /* Spacer widget is never visible. */ + /* Spacer widget is never normally visible. */ + + if (_draw_widget_outlines && this->current_x != 0 && this->current_y != 0) { + /* Spacers indicate a potential design issue, so get extra highlighting. */ + GfxFillRect(this->GetCurrentRect(), PC_WHITE, FILLRECT_CHECKER); + + DrawOutline(w, this); + } } void NWidgetSpacer::SetDirty(const Window *) const @@ -2030,39 +2052,44 @@ NWidgetCore *NWidgetMatrix::GetWidgetFromPos(int x, int y) bool rtl = _current_text_dir == TD_RTL; DrawPixelInfo tmp_dpi; if (!FillDrawPixelInfo(&tmp_dpi, this->pos_x + (rtl ? this->pip_post : this->pip_pre), this->pos_y + this->pip_pre, this->current_x - this->pip_pre - this->pip_post, this->current_y - this->pip_pre - this->pip_post)) return; - AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); - - /* Get the appropriate offsets so we can draw the right widgets. */ - NWidgetCore *child = dynamic_cast(this->head); - assert(child != nullptr); - int start_x, start_y, base_offs_x, base_offs_y; - this->GetScrollOffsets(start_x, start_y, base_offs_x, base_offs_y); - int offs_y = base_offs_y; - for (int y = start_y; y < start_y + this->widgets_y + 1; y++, offs_y += this->widget_h) { - /* Are we within bounds? */ - if (offs_y + child->smallest_y <= 0) continue; - if (offs_y >= (int)this->current_y) break; + { + AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); - /* We've passed our amount of widgets. */ - if (y * this->widgets_x >= this->count) break; + /* Get the appropriate offsets so we can draw the right widgets. */ + NWidgetCore *child = dynamic_cast(this->head); + assert(child != nullptr); + int start_x, start_y, base_offs_x, base_offs_y; + this->GetScrollOffsets(start_x, start_y, base_offs_x, base_offs_y); - int offs_x = base_offs_x; - for (int x = start_x; x < start_x + this->widgets_x + 1; x++, offs_x += rtl ? -this->widget_w : this->widget_w) { + int offs_y = base_offs_y; + for (int y = start_y; y < start_y + this->widgets_y + 1; y++, offs_y += this->widget_h) { /* Are we within bounds? */ - if (offs_x + child->smallest_x <= 0) continue; - if (offs_x >= (int)this->current_x) continue; - - /* Do we have this many widgets? */ - int sub_wid = y * this->widgets_x + x; - if (sub_wid >= this->count) break; - - child->AssignSizePosition(ST_RESIZE, offs_x, offs_y, child->smallest_x, child->smallest_y, rtl); - child->SetLowered(this->clicked == sub_wid); - SB(child->index, 16, 16, sub_wid); - child->Draw(w); + if (offs_y + child->smallest_y <= 0) continue; + if (offs_y >= (int)this->current_y) break; + + /* We've passed our amount of widgets. */ + if (y * this->widgets_x >= this->count) break; + + int offs_x = base_offs_x; + for (int x = start_x; x < start_x + this->widgets_x + 1; x++, offs_x += rtl ? -this->widget_w : this->widget_w) { + /* Are we within bounds? */ + if (offs_x + child->smallest_x <= 0) continue; + if (offs_x >= (int)this->current_x) continue; + + /* Do we have this many widgets? */ + int sub_wid = y * this->widgets_x + x; + if (sub_wid >= this->count) break; + + child->AssignSizePosition(ST_RESIZE, offs_x, offs_y, child->smallest_x, child->smallest_y, rtl); + child->SetLowered(this->clicked == sub_wid); + SB(child->index, 16, 16, sub_wid); + child->Draw(w); + } } } + + DrawOutline(w, this); } /** @@ -2275,6 +2302,8 @@ void NWidgetBackground::Draw(const Window *w) if (this->IsDisabled()) { GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[this->colour & 0xF][2], FILLRECT_CHECKER); } + + DrawOutline(w, this); } NWidgetCore *NWidgetBackground::GetWidgetFromPos(int x, int y) @@ -2328,6 +2357,8 @@ void NWidgetViewport::Draw(const Window *w) GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, (this->disp_flags & ND_SHADE_DIMMED) ? PALETTE_TO_TRANSPARENT : PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); } + + DrawOutline(w, this); } /** @@ -2527,6 +2558,8 @@ void NWidgetScrollbar::Draw(const Window *w) if (this->IsDisabled()) { GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[this->colour & 0xF][2], FILLRECT_CHECKER); } + + DrawOutline(w, this); } /* static */ void NWidgetScrollbar::InvalidateDimensionCache() @@ -2872,6 +2905,10 @@ void NWidgetLeaf::Draw(const Window *w) bool clicked = this->IsLowered(); switch (this->type) { case WWT_EMPTY: + /* WWT_EMPTY used as a spacer indicates a potential design issue. */ + if (this->index == -1 && _draw_widget_outlines) { + GfxFillRect(r, PC_BLACK, FILLRECT_CHECKER); + } break; case WWT_PUSHBTN: @@ -2979,6 +3016,8 @@ void NWidgetLeaf::Draw(const Window *w) if (this->IsDisabled()) { GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[this->colour & 0xF][2], FILLRECT_CHECKER); } + + DrawOutline(w, this); } /** From 9e6ea16ca79805269685c2323a87562ac79fc8fc Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 28 Oct 2023 18:37:45 +0000 Subject: [PATCH 24/28] Update: Translations from eints --- 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/chuvash.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/hindi.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/ido.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/macedonian.txt | 2 +- src/lang/malay.txt | 2 +- src/lang/maltese.txt | 2 +- src/lang/marathi.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/urdu.txt | 2 +- src/lang/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- 64 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index b4326b3c01..d8b8bd7397 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -483,7 +483,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Boodskapgeskied STR_NEWS_MENU_DELETE_ALL_MESSAGES :Vee alle boodskappe uit # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Terreininligting STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Skakel terminaal diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index a6cefea289..a9bed1ff7c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -483,7 +483,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :الرسائل STR_NEWS_MENU_DELETE_ALL_MESSAGES :احذف كل الرسائل # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :معلومات مربع في الخريطة STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :توقل كونسول diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 4d4e700f28..ad9da0d302 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -470,7 +470,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Azken mezua/alb STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mezuen historia # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Lur arearen informazioa STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsola aktibatu diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 2c0e135195..26e579233d 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -792,7 +792,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Гісторы STR_NEWS_MENU_DELETE_ALL_MESSAGES :Выдаліць усе паведамленьні # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Зьвесткі аб зямлі STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Кансоль diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 14d2b73b5b..56f44498d4 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de M STR_NEWS_MENU_DELETE_ALL_MESSAGES :Apagar todas as mensagens # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informação da área do terreno STR_ABOUT_MENU_HELP :Ajuda & manuais STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 5e7613290d..aa72e586e0 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -475,7 +475,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :История STR_NEWS_MENU_DELETE_ALL_MESSAGES :Изтрий всички съобщения # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Информация за терена STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Показване/скриване на конзола diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 5c5cc88bd9..e1dba69756 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de mi STR_NEWS_MENU_DELETE_ALL_MESSAGES :Esborra tots els missatges # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informació de la casella STR_ABOUT_MENU_HELP :Ajuda i manuals STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index 329662ba1c..d1c4d29734 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -281,7 +281,7 @@ STR_TOOLBAR_SOUND_MUSIC :Сасӑ/Юрӑ ###length 3 # About menu -###length 11 +###length 12 STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_SCREENSHOT :Экран сӑнӗ STR_ABOUT_MENU_ABOUT_OPENTTD :'OpenTTD' çинчен diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index af8aa8195a..703afef72c 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -581,7 +581,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Povijest poruka STR_NEWS_MENU_DELETE_ALL_MESSAGES :Obriši sve poruke # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Podaci o zemljištu STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Otvori konzolu diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0c4ffad213..12db381041 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -582,7 +582,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historie zpráv STR_NEWS_MENU_DELETE_ALL_MESSAGES :Smazat všechny zprávy # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informace o zemi STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Zobrazit nebo skrýt konzoli diff --git a/src/lang/danish.txt b/src/lang/danish.txt index ceb80202de..616d4251ce 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidligere beske STR_NEWS_MENU_DELETE_ALL_MESSAGES :Slet alle beskeder # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landområde information STR_ABOUT_MENU_HELP :Hjælp & manualer STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index f153cef98c..2f9e9cc589 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berichtengeschi STR_NEWS_MENU_DELETE_ALL_MESSAGES :Alle berichten verwijderen # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landinformatie STR_ABOUT_MENU_HELP :Help en handleidingen STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 23f0e3d51b..a56f3ed364 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delete all messages # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information STR_ABOUT_MENU_HELP :Help & manuals STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index ceb896a25a..25247bc434 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delete all messages # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information STR_ABOUT_MENU_HELP :Help & manuals STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index ae5ffd4564..088b7b3856 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -584,7 +584,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mesaĝa Histori STR_NEWS_MENU_DELETE_ALL_MESSAGES :Forigu ĉiujn mesaĝojn # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landkvadrataj informoj STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Baskuligi Konzolon diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 764c40eaa5..bbb5263e74 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -560,7 +560,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Teadete ajalugu STR_NEWS_MENU_DELETE_ALL_MESSAGES :Kustuta kõik teated # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Maa-ala andmed STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Lülita konsool sisse/välja diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 36ae981bd5..f9b602fb66 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -452,7 +452,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Seinastu boð/t STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Boð søga # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landa økis kunning STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Console opið ella lukka diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index e178dcfae9..0a0ba06aab 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Viestihistoria STR_NEWS_MENU_DELETE_ALL_MESSAGES :Poista kaikki viestit # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Maa-alueen tiedot STR_ABOUT_MENU_HELP :Ohjeet ja oppaat STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/french.txt b/src/lang/french.txt index 641e8f33cd..cca9d22e6a 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historique des STR_NEWS_MENU_DELETE_ALL_MESSAGES :Effacer tous les messages # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Outil d'inspection du paysage STR_ABOUT_MENU_HELP :Aide et manuels STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 01e4102390..78d5428cb0 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -475,7 +475,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Lêtste (nijs)b STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berjochtenskiednis # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gebietsynformaasje STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Skeakel console oan/ût diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 75675ec84d..a07f94f5d3 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -662,7 +662,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Am brath/aithri STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Eachdraidh nam brath # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Fiosrachadh raon tìre STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Toglaich a' chonsoil diff --git a/src/lang/galician.txt b/src/lang/galician.txt index c382a18147..6b6e1990a2 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -505,7 +505,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de me STR_NEWS_MENU_DELETE_ALL_MESSAGES :Borrar tódalas mensaxes # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Información de área de terreo STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :(Des)Activar consola diff --git a/src/lang/german.txt b/src/lang/german.txt index 082a325684..a5c0e25b4e 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Vergangene Nach STR_NEWS_MENU_DELETE_ALL_MESSAGES :Alle Nachrichten löschen # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gebietsinformationen STR_ABOUT_MENU_HELP :Hilfe u. Anleitungen STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/greek.txt b/src/lang/greek.txt index d638ce30e5..500cd421d2 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -563,7 +563,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Ιστορικ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Διαγραφή όλων των μηνυμάτων # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Πληροφορίες περιοχής εδάφους STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Εναλλαγή κονσόλας diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 37808e9c00..e409829af8 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -491,7 +491,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :הודעה אח STR_NEWS_MENU_MESSAGE_HISTORY_MENU :היסטורית הודעות # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :מידע על שטח קרקע STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :פתח/סגור קונסולה diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index 6c2169836c..a5da9e538d 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -170,7 +170,7 @@ STR_RAIL_MENU_ELRAIL_CONSTRUCTION :विद्य ###length 3 # About menu -###length 11 +###length 12 STR_ABOUT_MENU_SEPARATOR : # Place in highscore window diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 2aa0d99cbd..71a80eed18 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -570,7 +570,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Előző üzenet STR_NEWS_MENU_DELETE_ALL_MESSAGES :Az összes üzenet törlése # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Terület-információ STR_ABOUT_MENU_HELP :Súgó és útmutatók STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index ded7f91cba..6019a057c5 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -452,7 +452,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Síðustu skila STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Saga skilaboða # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landssvæðisupplýsingar STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Kveikja á stýriskjá diff --git a/src/lang/ido.txt b/src/lang/ido.txt index a1b482dcba..7afdd71629 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -346,7 +346,7 @@ STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Livrita kargajo ###length 3 # About menu -###length 11 +###length 12 # Place in highscore window ###length 15 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 31f89c66c1..b953427541 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -507,7 +507,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berita Lampau STR_NEWS_MENU_DELETE_ALL_MESSAGES :Hapus semua pesan # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informasi area daratan STR_ABOUT_MENU_HELP :Bantuan & panduan STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/irish.txt b/src/lang/irish.txt index b8cb62430a..7aac54a49c 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -492,7 +492,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Stair na dteach STR_NEWS_MENU_DELETE_ALL_MESSAGES :Scrios gach teachtaireacht # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Faisnéis faoin limistéar talún STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Scoránaigh consól diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 06348ee053..9a9e3970c9 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -523,7 +523,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Cronologia mess STR_NEWS_MENU_DELETE_ALL_MESSAGES :Elimina tutti i messaggi # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informazioni sull'area di terreno STR_ABOUT_MENU_HELP :Aiuto e manuali STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 7538a96484..d123ba4f21 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -504,7 +504,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :メッセージ STR_NEWS_MENU_DELETE_ALL_MESSAGES :メッセージをすべて削除 # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :地域情報 STR_ABOUT_MENU_SEPARATOR :――――――――――――――――― STR_ABOUT_MENU_TOGGLE_CONSOLE :コンソールの表示切替 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index e2ba9c5972..368451cdb5 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :과거 메시 STR_NEWS_MENU_DELETE_ALL_MESSAGES :모든 뉴스 메시지 삭제 # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :지형 정보 STR_ABOUT_MENU_HELP :도움말 & 매뉴얼 STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 8b50d75df6..82a7e4dd80 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -665,7 +665,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historia nuntio STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delere omnia nuntia # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Terrae regionis indicia STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Monstrare celareve consolam diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 89c799a510..86ce8feef1 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -505,7 +505,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Ziņojumu vēst STR_NEWS_MENU_DELETE_ALL_MESSAGES :Dzēst visus ziņojumus # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Zemes platības informācija STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Atvērt/aizvērt konsoli diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index bdf66b8d25..77cf804e6b 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -694,7 +694,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Žinučių isto STR_NEWS_MENU_DELETE_ALL_MESSAGES :Pašalinti visas žinutes # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Žemės ploto informacija STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Perjungti konsolę diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index c1d2a414ee..e7b1321b14 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -503,7 +503,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Meldungshistori STR_NEWS_MENU_DELETE_ALL_MESSAGES :All Message läschen # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landinformatiounen STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsole un/aus diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index 7d840209de..eaa70c8a85 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -448,7 +448,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последн STR_NEWS_MENU_MESSAGE_HISTORY_MENU :порака историјата # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Земјиште во областа STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Вклучи конзола diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 973a3cf2d4..d234b58679 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -456,7 +456,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pesanan/laporan STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Pesanan sebelumnya # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Maklumat kawasan tanah STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Papar atau padamkan konsol diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 673b8acdbb..0fa42e5c7f 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -315,7 +315,7 @@ STR_FILE_MENU_SEPARATOR : ###length 3 # About menu -###length 11 +###length 12 # Place in highscore window ###length 15 diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index 98aea1175d..5e3d814f55 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -442,7 +442,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :शेवटच STR_NEWS_MENU_MESSAGE_HISTORY_MENU :निरोपांचा इतिहास # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :जागाची माहिती STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_SCREENSHOT :द्श्य diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 0d31c09f6e..f1cb121c0b 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -496,7 +496,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidligere meldi STR_NEWS_MENU_DELETE_ALL_MESSAGES :Slett alle meldinger # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informasjon om landområde STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Vis/skjul konsoll diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 65281d60c5..6396d9cdd2 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -476,7 +476,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Siste melding/n STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidlegare meldingar # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informasjon om landområde STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Syne/gøym konsoll diff --git a/src/lang/persian.txt b/src/lang/persian.txt index c35a3c27c6..7163df809e 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -465,7 +465,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :گزارش آخ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :تاریخچه پیام ها # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :اطلاعات زمین ها STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :باز و بسته کردن کنسول diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 5bddc6d9ad..06415c8638 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -900,7 +900,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Poprzednie wiad STR_NEWS_MENU_DELETE_ALL_MESSAGES :Usuń wszystkie wiadomości # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informacje o terenie STR_ABOUT_MENU_HELP :Pomoc i instrukcje STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 3849dd48e6..0778d57bca 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de m STR_NEWS_MENU_DELETE_ALL_MESSAGES :Apagar todas as mensagens # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informações do terreno STR_ABOUT_MENU_HELP :Ajuda & manuais STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 9bd81beac8..8cba1351bb 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Lista ultimelor STR_NEWS_MENU_DELETE_ALL_MESSAGES :Șterge toate mesajele # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informaţii despre teren STR_ABOUT_MENU_HELP :Ajutor și manuale STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 581cf3d78a..b788d9b1a2 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -647,7 +647,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :История STR_NEWS_MENU_DELETE_ALL_MESSAGES :Удалить все сообщения # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Информация об участке земли STR_ABOUT_MENU_HELP :Помощь и документация STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 66d8bb03a2..6525e3286b 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -691,7 +691,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Istorija Obave STR_NEWS_MENU_DELETE_ALL_MESSAGES :Obriši sve poruke # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Podaci o zemljištu STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Uključi/isključi konzolu diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 797ac1c6a3..821e910479 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :消息历史 STR_NEWS_MENU_DELETE_ALL_MESSAGES :删除全部消息 # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :查询地块信息 STR_ABOUT_MENU_HELP :帮助和指南 STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index cea9f4af8e..d1fe9a8785 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -584,7 +584,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Archív správ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Vymazať všetky správy # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informácie o pozemku STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Zobraziť / skryť konzolu diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index fb6d0ea0a3..56c69fb6b2 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -628,7 +628,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Zadnje sporoči STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Zgodovina sporočil # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informacije o terenu STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Vklopi/Izklopi konzolo diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index f6d78a7abd..58d329f0a9 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -504,7 +504,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de me STR_NEWS_MENU_DELETE_ALL_MESSAGES :Borrar todos los mensajes # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Información del terreno STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Activar consola diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index bbadbdcc55..4a31e7f40a 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -504,7 +504,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de me STR_NEWS_MENU_DELETE_ALL_MESSAGES :Eliminar todos los mensajes # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Información sobre área de terreno STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Activar consola diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index b84763ea53..478f309883 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Meddelandehisto STR_NEWS_MENU_DELETE_ALL_MESSAGES :Ta bort alla meddelanden # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Information om mark STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Visa/dölj konsolen diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 1160675b29..7a4f02b2c8 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -485,7 +485,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :செய்த STR_NEWS_MENU_DELETE_ALL_MESSAGES :எல்லா செய்திகளையும் நீக்கு # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :நிலா பகுதி விவரம் STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :முனையத்தை மாற்று diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 1315f2ed37..1586f81db9 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -479,7 +479,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :ข้อคว STR_NEWS_MENU_MESSAGE_HISTORY_MENU :ดูข้อความย้อนหลัง # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :ข้อมูลพื้นที่ STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :เปิด/ปิด คอนโซล diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index debb93cc14..687168f8c7 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :訊息記錄 STR_NEWS_MENU_DELETE_ALL_MESSAGES :刪除所有訊息 # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :土地資訊 STR_ABOUT_MENU_HELP :幫助和手冊 STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 385974049c..c9ecae5e6c 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -522,7 +522,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mesaj geçmişi STR_NEWS_MENU_DELETE_ALL_MESSAGES :Tüm mesajları sil # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Arazi bilgisi STR_ABOUT_MENU_HELP :Yardım & Kılavuzlar STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 5c1a77074c..8075c848b1 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -629,7 +629,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Історія STR_NEWS_MENU_DELETE_ALL_MESSAGES :Видалити всі повідомлення # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Інформація про ділянку STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Вкл./відкл. консоль diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 5a1b33a8aa..383cad3bae 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -456,7 +456,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :پچھلا پی STR_NEWS_MENU_MESSAGE_HISTORY_MENU :تاریخِ پیغامات # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :زمینی رقبہ کی معلومات STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :حائطھ تدویم diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 522f624c70..bae206f1c0 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -521,7 +521,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Thông báo cũ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Xoá tất cả thông điệp # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Thông tin vùng đất STR_ABOUT_MENU_HELP :Trợ giúp & hướng dẫn STR_ABOUT_MENU_SEPARATOR : diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 6adac2e441..56a4db3ec0 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -482,7 +482,7 @@ STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Neges/Adroddiad STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Hanes negeseuon # About menu -###length 11 +###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gwybodaeth ardal tir STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Toglu Consol From 40f52afac21110da554700150540c345ff23fd92 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 29 Oct 2023 18:37:50 +0000 Subject: [PATCH 25/28] Update: Translations from eints indonesian: 1 change by liimee russian: 2 changes by Ln-Wolf finnish: 1 change by hpiirai danish: 1 change by bscargo french: 1 change by ottdfevr portuguese (brazilian): 1 change by pasantoro --- src/lang/brazilian_portuguese.txt | 1 + src/lang/danish.txt | 1 + src/lang/finnish.txt | 1 + src/lang/french.txt | 1 + src/lang/indonesian.txt | 1 + src/lang/russian.txt | 3 ++- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 56f44498d4..ed8c6bbba2 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -534,6 +534,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :Sobre 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Alinhador de "sprites" STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Alternar caixas limítrofes STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Alterna a colorização dos blocos sujos +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Alterna o contorno do elemento # Place in highscore window ###length 15 diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 616d4251ce..dd1ff3b8a3 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -533,6 +533,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :Om 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite justering STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Slå afgrænsningsrammerne til/fra STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Slå farvning af beskidte blokke til/fra +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Skift widget konturer # Place in highscore window ###length 15 diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 0a0ba06aab..2732555dd3 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -533,6 +533,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :Tietoja OpenTTD STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite-kohdistaja STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Rajakehikot päälle/pois STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Likaisten lohkojen värjäys päälle/pois +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Käyttöliittymäkomponenttien ääriviivat päälle/pois # Place in highscore window ###length 15 diff --git a/src/lang/french.txt b/src/lang/french.txt index cca9d22e6a..f690e21da6 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -534,6 +534,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :À propos d'Ope STR_ABOUT_MENU_SPRITE_ALIGNER :Alignement de sprite STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Afficher/Cacher les boites de dimensions maximum STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Activer/Désactiver la colorisation des blocs foireux +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Afficher/Cacher la bordure des fenêtres # Place in highscore window ###length 15 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index b953427541..e7663af051 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -191,6 +191,7 @@ STR_COLOUR_WHITE :Putih STR_COLOUR_RANDOM :Acak ###length 17 +STR_COLOUR_SECONDARY_DARK_BLUE :Biru Tua STR_COLOUR_SECONDARY_PALE_GREEN :Hijau Pucat STR_COLOUR_SECONDARY_SECONDARY_PINK :Merah Muda STR_COLOUR_SECONDARY_BROWN :Cokelat diff --git a/src/lang/russian.txt b/src/lang/russian.txt index b788d9b1a2..3f4100355a 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -658,7 +658,8 @@ STR_ABOUT_MENU_SHOW_FRAMERATE :Информа STR_ABOUT_MENU_ABOUT_OPENTTD :Об игре STR_ABOUT_MENU_SPRITE_ALIGNER :Выравнивание спрайтов STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Переключить ограничивающие рамки -STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Подкрашивать блоки, требующие перерисовки +STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Подкраска блоков, требующих перерисовки +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Выделение границ виджетов # Place in highscore window ###length 15 From 186829b99f102ec66272a463b622af38ff007d00 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 30 Oct 2023 18:38:55 +0000 Subject: [PATCH 26/28] Update: Translations from eints english (au): 1 change by krysclarke dutch: 1 change by TrueBrain portuguese: 1 change by azulcosta polish: 4 changes by pAter-exe --- src/lang/dutch.txt | 2 +- src/lang/english_AU.txt | 1 + src/lang/polish.txt | 7 ++++--- src/lang/portuguese.txt | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 2f9e9cc589..1734ccd0e9 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -297,7 +297,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Wanneer STR_BUTTON_DEFAULT :{BLACK}Standaard STR_BUTTON_CANCEL :{BLACK}Annuleren STR_BUTTON_OK :{BLACK}OK -STR_WARNING_PASSWORD_SECURITY :{YELLOW}Waarschuwing: het kan zijn dat serverbeheerders tekst niet kunnen lezen die hier wordt ingevoerd. +STR_WARNING_PASSWORD_SECURITY :{YELLOW}Waarschuwing: het kan zijn dat serverbeheerders de tekst kunnen lezen die hier is ingevoerd. # On screen keyboard window STR_OSK_KEYBOARD_LAYOUT :`1234567890-=\qwertyuiop[]asdfghjkl;' zxcvbnm,./ . diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index a56f3ed364..27e2cd00ec 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -533,6 +533,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :About 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite aligner STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Toggle bounding boxes STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Toggle colouring of dirty blocks +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Toggle widget outlines # Place in highscore window ###length 15 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 06415c8638..223416a0a5 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -904,7 +904,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Usuń wszystkie STR_ABOUT_MENU_LAND_BLOCK_INFO :Informacje o terenie STR_ABOUT_MENU_HELP :Pomoc i instrukcje STR_ABOUT_MENU_SEPARATOR : -STR_ABOUT_MENU_TOGGLE_CONSOLE :Przełącz konsolę +STR_ABOUT_MENU_TOGGLE_CONSOLE :Włącz/wyłącz konsolę STR_ABOUT_MENU_AI_DEBUG :Debugowanie SI / Game Script STR_ABOUT_MENU_SCREENSHOT :Zrzut ekranu STR_ABOUT_MENU_SHOW_FRAMERATE :Wyświetl liczbę klatek na sekundę @@ -912,6 +912,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :Informacje o STR_ABOUT_MENU_SPRITE_ALIGNER :Wyrównywanie sprite'ów STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Włącz/wyłącz ramki STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Włącz/wyłącz kolorowanie brudnych bloków +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Włącz/wyłącz obrysy widżetów # Place in highscore window ###length 15 @@ -1424,7 +1425,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP :{BLACK}Zaznacz STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Ustawienie to zacznie obowiązywać dopiero po ponownym uruchomieniu gry. STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}Synchronizacja pionowa -STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Zaznacz to pole aby włączyć synchronizację pionową. Zmiany zostaną zastosowane po restarcie gry. Działa tylko z włączoną akceleracją sprzętową. +STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Zaznacz to pole aby włączyć synchronizację pionową. Zmiany zostaną zastosowane po restarcie gry. Działa tylko z włączonym przyspieszeniem sprzętowym. STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Bieżący sterownik: {STRING} @@ -2489,7 +2490,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Nie powi # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Błąd ustawień obrazu... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... nie znaleziono kompatybilnego procesora graficznego. Przyspieszenie sprzętowe wyłączone. -STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Sterownik GPU spowodował awarię gry. Wyłączono akcelerację sprzętową +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Sterownik GPU spowodował awarię gry. Wyłączono przyspieszenie sprzętowe # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 0778d57bca..ee3a92f01b 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -534,6 +534,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD :Sobre o 'OpenTT STR_ABOUT_MENU_SPRITE_ALIGNER :Alinhador de gráficos STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Alternar as caixas envolventes STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS :Ativar coloração de blocos sujos +STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES :Alternar contornos de "widget" # Place in highscore window ###length 15 From a8aba06a0741de65452e22958721b8aec11d5a51 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 30 Oct 2023 18:31:53 +0000 Subject: [PATCH 27/28] Fix: Insufficient space for labels on smallmap legend. --- src/smallmap_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 83ac2b5e08..10c93405fc 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1186,7 +1186,7 @@ void SmallMapWindow::RebuildColourIndexIfNecessary() this->legend_width = (FONT_HEIGHT_SMALL - ScaleGUITrad(1)) * 8 / 5; /* The width of a column is the minimum width of all texts + the size of the blob + some spacing */ - this->column_width = min_width + this->legend_width + WidgetDimensions::scaled.framerect.Horizontal(); + this->column_width = min_width + WidgetDimensions::scaled.hsep_normal + this->legend_width + WidgetDimensions::scaled.framerect.Horizontal(); } /* virtual */ void SmallMapWindow::OnPaint() From 2d3fef31131c2d9981265664c1581ca11dc2c2d3 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 30 Oct 2023 18:34:24 +0000 Subject: [PATCH 28/28] Fix: Incorrect padding for smallmap legend 'icon'. The size of this icon is based off FONT_HEIGHT_SMALL - 1, so it makes sense to use a scaled 1 here. --- src/smallmap_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 10c93405fc..7ff1c62dfe 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1222,7 +1222,7 @@ void SmallMapWindow::RebuildColourIndexIfNecessary() bool rtl = _current_text_dir == TD_RTL; uint i = 0; // Row counter for industry legend. uint row_height = FONT_HEIGHT_SMALL; - int padding = WidgetDimensions::scaled.hsep_normal; + int padding = ScaleGUITrad(1); Rect origin = r.WithWidth(this->column_width, rtl).Shrink(WidgetDimensions::scaled.framerect).WithHeight(row_height); Rect text = origin.Indent(this->legend_width + WidgetDimensions::scaled.hsep_normal, rtl);