From 2c4ec7d17e80254fd1a62ee307a14bb2f8913e93 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 11 Jun 2022 12:20:14 +0300 Subject: [PATCH 16/16] Qualify "Mine" See osdn #44668 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.0/citydlg.c | 2 +- client/gui-gtk-3.22/citydlg.c | 2 +- client/gui-qt/citydlg.cpp | 2 +- common/unit.c | 2 +- data/alien/terrain.ruleset | 2 +- data/civ1/terrain.ruleset | 2 +- data/civ2/terrain.ruleset | 2 +- data/civ2civ3/terrain.ruleset | 2 +- data/classic/terrain.ruleset | 2 +- data/experimental/terrain.ruleset | 2 +- data/multiplayer/terrain.ruleset | 2 +- data/sandbox/terrain.ruleset | 2 +- data/webperimental/terrain.ruleset | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/gui-gtk-3.0/citydlg.c b/client/gui-gtk-3.0/citydlg.c index 1af1d34f64..c8c681d6cd 100644 --- a/client/gui-gtk-3.0/citydlg.c +++ b/client/gui-gtk-3.0/citydlg.c @@ -2953,7 +2953,7 @@ static void popup_workertask_dlg(struct city *pcity, struct tile *ptile) && effect_cumulative_max(EFT_MINING_POSSIBLE, &for_terr) > 0) || (pterr->mining_result != pterr && pterr->mining_result != NULL && effect_cumulative_max(EFT_MINING_TF_POSSIBLE, &for_terr) > 0)) { - choice_dialog_add(shl, _("Mine"), + choice_dialog_add(shl, Q_("?act:Mine"), G_CALLBACK(set_city_workertask), GINT_TO_POINTER(ACTIVITY_MINE), FALSE, NULL); } diff --git a/client/gui-gtk-3.22/citydlg.c b/client/gui-gtk-3.22/citydlg.c index 8693f364f6..b1a3c00ff8 100644 --- a/client/gui-gtk-3.22/citydlg.c +++ b/client/gui-gtk-3.22/citydlg.c @@ -2986,7 +2986,7 @@ static void popup_workertask_dlg(struct city *pcity, struct tile *ptile) && effect_cumulative_max(EFT_MINING_POSSIBLE, &for_terr) > 0) || (pterr->mining_result != pterr && pterr->mining_result != NULL && effect_cumulative_max(EFT_MINING_TF_POSSIBLE, &for_terr) > 0)) { - choice_dialog_add(shl, _("Mine"), + choice_dialog_add(shl, Q_("?act:Mine"), G_CALLBACK(set_city_workertask), GINT_TO_POINTER(ACTIVITY_MINE), FALSE, NULL); } diff --git a/client/gui-qt/citydlg.cpp b/client/gui-qt/citydlg.cpp index 51a2e19b69..2a349c76d2 100644 --- a/client/gui-qt/citydlg.cpp +++ b/client/gui-qt/citydlg.cpp @@ -1312,7 +1312,7 @@ void city_map::context_menu(QPoint point) QAction con_irrig_tf(_("Irrigate"), this); QAction con_irrig(_("Irrigate"), this); QAction con_mine_tf(_("Plant"), this); - QAction con_mine(_("Mine"), this); + QAction con_mine(Q_("?act:Mine"), this); QAction con_road(_("Road"), this); QAction con_trfrm(_("Transform"), this); QAction con_pollution(_("Clean Pollution"), this); diff --git a/common/unit.c b/common/unit.c index 568e12a574..c91c23f15e 100644 --- a/common/unit.c +++ b/common/unit.c @@ -527,7 +527,7 @@ const char *get_activity_text(enum unit_activity activity) return _("Pollution"); case ACTIVITY_MINE: /* TRANS: Activity name, verb in English */ - return _("Mine"); + return Q_("?act:Mine"); case ACTIVITY_IRRIGATE: return _("Irrigate"); case ACTIVITY_FORTIFYING: diff --git a/data/alien/terrain.ruleset b/data/alien/terrain.ruleset index cd2dac8ce6..2b4fc2b8b4 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -767,7 +767,7 @@ allowing Greenhouses to be built anywhere.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset index 69a7c307f9..18fcbb935f 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -903,7 +903,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/civ2/terrain.ruleset b/data/civ2/terrain.ruleset index 7de3e01139..9d3d29e6ca 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -975,7 +975,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/civ2civ3/terrain.ruleset b/data/civ2civ3/terrain.ruleset index 270b2248b9..1c304359b2 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -1184,7 +1184,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/classic/terrain.ruleset b/data/classic/terrain.ruleset index e1f7986e8d..f991819ea7 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/terrain.ruleset @@ -1157,7 +1157,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/experimental/terrain.ruleset b/data/experimental/terrain.ruleset index 4134245b40..690f714ad7 100644 --- a/data/experimental/terrain.ruleset +++ b/data/experimental/terrain.ruleset @@ -1133,7 +1133,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/multiplayer/terrain.ruleset b/data/multiplayer/terrain.ruleset index 5c98ffd9db..1657d5c1a0 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/terrain.ruleset @@ -1131,7 +1131,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/sandbox/terrain.ruleset b/data/sandbox/terrain.ruleset index d98367b96a..a5f878a221 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -1185,7 +1185,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" diff --git a/data/webperimental/terrain.ruleset b/data/webperimental/terrain.ruleset index c45818d403..43bdc1cf10 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/terrain.ruleset @@ -1157,7 +1157,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" -- 2.35.1