From 0bc6091e70f96846775f6b25828ccfac8655c7b1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 23 Nov 2022 22:24:36 +0200 Subject: [PATCH 26/26] Correct "in stead" as "instead" See osdn #44787 Signed-off-by: Marko Lindqvist --- ai/default/daidomestic.c | 2 +- client/gui-gtk-3.22/action_dialog.c | 2 +- client/gui-gtk-4.0/action_dialog.c | 2 +- common/actions.c | 4 ++-- common/map.c | 2 +- common/networking/dataio_json.c | 8 ++++---- data/alien/techs.ruleset | 2 +- data/civ1/techs.ruleset | 2 +- data/civ2/techs.ruleset | 2 +- data/civ2civ3/techs.ruleset | 2 +- data/classic/techs.ruleset | 2 +- data/goldkeep/techs.ruleset | 2 +- data/granularity/techs.ruleset | 2 +- data/multiplayer/techs.ruleset | 2 +- data/ruledit/comments-3.2.txt | 2 +- data/sandbox/techs.ruleset | 2 +- data/stub/techs.ruleset | 2 +- data/webperimental/techs.ruleset | 2 +- doc/HACKING | 2 +- server/unithand.c | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index fd875cdffb..aba81c72e1 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -229,7 +229,7 @@ static void dai_choose_trade_route(struct ai_type *ait, struct city *pcity, if (!unit_type) { /* We'll never be able to establish a trade route. Consider a unit that - * can enter the marketplace in stead to stimulate science. */ + * can enter the marketplace instead, to stimulate science. */ unit_type = get_role_unit(action_id_get_role(ACTION_MARKETPLACE), 0); } diff --git a/client/gui-gtk-3.22/action_dialog.c b/client/gui-gtk-3.22/action_dialog.c index c1d71a10f2..a0a0288fe3 100644 --- a/client/gui-gtk-3.22/action_dialog.c +++ b/client/gui-gtk-3.22/action_dialog.c @@ -76,7 +76,7 @@ static GtkWidget *spy_tech_shell; static GtkWidget *spy_sabotage_shell; -/* A structure to hold parameters for actions inside the GUI in stead of +/* A structure to hold parameters for actions inside the GUI instead of * storing the needed data in a global variable. */ struct action_data { action_id act_id; diff --git a/client/gui-gtk-4.0/action_dialog.c b/client/gui-gtk-4.0/action_dialog.c index 8c1a8e25e6..421f8ee130 100644 --- a/client/gui-gtk-4.0/action_dialog.c +++ b/client/gui-gtk-4.0/action_dialog.c @@ -76,7 +76,7 @@ static GtkWidget *spy_tech_shell; static GtkWidget *spy_sabotage_shell; -/* A structure to hold parameters for actions inside the GUI in stead of +/* A structure to hold parameters for actions inside the GUI instead of * storing the needed data in a global variable. */ struct action_data { action_id act_id; diff --git a/common/actions.c b/common/actions.c index b04b43f1d1..ab8d226aa4 100644 --- a/common/actions.c +++ b/common/actions.c @@ -5418,7 +5418,7 @@ static struct act_prob ap_diplomat_battle(const struct unit *pattacker, paction); if (pdefender) { - /* There will be a diplomatic battle in stead of an action. */ + /* There will be a diplomatic battle instead of an action. */ return ap_dipl_battle_win(pattacker, pdefender); }; @@ -7136,7 +7136,7 @@ int action_dice_roll_odds(const struct player *act_player, paction->id); /* Let the Action_Odds_Pct effect modify the odds. The advantage of doing - * it this way in stead of rolling twice is that Action_Odds_Pct can + * it this way instead of rolling twice is that Action_Odds_Pct can * increase the odds. */ odds = odds + ((odds diff --git a/common/map.c b/common/map.c index ead081d9be..cb52685058 100644 --- a/common/map.c +++ b/common/map.c @@ -1285,7 +1285,7 @@ static bool is_valid_dir_calculate(enum direction8 dir) Returns TRUE iff the given direction is a valid one. If the direction could be out of range you should use - map_untrusted_dir_is_valid() in stead. + map_untrusted_dir_is_valid() instead. ***********************************************************************/ bool is_valid_dir(enum direction8 dir) { diff --git a/common/networking/dataio_json.c b/common/networking/dataio_json.c index 178d6e698f..53d064d1e0 100644 --- a/common/networking/dataio_json.c +++ b/common/networking/dataio_json.c @@ -86,7 +86,7 @@ static int plocation_write_data(json_t *item, json_t *data); /**********************************************************************//** - Helper for plocation_write_data(). Use it in stead of this. + Helper for plocation_write_data(). Use it instead of this. **************************************************************************/ static int plocation_write_field(json_t *item, const struct plocation *location, @@ -105,7 +105,7 @@ static int plocation_write_field(json_t *item, } /**********************************************************************//** - Helper for plocation_write_data(). Use it in stead of this. + Helper for plocation_write_data(). Use it instead of this. **************************************************************************/ static int plocation_write_elem(json_t *item, const struct plocation *location, @@ -170,7 +170,7 @@ static json_t *plocation_read_data(json_t *item, const struct plocation *location); /**********************************************************************//** - Helper for plocation_read_data(). Use it in stead of this. + Helper for plocation_read_data(). Use it instead of this. **************************************************************************/ static json_t *plocation_read_field(json_t *item, const struct plocation *location) @@ -184,7 +184,7 @@ static json_t *plocation_read_field(json_t *item, } /**********************************************************************//** - Helper for plocation_read_data(). Use it in stead of this. + Helper for plocation_read_data(). Use it instead of this. **************************************************************************/ static json_t *plocation_read_elem(json_t *item, const struct plocation *location) diff --git a/data/alien/techs.ruleset b/data/alien/techs.ruleset index e862e38cdd..bda51e7f66 100644 --- a/data/alien/techs.ruleset +++ b/data/alien/techs.ruleset @@ -82,7 +82,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/civ1/techs.ruleset b/data/civ1/techs.ruleset index b07f145842..b75f08eeaa 100644 --- a/data/civ1/techs.ruleset +++ b/data/civ1/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/civ2/techs.ruleset b/data/civ2/techs.ruleset index 49a9d4026a..2cbf4af0b2 100644 --- a/data/civ2/techs.ruleset +++ b/data/civ2/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/civ2civ3/techs.ruleset b/data/civ2civ3/techs.ruleset index 1f03fa928c..b42d888011 100644 --- a/data/civ2civ3/techs.ruleset +++ b/data/civ2civ3/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/classic/techs.ruleset b/data/classic/techs.ruleset index 909124e0b7..4a69989b63 100644 --- a/data/classic/techs.ruleset +++ b/data/classic/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/goldkeep/techs.ruleset b/data/goldkeep/techs.ruleset index bbdd27941b..c3a7d8d1c8 100644 --- a/data/goldkeep/techs.ruleset +++ b/data/goldkeep/techs.ruleset @@ -80,7 +80,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/granularity/techs.ruleset b/data/granularity/techs.ruleset index f62a8955ec..551152728a 100644 --- a/data/granularity/techs.ruleset +++ b/data/granularity/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/multiplayer/techs.ruleset b/data/multiplayer/techs.ruleset index 69f91fcf2d..62a558fc87 100644 --- a/data/multiplayer/techs.ruleset +++ b/data/multiplayer/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/ruledit/comments-3.2.txt b/data/ruledit/comments-3.2.txt index 47b0d9441b..36e9d2919e 100644 --- a/data/ruledit/comments-3.2.txt +++ b/data/ruledit/comments-3.2.txt @@ -126,7 +126,7 @@ techs = "\ ; tech requirements because it is a requirement vector.\n\ ; See doc/README.effects to learn more about requirement\n\ ; vectors.\n\ -; Requiring a tech here in stead of in req1, req2 or\n\ +; Requiring a tech here instead of in req1, req2 or\n\ ; root_req is not supported yet.\n\ ; Requirements that may become fulfilled during the game\n\ ; when they weren't at the start of the game is not\n\ diff --git a/data/sandbox/techs.ruleset b/data/sandbox/techs.ruleset index 42be339882..1752c9c45e 100644 --- a/data/sandbox/techs.ruleset +++ b/data/sandbox/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/stub/techs.ruleset b/data/stub/techs.ruleset index 2b552d6f55..791cbe2480 100644 --- a/data/stub/techs.ruleset +++ b/data/stub/techs.ruleset @@ -72,7 +72,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/data/webperimental/techs.ruleset b/data/webperimental/techs.ruleset index 15cd4695f6..3b2ba3b4bc 100644 --- a/data/webperimental/techs.ruleset +++ b/data/webperimental/techs.ruleset @@ -78,7 +78,7 @@ format_version = 30 ; tech requirements because it is a requirement vector. ; See doc/README.effects to learn more about requirement ; vectors. -; Requiring a tech here in stead of in req1, req2 or +; Requiring a tech here instead of in req1, req2 or ; root_req is not supported yet. ; Requirements that may become fulfilled during the game ; when they weren't at the start of the game is not diff --git a/doc/HACKING b/doc/HACKING index aa74b85a2f..feae06db10 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -858,7 +858,7 @@ text generation and agents and for third party tools. Please don't make non actions actions because they are similar to actions or because some of the things Freeciv automatically does for actions would -be nice to have. Abstract out the stuff you want in stead. Make it apply to +be nice to have. Abstract out the stuff you want instead. Make it apply to both actions and to the thing you wanted. An action is something a player can order a game entity, the actor, to do. diff --git a/server/unithand.c b/server/unithand.c index bbbd9195ca..5255b35334 100644 --- a/server/unithand.c +++ b/server/unithand.c @@ -1060,7 +1060,7 @@ need_war_enabler(const struct unit_type *actor_utype, Returns the first player that may enable the specified action if war is declared. - Helper for need_war_player(). Use it in stead. + Helper for need_war_player(). Use it instead. **************************************************************************/ static struct player *need_war_player_hlp(const struct unit *actor, const action_id act, -- 2.35.1