Changed the English diary entries about the gender and personality selections so...

[hengbandforosx/hengbandosx.git] / src / birth.c

diff --git a/src/birth.c b/src/birth.c
index 27aa934..ae91e68 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -668,8 +668,6 @@ static byte choose_realm(s32b choices, int *count)
                if (cs != os)
                {
                        c_put_str(TERM_WHITE, cur, 12 + (os/5), 2 + 15 * (os%5));
-                       put_str("                                   ", 3, 40);
-                       put_str("                                   ", 4, 40);
 
                        if(cs == n)
                        {
@@ -679,14 +677,9 @@ static byte choose_realm(s32b choices, int *count)
                        {
                                sprintf(cur, "%c%c %s", sym[cs], p2, realm_names[picks[cs]]);
                                sprintf(buf, "%s", realm_names[picks[cs]]);
-#ifdef JP
                                c_put_str(TERM_L_BLUE, buf, 3, 40);
-                               put_str("の特徴", 3, 40+strlen(buf));
-#else
-                               c_put_str(TERM_L_BLUE, realm_names[picks[cs]], 3, 40);
-                               put_str(": Characteristic", 3, 40+strlen(realm_names[picks[cs]]));
-#endif
-                               put_str(realm_subinfo[technic2magic(picks[cs])-1], 4, 40);
+                               prt(_("の特徴", ": Characteristic"), 3, 40+strlen(buf));
+                               prt(realm_subinfo[technic2magic(picks[cs])-1], 4, 40);
                        }
                        c_put_str(TERM_YELLOW, cur, 12 + (cs/5), 2 + 15 * (cs%5));
                        os = cs;
@@ -3855,7 +3848,7 @@ static bool player_birth_aux(void)
        /*** Instructions ***/
 
        /* Display some helpful information */
-       put_str(_("キャラクターを作成します。('S'やり直す, 'Q'終了, '?'ヘルプ)", "Make your charactor. ('S' Restart, 'Q' Quit, '?' Help)"), 8, 10);
+       put_str(_("キャラクターを作成します。('S'やり直す, 'Q'終了, '?'ヘルプ)", "Make your character. ('S' Restart, 'Q' Quit, '?' Help)"), 8, 10);
 
        /*** Player sex ***/
 
@@ -4581,25 +4574,25 @@ void player_birth(void)
        message_add(" ");
        message_add("  ");
 
-       do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------"));
+       do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "------- Started New Game -------"));
        do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
 
-       sprintf(buf,_("                            性別に%sを選択した。", "                            choose %s personality."), sex_info[p_ptr->psex].title);
+       sprintf(buf,_("                            性別に%sを選択した。", "                            chose %s gender."), sex_info[p_ptr->psex].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
-       sprintf(buf,_("                            種族に%sを選択した。", "                            choose %s race."), race_info[p_ptr->prace].title);
+       sprintf(buf,_("                            種族に%sを選択した。", "                            chose %s race."), race_info[p_ptr->prace].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
-       sprintf(buf,_("                            職業に%sを選択した。", "                            choose %s class."), class_info[p_ptr->pclass].title);
+       sprintf(buf,_("                            職業に%sを選択した。", "                            chose %s class."), class_info[p_ptr->pclass].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
        if (p_ptr->realm1)
        {
-               sprintf(buf,_("                            魔法の領域に%s%sを選択した。", "                            choose %s%s realm."),realm_names[p_ptr->realm1], p_ptr->realm2 ? format("と%s",realm_names[p_ptr->realm2]) : "");
+               sprintf(buf,_("                            魔法の領域に%s%sを選択した。", "                            chose %s%s."),realm_names[p_ptr->realm1], p_ptr->realm2 ? format(_("と%s", " and %s realms"),realm_names[p_ptr->realm2]) : _("", " realm"));
                do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
        }
 
-       sprintf(buf,_("                            性格に%sを選択した。", "                            choose %s."), seikaku_info[p_ptr->pseikaku].title);
+       sprintf(buf,_("                            性格に%sを選択した。", "                            chose %s personality."), seikaku_info[p_ptr->pseikaku].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
        /* Init the shops */