From c469fc54f82a7c5c119dc80f5e9979602850bc74 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 11 Jan 2022 18:40:39 +0200 Subject: [PATCH 21/21] Change ui_names of disband actions in supplied rulesets - "Recycle Unit" -> "Disband recovering production" - "You're Fired" -> "Disband without recovering production" Requested by log65536 See osdn #43595 Signed-off-by: Marko Lindqvist --- common/actions.c | 8 ++++---- data/alien/game.ruleset | 8 ++++---- data/civ1/game.ruleset | 8 ++++---- data/civ2/game.ruleset | 8 ++++---- data/civ2civ3/game.ruleset | 8 ++++---- data/classic/game.ruleset | 8 ++++---- data/experimental/game.ruleset | 8 ++++---- data/multiplayer/game.ruleset | 8 ++++---- data/sandbox/game.ruleset | 8 ++++---- data/webperimental/game.ruleset | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/common/actions.c b/common/actions.c index 5a880e99fb..f5d3adfe49 100644 --- a/common/actions.c +++ b/common/actions.c @@ -7734,11 +7734,11 @@ const char *action_ui_name_default(int act) /* TRANS: Destroy _City (100% chance of success). */ return N_("Destroy %sCity%s"); case ACTION_RECYCLE_UNIT: - /* TRANS: Rec_ycle Unit (100% chance of success). */ - return N_("Rec%sycle Unit%s"); + /* TRANS: Dis_band recovering production (100% chance of success). */ + return N_("Dis%sband recovering production%s"); case ACTION_DISBAND_UNIT: - /* TRANS: _You're Fired (100% chance of success). */ - return N_("%sYou're Fired%s"); + /* TRANS: Dis_band without recovering production (100% chance of success). */ + return N_("Dis%sband without recovering production%s"); case ACTION_HOME_CITY: /* TRANS: Set _Home City (100% chance of success). */ return N_("Set %sHome City%s"); diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 4cb21663e7..75b0209056 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -491,11 +491,11 @@ ui_name_enter_marketplace = _("Monetize %sContainers%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Capture Units (100% chance of success). */ ui_name_capture_units = _("%sCapture Units%s") diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index e5582ce6ec..8898b844be 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -473,11 +473,11 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Build City (100% chance of success). */ ui_name_found_city = _("%sBuild City%s") diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index e5adf8bad8..3721823758 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -512,11 +512,11 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Build City (100% chance of success). */ ui_name_found_city = _("%sBuild City%s") diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 614a082c56..0ef2a13288 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -551,11 +551,11 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Capture Units (100% chance of success). */ ui_name_capture_units = _("%sCapture Units%s") diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index cbb7679dd4..43cf80acbb 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -535,11 +535,11 @@ ui_name_enter_marketplace = _("Sell %sGoods%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Build City (100% chance of success). */ ui_name_found_city = _("%sBuild City%s") diff --git a/data/experimental/game.ruleset b/data/experimental/game.ruleset index 7e40cb6c98..7a2ead8d44 100644 --- a/data/experimental/game.ruleset +++ b/data/experimental/game.ruleset @@ -540,11 +540,11 @@ ui_name_enter_marketplace = _("Sell %sGoods%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Build City (100% chance of success). */ ui_name_found_city = _("%sBuild City%s") diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 58df992622..0103901ebf 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -529,11 +529,11 @@ ui_name_investigate_city_spend_unit = _("%sInvestigate City (spends the unit)%s" ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Build City (100% chance of success). */ ui_name_found_city = _("%sBuild City%s") diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 1bf3a165d1..cca51d702e 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -557,11 +557,11 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Capture Units (100% chance of success). */ ui_name_capture_units = _("%sCapture Units%s") diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 4294f404b7..4da5f155ce 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -523,11 +523,11 @@ ui_name_enter_marketplace = _("Sell %sGoods%s") ; /* TRANS: Help _build Wonder (100% chance of success). */ ui_name_help_wonder = _("Help %sbuild Wonder%s") -; /* TRANS: Rec_ycle Unit (100% chance of success). */ -ui_name_recycle_unit = _("Rec%sycle Unit%s") +; /* TRANS: Dis_band recovering production (100% chance of success). */ +ui_name_recycle_unit = _("Dis%sband recovering production%s") -; /* TRANS: _You're Fired (100% chance of success). */ -ui_name_disband_unit = _("%sYou're Fired%s") +; /* TRANS: Dis_band without recovering production (100% chance of success). */ +ui_name_disband_unit = _("Dis%sband without recovering production%s") ; /* TRANS: _Build City (100% chance of success). */ ui_name_found_city = _("%sBuild City%s") -- 2.34.1