From 5f1dda239e62140020662d50c75f61a81981b691 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 11 Jun 2022 12:09:40 +0300 Subject: [PATCH 21/21] 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-gtk-4.0/citydlg.c | 2 +- client/gui-qt/citydlg.cpp | 2 +- common/fc_types.h | 2 +- common/reqtext.c | 4 ++-- common/requirements.c | 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 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/client/gui-gtk-3.0/citydlg.c b/client/gui-gtk-3.0/citydlg.c index 386300f565..2400c7514e 100644 --- a/client/gui-gtk-3.0/citydlg.c +++ b/client/gui-gtk-3.0/citydlg.c @@ -2954,7 +2954,7 @@ static void popup_workertask_dlg(struct city *pcity, struct tile *ptile) } if (action_id_univs_not_blocking(ACTION_MINE, NULL, &for_terr)) { - 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 6016b318e7..056fa124cd 100644 --- a/client/gui-gtk-3.22/citydlg.c +++ b/client/gui-gtk-3.22/citydlg.c @@ -2971,7 +2971,7 @@ static void popup_workertask_dlg(struct city *pcity, struct tile *ptile) } if (action_id_univs_not_blocking(ACTION_MINE, NULL, &for_terr)) { - 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-4.0/citydlg.c b/client/gui-gtk-4.0/citydlg.c index b5df3d909c..166a4fe9d3 100644 --- a/client/gui-gtk-4.0/citydlg.c +++ b/client/gui-gtk-4.0/citydlg.c @@ -2991,7 +2991,7 @@ static void popup_workertask_dlg(struct city *pcity, struct tile *ptile) } if (action_id_univs_not_blocking(ACTION_MINE, NULL, &for_terr)) { - 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 cb83f69885..3c3a7aa045 100644 --- a/client/gui-qt/citydlg.cpp +++ b/client/gui-qt/citydlg.cpp @@ -1392,7 +1392,7 @@ void city_map::context_menu(QPoint point) con_plant = con_menu->addAction(_("Plant")); } if (action_id_univs_not_blocking(ACTION_MINE, NULL, &for_terr)) { - con_mine = con_menu->addAction(_("Mine")); + con_mine = con_menu->addAction(Q_("?act:Mine")); } if (pterr->cultivate_result != NULL diff --git a/common/fc_types.h b/common/fc_types.h index 76162bc48c..7e0c8308f9 100644 --- a/common/fc_types.h +++ b/common/fc_types.h @@ -109,7 +109,7 @@ enum output_type_id { #define SPECENUM_VALUE2NAME "Unused Road" /* Action with the result ACTRES_CULTIVATE */ #define SPECENUM_VALUE3 ACTIVITY_MINE -#define SPECENUM_VALUE3NAME N_("Mine") +#define SPECENUM_VALUE3NAME N_("?act:Mine") /* Action with the result ACTRES_IRRIGATE */ #define SPECENUM_VALUE4 ACTIVITY_IRRIGATE #define SPECENUM_VALUE4NAME N_("Irrigate") diff --git a/common/reqtext.c b/common/reqtext.c index f5d6f22ff5..c69095c664 100644 --- a/common/reqtext.c +++ b/common/reqtext.c @@ -1741,11 +1741,11 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, if (preq->present) { cat_snprintf(buf, bufsz, _("Requires that the unit is performing activity %s."), - _(unit_activity_name(preq->source.value.activity))); + Q_(unit_activity_name(preq->source.value.activity))); } else { cat_snprintf(buf, bufsz, _("Requires that the unit is not performing activity %s."), - _(unit_activity_name(preq->source.value.activity))); + Q_(unit_activity_name(preq->source.value.activity))); } return TRUE; case REQ_RANGE_CADJACENT: diff --git a/common/requirements.c b/common/requirements.c index db3a657b1f..f9fd710c96 100644 --- a/common/requirements.c +++ b/common/requirements.c @@ -4504,7 +4504,7 @@ const char *universal_name_translation(const struct universal *psource, return buf; case VUT_ACTIVITY: cat_snprintf(buf, bufsz, _("%s activity"), - _(unit_activity_name(psource->value.activity))); + Q_(unit_activity_name(psource->value.activity))); return buf; case VUT_MINMOVES: /* TRANS: Minimum unit movement points left for requirement to be met diff --git a/common/unit.c b/common/unit.c index ec2b96ccb9..15aba1ba40 100644 --- a/common/unit.c +++ b/common/unit.c @@ -627,7 +627,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_PLANT: /* TRANS: Activity name, verb in English */ return _("Plant"); diff --git a/data/alien/terrain.ruleset b/data/alien/terrain.ruleset index 7597fd6090..103a820445 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -798,7 +798,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 f3ecaea259..0b8abfa118 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -943,7 +943,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 173f92b377..1e2cf422a5 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -1015,7 +1015,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 7e21e317ac..4b7dd6d90b 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -1233,7 +1233,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 b46a847f8d..7b9e0674d7 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/terrain.ruleset @@ -1206,7 +1206,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 42134b1648..8cf3404b76 100644 --- a/data/experimental/terrain.ruleset +++ b/data/experimental/terrain.ruleset @@ -1182,7 +1182,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 1e9d2acef6..45183ac534 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/terrain.ruleset @@ -1180,7 +1180,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 bd233a1c32..6a3c92b49a 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -1234,7 +1234,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 9b5d08a29c..1eb24f0b49 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/terrain.ruleset @@ -1206,7 +1206,7 @@ further bonus.\ ") [extra_mine] -name = _("Mine") +name = _("?extra:Mine") category = "Infra" causes = "Mine" rmcauses = "Pillage" -- 2.35.1