Merge branch 'For2.2.2-Fix-Hourier' of https://scm.osdn.net/gitroot/hengband/hengband...

diff --cc src/target/target-describer.c
index a1d132f,c6dcb7d..8a67d80
--- 1/src/target/target-describer.c
--- 2/src/target/target-describer.c
+++ b/src/target/target-describer.c
@@@ -282,10 -236,42 +282,11 @@@ char examine_grid(player_type *subject_
          if ((eg_ptr->query == ' ') && !(mode & TARGET_LOOK))
              return eg_ptr->query;
  
 -        eg_ptr->s1 = _("それは", "It is ");
 -        if (ap_r_ptr->flags1 & RF1_FEMALE)
 -            eg_ptr->s1 = _("彼女は", "She is ");
 -        else if (ap_r_ptr->flags1 & RF1_MALE)
 -            eg_ptr->s1 = _("彼は", "He is ");
 -
 -#ifdef JP
 -        eg_ptr->s2 = "を";
 -        eg_ptr->s3 = "持っている";
 -#else
 -        eg_ptr->s2 = "carrying ";
 -#endif
 -
 -        for (OBJECT_IDX this_o_idx = eg_ptr->m_ptr->hold_o_idx; this_o_idx; this_o_idx = eg_ptr->next_o_idx) {
 -            GAME_TEXT o_name[MAX_NLEN];
 -            object_type *o_ptr;
 -            o_ptr = &subject_ptr->current_floor_ptr->o_list[this_o_idx];
 -            eg_ptr->next_o_idx = o_ptr->next_o_idx;
 -            describe_flavor(subject_ptr, o_name, o_ptr, 0);
 -#ifdef JP
 -            sprintf(eg_ptr->out_val, "%s%s%s%s[%s]", eg_ptr->s1, o_name, eg_ptr->s2, eg_ptr->s3, eg_ptr->info);
 -#else
 -            sprintf(eg_ptr->out_val, "%s%s%s%s [%s]", eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, o_name, eg_ptr->info);
 -#endif
 -            prt(eg_ptr->out_val, 0, 0);
 -            move_cursor_relative(y, x);
 -            eg_ptr->query = inkey();
 -            if ((eg_ptr->query != '\r') && (eg_ptr->query != '\n') && (eg_ptr->query != ' ') && (eg_ptr->query != 'x'))
 -                return eg_ptr->query;
 -
 -            if ((eg_ptr->query == ' ') && !(mode & TARGET_LOOK))
 -                return eg_ptr->query;
 -
 -            eg_ptr->s2 = _("をまた", "also carrying ");
 -        }
 +        describe_monster_person(eg_ptr);
 +        u16b monster_item_description = describe_monster_item(subject_ptr, eg_ptr);
 +        if ((monster_item_description > -127) && (monster_item_description < 128))
 +            return (char)monster_item_description;
+ 
  #ifdef JP
          eg_ptr->s2 = "の上";
          eg_ptr->s3 = "にいる";