Update: Translations from eints

danish: 1 change by bscargo
polish: 1 change by pAter-exe

src/autoreplace_gui.cpp

@@ -270,6 +270,21 @@ class ReplaceVehicleWindow : public Window {
 		Command<CMD_SET_AUTOREPLACE>::Post(this->sel_group, veh_from, veh_to, replace_when_old);
 	}
 
+	/**
+	 * Perform tasks after rail or road type is changed.
+	 */
+	void OnRailRoadTypeChange()
+	{
+		/* Reset scrollbar positions */
+		this->vscroll[0]->SetPosition(0);
+		this->vscroll[1]->SetPosition(0);
+		/* Rebuild the lists */
+		this->engines[0].ForceRebuild();
+		this->engines[1].ForceRebuild();
+		this->reset_sel_engine = true;
+		this->SetDirty();
+	}
+
 public:
 	ReplaceVehicleWindow(WindowDesc *desc, VehicleType vehicletype, GroupID id_g) : Window(desc)
 	{
@@ -294,11 +309,6 @@ public:
 		widget->SetLowered(this->show_hidden_engines);
 		this->FinishInitNested(vehicletype);
 
-		if (vehicletype == VEH_TRAIN || vehicletype == VEH_ROAD) {
-			widget = this->GetWidget<NWidgetCore>(WID_RV_RAIL_ROAD_TYPE_DROPDOWN);
-			widget->tool_tip = STR_REPLACE_HELP_RAILTYPE + vehicletype;
-		}
-
 		this->sort_criteria = _engine_sort_last_criteria[vehicletype];
 		this->descending_sort_order = _engine_sort_last_order[vehicletype];
 		this->owner = _local_company;
@@ -357,28 +367,21 @@ public:
 				break;
 			}
 
-			case WID_RV_RAIL_ROAD_TYPE_DROPDOWN: {
+			case WID_RV_RAIL_TYPE_DROPDOWN: {
 				Dimension d = {0, 0};
-				switch (this->window_number) {
-					case VEH_TRAIN:
-						for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
-							const RailTypeInfo *rti = GetRailTypeInfo(rt);
-							/* Skip rail type if it has no label */
-							if (rti->label == 0) continue;
-							d = maxdim(d, GetStringBoundingBox(rti->strings.replace_text));
-						}
-						break;
+				for (const RailType &rt : _sorted_railtypes) {
+					d = maxdim(d, GetStringBoundingBox(GetRailTypeInfo(rt)->strings.replace_text));
+				}
+				d.width += padding.width;
+				d.height += padding.height;
+				*size = maxdim(*size, d);
+				break;
+			}
 
-					case VEH_ROAD:
-						for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) {
-							const RoadTypeInfo *rti = GetRoadTypeInfo(rt);
-							/* Skip road type if it has no label */
-							if (rti->label == 0) continue;
-							d = maxdim(d, GetStringBoundingBox(rti->strings.replace_text));
-						}
-						break;
-
-					default: NOT_REACHED();
+			case WID_RV_ROAD_TYPE_DROPDOWN: {
+				Dimension d = {0, 0};
+				for (const RoadType &rt : _sorted_roadtypes) {
+					d = maxdim(d, GetStringBoundingBox(GetRoadTypeInfo(rt)->strings.replace_text));
 				}
 				d.width += padding.width;
 				d.height += padding.height;
@@ -443,6 +446,14 @@ public:
 			case WID_RV_TRAIN_ENGINEWAGON_DROPDOWN:
 				SetDParam(0, this->replace_engines ? STR_REPLACE_ENGINES : STR_REPLACE_WAGONS);
 				break;
+
+			case WID_RV_RAIL_TYPE_DROPDOWN:
+				SetDParam(0, this->sel_railtype == INVALID_RAILTYPE ? STR_REPLACE_ALL_RAILTYPE : GetRailTypeInfo(this->sel_railtype)->strings.replace_text);
+				break;
+
+			case WID_RV_ROAD_TYPE_DROPDOWN:
+				SetDParam(0, this->sel_roadtype == INVALID_ROADTYPE ? STR_REPLACE_ALL_ROADTYPE : GetRoadTypeInfo(this->sel_roadtype)->strings.replace_text);
+				break;
 		}
 	}
 
@@ -503,20 +514,6 @@ public:
 		 *   or The selected vehicle has no replacement set up */
 		this->SetWidgetDisabledState(WID_RV_STOP_REPLACE, this->sel_engine[0] == INVALID_ENGINE || !EngineHasReplacementForCompany(c, this->sel_engine[0], this->sel_group));
 
-		switch (this->window_number) {
-			case VEH_TRAIN:
-				/* Show the selected railtype in the pulldown menu */
-				this->GetWidget<NWidgetCore>(WID_RV_RAIL_ROAD_TYPE_DROPDOWN)->widget_data = sel_railtype == INVALID_RAILTYPE ? STR_REPLACE_ALL_RAILTYPE : GetRailTypeInfo(sel_railtype)->strings.replace_text;
-				break;
-
-			case VEH_ROAD:
-				/* Show the selected roadtype in the pulldown menu */
-				this->GetWidget<NWidgetCore>(WID_RV_RAIL_ROAD_TYPE_DROPDOWN)->widget_data = sel_roadtype == INVALID_ROADTYPE ? STR_REPLACE_ALL_ROADTYPE : GetRoadTypeInfo(sel_roadtype)->strings.replace_text;
-				break;
-
-			default: break;
-		}
-
 		this->DrawWidgets();
 
 		if (!this->IsShaded()) {
@@ -574,16 +571,12 @@ public:
 				break;
 			}
 
-			case WID_RV_RAIL_ROAD_TYPE_DROPDOWN: // Rail/roadtype selection dropdown menu
-				switch (this->window_number) {
-					case VEH_TRAIN:
-						ShowDropDownList(this, GetRailTypeDropDownList(true, true), sel_railtype, WID_RV_RAIL_ROAD_TYPE_DROPDOWN);
-						break;
+			case WID_RV_RAIL_TYPE_DROPDOWN: // Railtype selection dropdown menu
+				ShowDropDownList(this, GetRailTypeDropDownList(true, true), this->sel_railtype, widget);
+				break;
 
-					case VEH_ROAD:
-						ShowDropDownList(this, GetRoadTypeDropDownList(RTTB_ROAD | RTTB_TRAM, true, true), sel_roadtype, WID_RV_RAIL_ROAD_TYPE_DROPDOWN);
-						break;
-				}
+			case WID_RV_ROAD_TYPE_DROPDOWN: // Roadtype selection dropdown menu
+				ShowDropDownList(this, GetRoadTypeDropDownList(RTTB_ROAD | RTTB_TRAM, true, true), this->sel_roadtype, widget);
 				break;
 
 			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: {
@@ -674,34 +667,21 @@ public:
 				}
 				break;
 
-			case WID_RV_RAIL_ROAD_TYPE_DROPDOWN:
-				switch (this->window_number) {
-					case VEH_TRAIN: {
-						RailType temp = (RailType)index;
-						if (temp == sel_railtype) return; // we didn't select a new one. No need to change anything
-						sel_railtype = temp;
-						break;
-					}
-
-					case VEH_ROAD: {
-						RoadType temp = (RoadType)index;
-						if (temp == sel_roadtype) return; // we didn't select a new one. No need to change anything
-						sel_roadtype = temp;
-						break;
-					}
-
-					default: NOT_REACHED();
-				}
-
-				/* Reset scrollbar positions */
-				this->vscroll[0]->SetPosition(0);
-				this->vscroll[1]->SetPosition(0);
-				/* Rebuild the lists */
-				this->engines[0].ForceRebuild();
-				this->engines[1].ForceRebuild();
-				this->reset_sel_engine = true;
-				this->SetDirty();
+			case WID_RV_RAIL_TYPE_DROPDOWN: {
+				RailType temp = (RailType)index;
+				if (temp == this->sel_railtype) return; // we didn't select a new one. No need to change anything
+				this->sel_railtype = temp;
+				this->OnRailRoadTypeChange();
 				break;
+			}
+
+			case WID_RV_ROAD_TYPE_DROPDOWN: {
+				RoadType temp = (RoadType)index;
+				if (temp == this->sel_roadtype) return; // we didn't select a new one. No need to change anything
+				this->sel_roadtype = temp;
+				this->OnRailRoadTypeChange();
+				break;
+			}
 
 			case WID_RV_TRAIN_ENGINEWAGON_DROPDOWN: {
 				this->replace_engines = index != 0;
@@ -771,7 +751,7 @@ static const NWidgetPart _nested_replace_rail_vehicle_widgets[] = {
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_RV_RAIL_ROAD_TYPE_DROPDOWN), SetMinimalSize(136, 12), SetDataTip(0x0, STR_REPLACE_HELP_RAILTYPE), SetFill(1, 0), SetResize(1, 0),
+				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_RV_RAIL_TYPE_DROPDOWN), SetMinimalSize(136, 12), SetDataTip(STR_JUST_STRING, STR_REPLACE_HELP_RAILTYPE), SetFill(1, 0), SetResize(1, 0),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_RV_TRAIN_ENGINEWAGON_DROPDOWN), SetDataTip(STR_JUST_STRING, STR_REPLACE_ENGINE_WAGON_SELECT_HELP),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY), SetResize(1, 0), EndContainer(),
@@ -834,7 +814,7 @@ static const NWidgetPart _nested_replace_road_vehicle_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(NWID_VERTICAL),
-			NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_RV_RAIL_ROAD_TYPE_DROPDOWN), SetMinimalSize(136, 12), SetDataTip(0x0, STR_REPLACE_HELP_RAILTYPE), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_RV_ROAD_TYPE_DROPDOWN), SetMinimalSize(136, 12), SetDataTip(STR_JUST_STRING, STR_REPLACE_HELP_ROADTYPE), SetFill(1, 0), SetResize(1, 0),
 			NWidget(WWT_PANEL, COLOUR_GREY), SetResize(1, 0), EndContainer(),
 		EndContainer(),
 		NWidget(NWID_VERTICAL),

src/lang/danish.txt

@@ -1090,6 +1090,7 @@ STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis-mu
 STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vælg basismusik-sæt
 STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Yderligere information om basismusik-sættet
 
+STR_BASESET_STATUS                                              :{STRING} {RED}({NUM} manglende/beskadiget fil{P "" s})
 
 STR_ERROR_RESOLUTION_LIST_FAILED                                :{WHITE}Det lykkedes ikke at hente en liste over understøttede opløsninger
 STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fuldskærmstilstand fejlede

src/lang/polish.txt

@@ -1470,6 +1470,7 @@ STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Podstawo
 STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Wybierz podstawowy zestaw muzyki do użycia
 STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatkowe informacje o muzyce podstawowej
 
+STR_BASESET_STATUS                                              :{STRING} {RED}({NUM} brakując{P y e ych}/uszkodzon{P y e ych} plik{P "" i ów})
 
 STR_ERROR_RESOLUTION_LIST_FAILED                                :{WHITE}Nie udało się pobrać listy obsługiwanych rozdzielczości
 STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Uruchomienie trybu pełnoekranowego nie powiodło się

src/timetable_cmd.cpp

@@ -311,14 +311,21 @@ CommandCost CmdSetTimetableStart(DoCommandFlag flags, VehicleID veh_id, bool tim
 	CommandCost ret = CheckOwnership(v->owner);
 	if (ret.Failed()) return ret;
 
-	int total_duration = v->orders->GetTimetableTotalDuration();
+	TimerGameTick::Ticks total_duration = v->orders->GetTimetableTotalDuration();
 
-	/* Don't let a timetable start more than 15 years into the future or 1 year in the past. */
+	/* Don't let a timetable start at an invalid date. */
 	if (start_date < 0 || start_date > CalendarTime::MAX_DATE) return CMD_ERROR;
+
+	/* Don't let a timetable start more than 15 years into the future... */
 	if (start_date - TimerGameCalendar::date > TimerGameCalendar::DateAtStartOfYear(MAX_TIMETABLE_START_YEARS)) return CMD_ERROR;
+	/* ...or 1 year in the past. */
 	if (TimerGameCalendar::date - start_date > CalendarTime::DAYS_IN_LEAP_YEAR) return CMD_ERROR;
+
+	/* If trying to distribute start dates over a shared order group, we need to know the total duration. */
 	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;
+
+	/* Don't allow invalid start dates for other vehicles in the shared order group. */
+	if (timetable_all && start_date + (total_duration / Ticks::DAY_TICKS) > CalendarTime::MAX_DATE) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
 		std::vector<Vehicle *> vehs;

src/widgets/autoreplace_widget.h

@@ -32,12 +32,13 @@ enum ReplaceVehicleWidgets {
 	WID_RV_INFO_TAB,                 ///< Info tab.
 	WID_RV_STOP_REPLACE,             ///< Stop Replacing button.
 
-	/* Train/road only widgets */
-	WID_RV_RAIL_ROAD_TYPE_DROPDOWN,  ///< Dropdown menu about the rail/roadtype.
-
 	/* Train only widgets. */
+	WID_RV_RAIL_TYPE_DROPDOWN, ///< Dropdown to select railtype.
 	WID_RV_TRAIN_ENGINEWAGON_DROPDOWN, ///< Dropdown to select engines and/or wagons.
 	WID_RV_TRAIN_WAGONREMOVE_TOGGLE, ///< Button to toggle removing wagons.
+
+	/* Road only widgets. */
+	WID_RV_ROAD_TYPE_DROPDOWN, ///< Dropdown to select roadtype.
 };
 
 #endif /* WIDGETS_AUTOREPLACE_WIDGET_H */