Merge remote-tracking branch 'remotes/origin/feature/Fix-English-Bugs' into develop

diff --cc src/cmd-action/cmd-attack.c
index ee5125f,02f5d74..569ef30
--- 1/src/cmd-action/cmd-attack.c
--- 2/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@@ -169,9 -169,9 +169,9 @@@ bool do_cmd_attack(player_type *attacke
  
      take_turn(attacker_ptr, 100);
  
 -    if (!has_right_hand_weapon(attacker_ptr) && !has_left_hand_weapon(attacker_ptr)
 +    if (!can_attack_with_main_hand(attacker_ptr) && !can_attack_with_sub_hand(attacker_ptr)
          && !(attacker_ptr->muta2 & (MUT2_HORNS | MUT2_BEAK | MUT2_SCOR_TAIL | MUT2_TRUNK | MUT2_TENTACLES))) {
-         msg_format(_("%s攻撃できない。", "You cannot do attacking."), (empty_hands(attacker_ptr, FALSE) == EMPTY_HAND_NONE) ? _("両手がふさがって", "") : "");
+         msg_format(_("%s攻撃できない。", "You cannot attack."), (empty_hands(attacker_ptr, FALSE) == EMPTY_HAND_NONE) ? _("両手がふさがって", "") : "");
          return FALSE;
      }
  

diff --cc src/cmd-action/cmd-pet.c
Simple merge

diff --cc src/cmd-item/cmd-equipment.c
Simple merge