From a42c043d4c401c6c508925d1f6ab30967dbf1b9c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 23 Nov 2022 22:24:36 +0200 Subject: [PATCH 22/22] Correct "in stead" as "instead" See osdn #44787 Signed-off-by: Marko Lindqvist --- ai/default/daidomestic.c | 2 +- client/gui-gtk-3.0/action_dialog.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/experimental/techs.ruleset | 2 +- data/granularity/techs.ruleset | 2 +- data/multiplayer/techs.ruleset | 2 +- data/ruledit/comments-3.1.txt | 2 +- data/sandbox/techs.ruleset | 2 +- data/stub/techs.ruleset | 2 +- data/webperimental/techs.ruleset | 2 +- doc/HACKING | 2 +- server/unithand.c | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index 5ef7809879..b9dfd488e9 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -230,7 +230,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.0/action_dialog.c b/client/gui-gtk-3.0/action_dialog.c index 192393d2c7..b1b92238c9 100644 --- a/client/gui-gtk-3.0/action_dialog.c +++ b/client/gui-gtk-3.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/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 081596ce21..fe784dc3b0 100644 --- a/common/actions.c +++ b/common/actions.c @@ -5308,7 +5308,7 @@ static struct act_prob ap_diplomat_battle(const struct unit *pattacker, pdefender = get_diplomatic_defender(pattacker, pvictim, tgt_tile); 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); }; @@ -6998,7 +6998,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 * get_target_bonus_effects( NULL, diff --git a/common/map.c b/common/map.c index 5e1eaf2a6f..e2c9d580f0 100644 --- a/common/map.c +++ b/common/map.c @@ -1283,7 +1283,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 655a528078..544baabc3f 100644 --- a/common/networking/dataio_json.c +++ b/common/networking/dataio_json.c @@ -86,7 +86,7 @@ static void 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 void plocation_write_field(json_t *item, const struct plocation *location, @@ -101,7 +101,7 @@ static void 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 void plocation_write_elem(json_t *item, const struct plocation *location, @@ -140,7 +140,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) @@ -154,7 +154,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 2931694a6f..0d6813deeb 100644 --- a/data/alien/techs.ruleset +++ b/data/alien/techs.ruleset @@ -82,7 +82,7 @@ format_version=20 ; 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 bfee12a3eb..713c82cc8c 100644 --- a/data/civ1/techs.ruleset +++ b/data/civ1/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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 61cc6df91e..e695869569 100644 --- a/data/civ2/techs.ruleset +++ b/data/civ2/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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 08f3f89273..b1c8175b26 100644 --- a/data/civ2civ3/techs.ruleset +++ b/data/civ2civ3/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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 170241cfd4..aed211bd5f 100644 --- a/data/classic/techs.ruleset +++ b/data/classic/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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/experimental/techs.ruleset b/data/experimental/techs.ruleset index 9f0bf8ebf9..14d607fc08 100644 --- a/data/experimental/techs.ruleset +++ b/data/experimental/techs.ruleset @@ -80,7 +80,7 @@ format_version=20 ; 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 2eedf346e1..5db840def4 100644 --- a/data/granularity/techs.ruleset +++ b/data/granularity/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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 a9ff1c6a1f..fb8f710c20 100644 --- a/data/multiplayer/techs.ruleset +++ b/data/multiplayer/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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.1.txt b/data/ruledit/comments-3.1.txt index bc862ca64f..6e2b3cbfcc 100644 --- a/data/ruledit/comments-3.1.txt +++ b/data/ruledit/comments-3.1.txt @@ -125,7 +125,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 dda815c46a..5d205ca9a0 100644 --- a/data/sandbox/techs.ruleset +++ b/data/sandbox/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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 02caf2f9ef..12f692c1d1 100644 --- a/data/stub/techs.ruleset +++ b/data/stub/techs.ruleset @@ -72,7 +72,7 @@ format_version=20 ; 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 18c481be12..c3e71a78e9 100644 --- a/data/webperimental/techs.ruleset +++ b/data/webperimental/techs.ruleset @@ -78,7 +78,7 @@ format_version=20 ; 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 9c925ab49e..ef36a4fe48 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 4ff26d4851..c74a19f960 100644 --- a/server/unithand.c +++ b/server/unithand.c @@ -953,7 +953,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