From a4f39fbfb61cfd488a09c9222e3c832fc4a2eff6 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 12 Jan 2026 09:09:36 +0100 Subject: [PATCH 1/3] Add tooltips for temple and shipyard production toggle buttons Closes #1837 --- libs/s25main/ingameWindows/iwBuilding.cpp | 2 +- libs/s25main/ingameWindows/iwTempleBuilding.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/s25main/ingameWindows/iwBuilding.cpp b/libs/s25main/ingameWindows/iwBuilding.cpp index 84d0ec2fde..55f48f66bf 100644 --- a/libs/s25main/ingameWindows/iwBuilding.cpp +++ b/libs/s25main/ingameWindows/iwBuilding.cpp @@ -75,7 +75,7 @@ iwBuilding::iwBuilding(GameWorldView& gwv, GameCommandFactory& gcFactory, nobUsu unsigned io_dat_id = (static_cast(building)->GetMode() == nobShipYard::Mode::Boats) ? IODAT_BOAT_ID : IODAT_SHIP_ID; AddImageButton(11, DrawPoint(130, extent.y - 47), Extent(43, 32), TextureColor::Grey, - LOADER.GetImageN("io", io_dat_id)); + LOADER.GetImageN("io", io_dat_id), _("Ships/Boats")); } // "Gehe Zum Ort" diff --git a/libs/s25main/ingameWindows/iwTempleBuilding.cpp b/libs/s25main/ingameWindows/iwTempleBuilding.cpp index bfa6a6c822..738ecda601 100644 --- a/libs/s25main/ingameWindows/iwTempleBuilding.cpp +++ b/libs/s25main/ingameWindows/iwTempleBuilding.cpp @@ -16,7 +16,8 @@ iwTempleBuilding::iwTempleBuilding(GameWorldView& gwv, GameCommandFactory& gcFac GetCtrl(1)->SetPos(DrawPoint(117, 160)); GetCtrl(3)->SetImage(wineaddon::GetTempleProductionModeTex(ProductionMode::Default)); AddImageButton(8, DrawPoint(130, 176), Extent(34, 32), TextureColor::Grey, - wineaddon::GetTempleProductionModeTex(static_cast(building)->GetProductionMode())); + wineaddon::GetTempleProductionModeTex(static_cast(building)->GetProductionMode()), + _("Output mineral")); } void iwTempleBuilding::Msg_ButtonClick(const unsigned ctrl_id) From c2d66579fbef033d320cfe41e9154b8bc35bf7cf Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 12 Jan 2026 09:06:48 +0100 Subject: [PATCH 2/3] Replace names by S2 names --- data/RTTR/texte/readme.txt | 2 +- external/languages | 2 +- libs/s25main/buildings/nobUsual.cpp | 2 +- libs/s25main/gameData/JobConsts.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/RTTR/texte/readme.txt b/data/RTTR/texte/readme.txt index 2be5f777cb..e1a774a554 100644 --- a/data/RTTR/texte/readme.txt +++ b/data/RTTR/texte/readme.txt @@ -328,7 +328,7 @@ E. Summary: Updates and changelog * 0.5 - Fifth version - 27.01.2008 * ------------------------------------------------------------------------------ - Fixed a lot of bugs - - Donkeyraods, Donkey breeder + - Donkeyroads, Donkey breeder - Boatroads with boats and shipyard (shipyard only builds boats) - Mountain road - Catapults diff --git a/external/languages b/external/languages index 819e08b011..d0cc796313 160000 --- a/external/languages +++ b/external/languages @@ -1 +1 @@ -Subproject commit 819e08b011c5528f93486a4fedd532929e4c14fb +Subproject commit d0cc7963133c4bc828c747d82dbc72398f0c8202 diff --git a/libs/s25main/buildings/nobUsual.cpp b/libs/s25main/buildings/nobUsual.cpp index 86db8968d5..985274ec1b 100644 --- a/libs/s25main/buildings/nobUsual.cpp +++ b/libs/s25main/buildings/nobUsual.cpp @@ -536,7 +536,7 @@ void nobUsual::OnOutOfResources() else if(GetBuildingType() == BuildingType::Quarry) error = _("No more stones in range"); else if(GetBuildingType() == BuildingType::Fishery) - error = _("No more fishes in range"); + error = _("No more fish in range"); else return; diff --git a/libs/s25main/gameData/JobConsts.cpp b/libs/s25main/gameData/JobConsts.cpp index be2f056baf..a626e7270a 100644 --- a/libs/s25main/gameData/JobConsts.cpp +++ b/libs/s25main/gameData/JobConsts.cpp @@ -19,7 +19,7 @@ const std::array> fullJobData = {{ {{GoodType::Nothing, 385, 190, 5}, {false, 0}, gettext_noop("Helper")}, {{GoodType::Axe, 148, 789, 5}, {false, 5}, gettext_noop("Woodchopper")}, {{GoodType::RodAndLine, 129, 825, 5}, {false, 12}, gettext_noop("Fisher")}, - {{GoodType::Shovel, 66, 304, 5}, {false, 8}, gettext_noop("Ranger")}, + {{GoodType::Shovel, 66, 304, 5}, {false, 8}, gettext_noop("Tree planter")}, {{GoodType::Saw, 479, 96, 5}, {false, 6}, gettext_noop("Carpenter")}, {{GoodType::PickAxe, 129, 825, 5}, {false, 7}, gettext_noop("Stonemason")}, {{GoodType::Bow, 0, 300, 5}, {false, 20}, gettext_noop("Huntsman")}, From 16052f239da47745ead40507c4b25e73ea0833db Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 12 Jan 2026 10:16:11 +0100 Subject: [PATCH 3/3] Update translations Fixes #1856 --- external/languages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/languages b/external/languages index d0cc796313..4459c1aa64 160000 --- a/external/languages +++ b/external/languages @@ -1 +1 @@ -Subproject commit d0cc7963133c4bc828c747d82dbc72398f0c8202 +Subproject commit 4459c1aa6425679a0f3a96d1bca52d97819f4f32