From e714b5b94f8efd0481f250e7c8a9271b11fc28e6 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 12 Jan 2020 20:47:59 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20#39587=20misc=5Fenglish=5Fusage=5Fpatch.?= =?utf8?q?txt=20=E3=81=AB=E5=BE=93=E3=81=84=E8=8B=B1=E6=96=87=E6=A0=A1?= =?utf8?q?=E6=AD=A3=20/=20Proofreading=20English=20in=20compliance=20with?= =?utf8?q?=20misc=5Fenglish=5Fusage=5Fpatch.txt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-basic.c | 4 ++-- src/cmd/cmd-gameoption.c | 4 ++-- src/cmd/cmd-gameoption.h | 2 +- src/cmd/cmd-pet.c | 2 +- src/combat/melee1.c | 8 ++++---- src/combat/shoot.c | 6 +++--- src/core.c | 12 ++++++------ src/monster-process.c | 4 ++-- src/player-damage.c | 2 +- src/realm-hex.c | 4 ++-- src/spells-object.c | 2 +- src/spells-status.c | 2 +- src/spells-summon.c | 2 +- src/spells1.c | 10 +++++----- src/spells2.c | 4 ++-- src/targeting.c | 4 ++-- src/util.c | 2 +- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index a1e4da71a..cbef9472d 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -2749,7 +2749,7 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID { if (item >= 0) { - msg_format(_("%sを受け損ねた!", "%s backs, but you can't catch!"), o2_name); + msg_format(_("%sを受け損ねた!", "%s comes backs, but you can't catch!"), o2_name); } else { @@ -2761,7 +2761,7 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID } else { - msg_format(_("%sが返ってこなかった!", "%s doesn't back!"), o2_name); + msg_format(_("%sが返ってこなかった!", "%s doesn't come back!"), o2_name); } } diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 7a05814f3..307a2271e 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -165,7 +165,7 @@ bool record_sell; /* Record sold items */ bool record_danger; /* Record hitpoint warning */ bool record_arena; /* Record arena victories */ bool record_ident; /* Record first identified items */ -bool record_named_pet; /* Record informations of named pets */ +bool record_named_pet; /* Record information about named pets */ char record_o_name[MAX_NLEN]; GAME_TURN record_turn; @@ -594,7 +594,7 @@ const option_type option_info[] = "record_ident", _("未判明のアイテムの識別を記録する", "Record first identified items") }, { &record_named_pet, FALSE, OPT_PAGE_PLAYRECORD, 4, 23, - "record_named_pet", _("名前つきペットの情報を記録する", "Record informations of named pets") }, + "record_named_pet", _("名前つきペットの情報を記録する", "Record information about named pets") }, /*** End of Table ***/ diff --git a/src/cmd/cmd-gameoption.h b/src/cmd/cmd-gameoption.h index 2c1a69662..bfadb0529 100644 --- a/src/cmd/cmd-gameoption.h +++ b/src/cmd/cmd-gameoption.h @@ -169,7 +169,7 @@ extern bool record_sell; /* Record sold items */ extern bool record_danger; /* Record hitpoint warning */ extern bool record_arena; /* Record arena victories */ extern bool record_ident; /* Record first identified items */ -extern bool record_named_pet; /* Record informations of named pets */ +extern bool record_named_pet; /* Record information about named pets */ extern char record_o_name[MAX_NLEN]; extern GAME_TURN record_turn; diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c index 4bb64a2b5..94169c2cb 100644 --- a/src/cmd/cmd-pet.c +++ b/src/cmd/cmd-pet.c @@ -365,7 +365,7 @@ bool do_cmd_riding(player_type *creature_ptr, bool force) GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, 0); (void)set_monster_csleep(g_ptr->m_idx, 0); - msg_format(_("%sを起こした。", "You have waked %s up."), m_name); + msg_format(_("%sを起こした。", "You have woken %s up."), m_name); } if (creature_ptr->action == ACTION_KAMAE) set_action(creature_ptr, ACTION_NONE); diff --git a/src/combat/melee1.c b/src/combat/melee1.c index fd16eaabf..ed39c6ae9 100644 --- a/src/combat/melee1.c +++ b/src/combat/melee1.c @@ -2399,7 +2399,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) if (target_ptr->special_defense & KATA_IAI) { - msg_format(_("相手が襲いかかる前に素早く武器を振るった。", "You took sen, draw and cut in one motion before %s move."), m_name); + msg_format(_("相手が襲いかかる前に素早く武器を振るった。", "You took sen, draw and cut in one motion before %s moved."), m_name); if (py_attack(target_ptr, m_ptr->fy, m_ptr->fx, HISSATSU_IAI)) return TRUE; } @@ -3912,7 +3912,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) /* Modify the damage */ dam = mon_damage_mod(m_ptr, dam, FALSE); - msg_format(_("影のオーラが%^sに反撃した!", "Enveloped shadows attack %^s."), m_name); + msg_format(_("影のオーラが%^sに反撃した!", "Enveloping shadows attack %^s."), m_name); if (mon_take_hit(m_idx, dam, &fear, _("は倒れた。", " is destroyed."))) { blinked = FALSE; @@ -4071,7 +4071,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) monster_desc(m_target_name, m_ptr, 0); target_ptr->csp -= 7; - msg_format(_("%^sに反撃した!", "Your counterattack to %s!"), m_target_name); + msg_format(_("%^sに反撃した!", "Your counterattacked to %s!"), m_target_name); py_attack(target_ptr, m_ptr->fy, m_ptr->fx, HISSATSU_COUNTER); fear = FALSE; target_ptr->redraw |= (PR_MANA); @@ -4921,7 +4921,7 @@ void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, if (m_ptr->hp > m_ptr->maxhp / 3) dam = (dam + 1) / 2; if (rakuba(p_ptr, (dam > 200) ? 200 : dam, FALSE)) { - msg_format(_("%^sに振り落とされた!", "You have thrown off from %s!"), m_name); + msg_format(_("%^sに振り落とされた!", "You have been thrown off from %s!"), m_name); } } diff --git a/src/combat/shoot.c b/src/combat/shoot.c index aa5d42314..693971ba4 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -688,7 +688,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, monster_desc(m_name, m_ptr, 0); tdam = m_ptr->hp + 1; - msg_format(_("%sの急所に突き刺さった!", "Your shot sticked on a fatal spot of %s!"), m_name); + msg_format(_("%sの急所に突き刺さった!", "Your shot hit a fatal spot of %s!"), m_name); } else tdam = 1; } @@ -745,7 +745,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, monster_desc(m_name, m_ptr, 0); stick_to = TRUE; - msg_format(_("%sは%sに突き刺さった!", "%^s have stuck into %s!"), o_name, m_name); + msg_format(_("%sは%sに突き刺さった!", "%^s is stuck in %s!"), o_name, m_name); } message_pain(c_mon_ptr->m_idx, tdam); @@ -835,7 +835,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, if (!o_idx) { - msg_format(_("%sはどこかへ行った。", "The %s have gone to somewhere."), o_name); + msg_format(_("%sはどこかへ行った。", "The %s went somewhere."), o_name); if (object_is_fixed_artifact(q_ptr)) { a_info[j_ptr->name1].cur_num = 0; diff --git a/src/core.c b/src/core.c index 475240d2b..ee4c3288d 100644 --- a/src/core.c +++ b/src/core.c @@ -2719,7 +2719,7 @@ static void process_world_aux_curse(player_type *creature_ptr) GAME_TEXT o_name[MAX_NLEN]; object_desc(o_name, choose_cursed_obj_name(TRC_CALL_ANIMAL), (OD_OMIT_PREFIX | OD_NAME_ONLY)); - msg_format(_("%sが動物を引き寄せた!", "Your %s have attracted an animal!"), o_name); + msg_format(_("%sが動物を引き寄せた!", "Your %s has attracted an animal!"), o_name); disturb(creature_ptr, FALSE, TRUE); } } @@ -2731,7 +2731,7 @@ static void process_world_aux_curse(player_type *creature_ptr) GAME_TEXT o_name[MAX_NLEN]; object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DEMON), (OD_OMIT_PREFIX | OD_NAME_ONLY)); - msg_format(_("%sが悪魔を引き寄せた!", "Your %s have attracted a demon!"), o_name); + msg_format(_("%sが悪魔を引き寄せた!", "Your %s has attracted a demon!"), o_name); disturb(creature_ptr, FALSE, TRUE); } } @@ -2744,7 +2744,7 @@ static void process_world_aux_curse(player_type *creature_ptr) GAME_TEXT o_name[MAX_NLEN]; object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DRAGON), (OD_OMIT_PREFIX | OD_NAME_ONLY)); - msg_format(_("%sがドラゴンを引き寄せた!", "Your %s have attracted an dragon!"), o_name); + msg_format(_("%sがドラゴンを引き寄せた!", "Your %s has attracted an dragon!"), o_name); disturb(creature_ptr, FALSE, TRUE); } } @@ -2757,7 +2757,7 @@ static void process_world_aux_curse(player_type *creature_ptr) GAME_TEXT o_name[MAX_NLEN]; object_desc(o_name, choose_cursed_obj_name(TRC_CALL_UNDEAD), (OD_OMIT_PREFIX | OD_NAME_ONLY)); - msg_format(_("%sが死霊を引き寄せた!", "Your %s have attracted an undead!"), o_name); + msg_format(_("%sが死霊を引き寄せた!", "Your %s has attracted an undead!"), o_name); disturb(creature_ptr, FALSE, TRUE); } } @@ -4519,7 +4519,7 @@ static void process_player(player_type *creature_ptr) /* Recover fully */ (void)set_monster_csleep(creature_ptr->riding, 0); monster_desc(m_name, m_ptr, 0); - msg_format(_("%^sを起こした。", "You have waked %s up."), m_name); + msg_format(_("%^sを起こした。", "You have woken %s up."), m_name); } if (MON_STUNNED(m_ptr)) @@ -4554,7 +4554,7 @@ static void process_player(player_type *creature_ptr) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, 0); - msg_format(_("%^sを恐怖から立ち直らせた。", "%^s is no longer fear."), m_name); + msg_format(_("%^sを恐怖から立ち直らせた。", "%^s is no longer afraid."), m_name); } } diff --git a/src/monster-process.c b/src/monster-process.c index ebd770593..585b02321 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -1380,7 +1380,7 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx) if (is_riding_mon && riding_pinch < 2) { msg_format(_("%sは傷の痛さの余りあなたの束縛から逃れようとしている。", - "%^s seems to be in so much pain, and trying to escape from your restriction."), m_name); + "%^s seems to be in so much pain and trying to escape from your restriction."), m_name); riding_pinch++; disturb(target_ptr, TRUE, TRUE); } @@ -1402,7 +1402,7 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx) { msg_format(_("%^s「ピンチだ!退却させてもらう!」", "%^s says 'It is the pinch! I will retreat'."), m_name); } - msg_format(_("%^sがテレポート・レベルの巻物を読んだ。", "%^s read a scroll of teleport level."), m_name); + msg_format(_("%^sがテレポート・レベルの巻物を読んだ。", "%^s reads a scroll of teleport level."), m_name); msg_format(_("%^sが消え去った。", "%^s disappears."), m_name); } diff --git a/src/player-damage.c b/src/player-damage.c index 4a9829320..8a2885320 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -149,7 +149,7 @@ static bool acid_minus_ac(player_type *creature_ptr) /* No damage left to be done */ if (o_ptr->ac + o_ptr->to_a <= 0) { - msg_format(_("%sは既にボロボロだ!", "Your %s is already crumble!"), o_name); + msg_format(_("%sは既にボロボロだ!", "is already fully corroded!"), o_name); return (FALSE); } diff --git a/src/realm-hex.c b/src/realm-hex.c index fa41070de..b76afc39e 100644 --- a/src/realm-hex.c +++ b/src/realm-hex.c @@ -987,7 +987,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) #ifdef JP msg_print("武器の渇望が消え去った。"); #else - msg_format("Thirsty of weapon%s disappeared.", (empty_hands(caster_ptr, FALSE)) ? "" : "s"); + msg_format("Your weapon%s less thirsty now.", (empty_hands(FALSE)) ? " is" : "s are"); #endif } break; @@ -1109,7 +1109,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) } else { - msg_print(_("復讐する気が失せた。", "You are not a mood to revenge.")); + msg_print(_("復讐する気が失せた。", "You are not in the mood for revenge.")); } HEX_REVENGE_POWER(caster_ptr) = 0; } diff --git a/src/spells-object.c b/src/spells-object.c index efb862a1f..28fcc320d 100644 --- a/src/spells-object.c +++ b/src/spells-object.c @@ -1309,7 +1309,7 @@ void brand_weapon(player_type *caster_ptr, int brand_type) { if (flush_failure) flush(); - msg_print(_("属性付加に失敗した。", "The Branding failed.")); + msg_print(_("属性付加に失敗した。", "The branding failed.")); chg_virtue(caster_ptr, V_ENCHANT, -2); calc_android_exp(caster_ptr); return; diff --git a/src/spells-status.c b/src/spells-status.c index c5f8a63f6..59d06cf4d 100644 --- a/src/spells-status.c +++ b/src/spells-status.c @@ -448,7 +448,7 @@ bool fishing(player_type *creature_ptr) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[y][x].m_idx], 0); - msg_format(_("%sが邪魔だ!", "%^s is stand in your way."), m_name); + msg_format(_("%sが邪魔だ!", "%^s is standing in your way."), m_name); free_turn(creature_ptr); return FALSE; } diff --git a/src/spells-summon.c b/src/spells-summon.c index 13104c735..3a717838e 100644 --- a/src/spells-summon.c +++ b/src/spells-summon.c @@ -310,7 +310,7 @@ void mitokohmon(player_type *kohmon_ptr) if (count) { msg_format(_("「者ども、ひかえおろう!!!このお方をどなたとこころえる。」", - "%^s says 'WHO do you think this person is! Bow your head, down your knees!'"), kakusan); + "%^s says 'WHO do you think this person is! Bow your head, down to your knees!'"), kakusan); sukekaku = TRUE; stun_monsters(kohmon_ptr, 120); confuse_monsters(kohmon_ptr, 120); diff --git a/src/spells1.c b/src/spells1.c index 6ce6f0914..8dbf50228 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -659,7 +659,7 @@ if (have_flag(f_ptr->flags, FF_TREE)) { if (is_mirror_grid(g_ptr)) { - msg_print(_("鏡が割れた!", "The mirror was crashed!")); + msg_print(_("鏡が割れた!", "The mirror was shattered!")); sound(SOUND_GLASS); remove_mirror(caster_ptr, y, x); project(caster_ptr, 0, 2, y, x, caster_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1); @@ -669,7 +669,7 @@ if (have_flag(f_ptr->flags, FF_TREE)) { if (known && (g_ptr->info & CAVE_MARK)) { - msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(g_ptr)].name); + msg_format(_("%sが割れた!", "The %s crumbled!"), f_name + f_info[get_feat_mimic(g_ptr)].name); sound(SOUND_GLASS); } @@ -685,7 +685,7 @@ if (have_flag(f_ptr->flags, FF_TREE)) { if (is_mirror_grid(g_ptr) && caster_ptr->lev < 40) { - msg_print(_("鏡が割れた!", "The mirror was crashed!")); + msg_print(_("鏡が割れた!", "The mirror was shattered!")); sound(SOUND_GLASS); remove_mirror(caster_ptr, y, x); project(caster_ptr, 0, 2, y, x, caster_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1); @@ -695,7 +695,7 @@ if (have_flag(f_ptr->flags, FF_TREE)) { if (known && (g_ptr->info & CAVE_MARK)) { - msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(g_ptr)].name); + msg_format(_("%sが割れた!", "The %s crumbled!"), f_name + f_info[get_feat_mimic(g_ptr)].name); sound(SOUND_GLASS); } @@ -3484,7 +3484,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID if (seen) obvious = TRUE; if (genocide_aux(caster_ptr, g_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One"))) { - if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappered!"), m_name); + if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappeared!"), m_name); chg_virtue(caster_ptr, V_VITALITY, -1); return TRUE; } diff --git a/src/spells2.c b/src/spells2.c index 75c32f2b5..4668251ed 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1425,7 +1425,7 @@ void discharge_minion(player_type *caster_ptr) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, 0x00); - msg_format(_("%sは爆破されるのを嫌がり、勝手に自分の世界へと帰った。", "%^s resists to be blasted, and run away."), m_name); + msg_format(_("%sは爆破されるのを嫌がり、勝手に自分の世界へと帰った。", "%^s resists being blasted and runs away."), m_name); delete_monster_idx(i); continue; } @@ -4662,7 +4662,7 @@ bool rodeo(player_type *creature_ptr) } else { - msg_format(_("%sに振り落とされた!", "You have thrown off by %s."), m_name); + msg_format(_("%sに振り落とされた!", "You have been thrown off by %s."), m_name); rakuba(creature_ptr, 1, TRUE); /* 落馬処理に失敗してもとにかく乗馬解除 */ creature_ptr->riding = 0; diff --git a/src/targeting.c b/src/targeting.c index 05dd6da30..e835c5acf 100644 --- a/src/targeting.c +++ b/src/targeting.c @@ -1763,7 +1763,7 @@ bool get_direction(player_type *creature_ptr, DIRECTION *dp, bool allow_under, b monster_desc(m_name, m_ptr, 0); if (MON_CONFUSED(m_ptr)) { - msg_format(_("%sは混乱している。", "%^s is confusing."), m_name); + msg_format(_("%sは混乱している。", "%^s is confused."), m_name); } else { @@ -1908,7 +1908,7 @@ bool get_rep_dir(DIRECTION *dp, bool under) monster_desc(m_name, m_ptr, 0); if (MON_CONFUSED(m_ptr)) { - msg_format(_("%sは混乱している。", "%^s is confusing."), m_name); + msg_format(_("%sは混乱している。", "%^s is confused."), m_name); } else { diff --git a/src/util.c b/src/util.c index a01b43776..0452de20a 100644 --- a/src/util.c +++ b/src/util.c @@ -4216,7 +4216,7 @@ menu_naiyou menu_info[10][10] = {"Identify symbol(/)", '/', TRUE}, {"Show prev messages(^p)", KTRL('P'), TRUE}, {"Current time(^t/')", KTRL('T'), TRUE}, - {"Various informations(~)", '~', TRUE}, + {"Various information(~)", '~', TRUE}, {"Play record menu(|)", '|', TRUE}, {"", 0, FALSE} }, -- 2.11.0