Skip to content

Add tooltips for temple and shipyard production toggle buttons and fix translations #1858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flamefire merged 3 commits into from
Jan 13, 2026
+7 −6
Merged

Add tooltips for temple and shipyard production toggle buttons and fix translations #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4f39fb
Add tooltips for temple and shipyard production toggle buttons
Flamefire Jan 12, 2026
c2d6657
Replace names by S2 names
Flamefire Jan 12, 2026
16052f2
Update translations
Flamefire Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/RTTR/texte/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion external/languages
Open in desktop
Submodule languages updated 29 files
+403 −367 rttr-cs.po
+342 −321 rttr-de.po
+354 −330 rttr-en_GB.po
+307 −286 rttr-es.po
+305 −284 rttr-et.po
+308 −287 rttr-fi.po
+309 −288 rttr-fr.po
+307 −288 rttr-he.po
+305 −284 rttr-hu.po
+305 −284 rttr-it.po
+4,598 −0 rttr-ka.po
+355 −335 rttr-ko.po
+304 −284 rttr-la.po
+4,670 −0 rttr-lo.po
+305 −284 rttr-lt.po
+306 −285 rttr-nb.po
+304 −284 rttr-nds.po
+307 −286 rttr-nl.po
+337 −317 rttr-pl.po
+305 −284 rttr-pt.po
+678 −614 rttr-pt_BR.po
+382 −355 rttr-ru.po
+303 −283 rttr-rw.po
+375 −351 rttr-sk.po
+306 −285 rttr-sl.po
+305 −284 rttr-sv.po
+304 −284 rttr-tr.po
+402 −383 rttr-zh_CN.po
+300 −279 rttr.pot
2 changes: 1 addition & 1 deletion libs/s25main/buildings/nobUsual.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion libs/s25main/gameData/JobConsts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const std::array<FullJobData, helpers::NumEnumValues_v<Job>> 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")},
Expand Down
2 changes: 1 addition & 1 deletion libs/s25main/ingameWindows/iwBuilding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ iwBuilding::iwBuilding(GameWorldView& gwv, GameCommandFactory& gcFactory, nobUsu
unsigned io_dat_id =
(static_cast<nobShipYard*>(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"
Expand Down
3 changes: 2 additions & 1 deletion libs/s25main/ingameWindows/iwTempleBuilding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ iwTempleBuilding::iwTempleBuilding(GameWorldView& gwv, GameCommandFactory& gcFac
GetCtrl<Window>(1)->SetPos(DrawPoint(117, 160));
GetCtrl<ctrlImage>(3)->SetImage(wineaddon::GetTempleProductionModeTex(ProductionMode::Default));
AddImageButton(8, DrawPoint(130, 176), Extent(34, 32), TextureColor::Grey,
wineaddon::GetTempleProductionModeTex(static_cast<nobTemple*>(building)->GetProductionMode()));
wineaddon::GetTempleProductionModeTex(static_cast<nobTemple*>(building)->GetProductionMode()),
_("Output mineral"));
}

void iwTempleBuilding::Msg_ButtonClick(const unsigned ctrl_id)
Expand Down
Loading