For consistency, changed English diary entries to use simple past tense. In a couple...

diff --git a/src/birth.c b/src/birth.c
index b30bdc8..aaf7f9b 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -4592,25 +4592,25 @@ void player_birth(player_type *creature_ptr)
        message_add(" ");
        message_add("  ");
 
-       exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------"));
+       exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "------- Started New Game -------"));
        exe_write_diary(creature_ptr, DIARY_DIALY, 0, NULL);
 
-       sprintf(buf, _("                            性別に%sを選択した。", "                            choose %s personality."), sex_info[creature_ptr->psex].title);
+       sprintf(buf, _("                            性別に%sを選択した。", "                            chose %s personality."), sex_info[creature_ptr->psex].title);
        exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf);
 
-       sprintf(buf, _("                            種族に%sを選択した。", "                            choose %s race."), race_info[creature_ptr->prace].title);
+       sprintf(buf, _("                            種族に%sを選択した。", "                            chose %s race."), race_info[creature_ptr->prace].title);
        exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf);
 
-       sprintf(buf, _("                            職業に%sを選択した。", "                            choose %s class."), class_info[creature_ptr->pclass].title);
+       sprintf(buf, _("                            職業に%sを選択した。", "                            chose %s class."), class_info[creature_ptr->pclass].title);
        exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf);
 
        if (creature_ptr->realm1)
        {
-               sprintf(buf, _("                            魔法の領域に%s%sを選択した。", "                            choose %s%s realm."), realm_names[creature_ptr->realm1], creature_ptr->realm2 ? format("と%s", realm_names[creature_ptr->realm2]) : "");
+               sprintf(buf, _("                            魔法の領域に%s%sを選択した。", "                            chose %s%s realm."), realm_names[creature_ptr->realm1], creature_ptr->realm2 ? format("と%s", realm_names[creature_ptr->realm2]) : "");
                exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf);
        }
 
-       sprintf(buf, _("                            性格に%sを選択した。", "                            choose %s."), seikaku_info[creature_ptr->pseikaku].title);
+       sprintf(buf, _("                            性格に%sを選択した。", "                            chose %s."), seikaku_info[creature_ptr->pseikaku].title);
        exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf);
 
        /* Init the shops */

diff --git a/src/bldg.c b/src/bldg.c
index bb6ee33..e6ac57d 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2087,9 +2087,9 @@ static bool inn_comm(player_type *customer_ptr, int cmd)
 
                extract_day_hour_min(customer_ptr, &prev_day, &prev_hour, &prev_min);
                if ((prev_hour >= 6) && (prev_hour <= 17))
-                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("宿屋に泊まった。", "stay over daytime at the inn."));
+                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("宿屋に泊まった。", "stayed during the day at the inn."));
                else
-                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("宿屋に泊まった。", "stay over night at the inn."));
+                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("宿屋に泊まった。", "stayed overnight at the inn."));
 
                current_world_ptr->game_turn = (current_world_ptr->game_turn / (TURNS_PER_TICK * TOWN_DAWN / 2) + 1) * (TURNS_PER_TICK * TOWN_DAWN / 2);
                if (current_world_ptr->dungeon_turn < current_world_ptr->dungeon_turn_limit)
@@ -2114,7 +2114,7 @@ static bool inn_comm(player_type *customer_ptr, int cmd)
                        }
 
                        msg_print(_("あなたは絶叫して目を覚ました。", "You awake screaming."));
-                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare."));
+                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("悪夢にうなされてよく眠れなかった。", "had a nightmare."));
                        break;
                }
 
@@ -2140,12 +2140,12 @@ static bool inn_comm(player_type *customer_ptr, int cmd)
                if ((prev_hour >= 6) && (prev_hour <= 17))
                {
                        msg_print(_("あなたはリフレッシュして目覚め、夕方を迎えた。", "You awake refreshed for the evening."));
-                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("夕方を迎えた。", "awake refreshed."));
+                       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("夕方を迎えた。", "awoke refreshed."));
                        break;
                }
 
                msg_print(_("あなたはリフレッシュして目覚め、新たな日を迎えた。", "You awake refreshed for the new day."));
-               exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("すがすがしい朝を迎えた。", "awake refreshed."));
+               exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("すがすがしい朝を迎えた。", "awoke refreshed."));
                break;
        }
        case BACT_RUMORS: /* Listen for rumors */

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 1e11cec..8573cad 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -2870,7 +2870,7 @@ void do_cmd_suicide(player_type *creature_ptr)
 
        if (!current_world_ptr->total_winner)
        {
-               exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("ダンジョンの探索に絶望して自殺した。", "give up all hope to commit suicide."));
+               exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("ダンジョンの探索に絶望して自殺した。", "gave up all hope to commit suicide."));
                exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
                exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n");
        }

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 4907cd5..94fabaa 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -359,7 +359,7 @@ static void do_cmd_last_get(player_type *creaute_ptr)
 
        GAME_TURN turn_tmp = current_world_ptr->game_turn;
        current_world_ptr->game_turn = record_turn;
-       sprintf(buf, _("%sを手に入れた。", "discover %s."), record_o_name);
+       sprintf(buf, _("%sを手に入れた。", "discovered %s."), record_o_name);
        exe_write_diary(creaute_ptr, DIARY_DESCRIPTION, 0, buf);
        current_world_ptr->game_turn = turn_tmp;
 }

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index cff32db..4955b8c 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -1107,7 +1107,7 @@ static void do_cmd_options_cheat(concptr info)
                {
                        if (!current_world_ptr->noscore)
                                exe_write_diary(p_ptr, DIARY_DESCRIPTION, 0,
-                                       _("詐欺オプションをONにして、スコアを残せなくなった。", "give up sending score to use cheating options."));
+                                       _("詐欺オプションをONにして、スコアを残せなくなった。", "gave up sending score to use cheating options."));
                        current_world_ptr->noscore |= (cheat_info[k].o_set * 256 + cheat_info[k].o_bit);
                        (*cheat_info[k].o_var) = TRUE;
                        k = (k + 1) % n;

diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c
index 497834c..10745c4 100644 (file)
--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -63,5 +63,5 @@ void do_cmd_save_and_exit(player_type *creature_ptr)
 {
        creature_ptr->playing = FALSE;
        creature_ptr->leaving = TRUE;
-       exe_write_diary(creature_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
+       exe_write_diary(creature_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "--- Saved and Exited Game ---"));
 }

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 237c398..bde0f7e 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -727,7 +727,7 @@ static void change_realm2(player_type *caster_ptr, CHARACTER_IDX next_realm)
        caster_ptr->spell_worked2 = 0L;
        caster_ptr->spell_forgotten2 = 0L;
 
-       sprintf(tmp, _("魔法の領域を%sから%sに変更した。", "change magic realm from %s to %s."), realm_names[caster_ptr->realm2], realm_names[next_realm]);
+       sprintf(tmp, _("魔法の領域を%sから%sに変更した。", "changed magic realm from %s to %s."), realm_names[caster_ptr->realm2], realm_names[next_realm]);
        exe_write_diary(caster_ptr, DIARY_DESCRIPTION, 0, tmp);
        caster_ptr->old_realm |= 1 << (caster_ptr->realm2 - 1);
        caster_ptr->realm2 = next_realm;

diff --git a/src/core.c b/src/core.c
index 66de01b..f639265 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -2916,7 +2916,7 @@ static bool enter_wizard_mode(player_type *player_ptr)
                        return FALSE;
                }
 
-               exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode."));
+               exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "gave up recording score to enter wizard mode."));
                current_world_ptr->noscore |= 0x0002;
        }
 
@@ -2948,7 +2948,7 @@ static bool enter_debug_mode(player_type *player_ptr)
                        return FALSE;
                }
 
-               exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands."));
+               exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("デバッグモードに突入してスコアを残せなくなった。", "gave up sending score to use debug commands."));
                current_world_ptr->noscore |= 0x0008;
        }
 
@@ -4382,7 +4382,7 @@ void play_game(player_type *player_ptr, bool new_game)
                write_level = FALSE;
                exe_write_diary(player_ptr, DIARY_GAMESTART, 1,
                        _("                            ----ゲーム再開----",
-                               "                            ---- Restart Game ----"));
+                               "                            --- Restarted Game ---"));
 
                /*
                 * todo もう2.2.Xなので互換性は打ち切ってもいいのでは？
@@ -4476,7 +4476,7 @@ void play_game(player_type *player_ptr, bool new_game)
        if (new_game)
        {
                char buf[80];
-               sprintf(buf, _("%sに降り立った。", "You are standing in the %s."), map_name(player_ptr));
+               sprintf(buf, _("%sに降り立った。", "arrived in %s."), map_name(player_ptr));
                exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, buf);
        }
 

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index da61f0a..f50d7f9 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -223,7 +223,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note)
                if (quest[num].flags & QUEST_FLAG_SILENT) break;
 
                fprintf(fff, _(" %2d:%02d %20s クエスト「%s」から命からがら逃げ帰った。\n",
-                       " %2d:%02d %20s run away from quest '%s'.\n"), hour, min, note_level, quest[num].name);
+                       " %2d:%02d %20s ran away from quest '%s'.\n"), hour, min, note_level, quest[num].name);
                break;
        }
        case DIARY_RAND_QUEST_C:
@@ -290,7 +290,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note)
        }
        case DIARY_TELEPORT_LEVEL:
        {
-               fprintf(fff, _(" %2d:%02d %20s レベル・テレポートで脱出した。\n", " %2d:%02d %20s Got out using teleport level.\n"),
+               fprintf(fff, _(" %2d:%02d %20s レベル・テレポートで脱出した。\n", " %2d:%02d %20s got out using teleport level.\n"),
                        hour, min, note_level);
                break;
        }
@@ -337,7 +337,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note)
                        ? _("地上", "the surface")
                        : format(_("%d階(%s)", "level %d of %s"), creature_ptr->current_floor_ptr->dun_level, d_name + d_info[creature_ptr->dungeon_idx].name);
                fprintf(fff, _(" %2d:%02d %20s %sへとウィザード・テレポートで移動した。\n",
-                       " %2d:%02d %20s wizard-teleport to %s.\n"), hour, min, note_level, to);
+                       " %2d:%02d %20s wizard-teleported to %s.\n"), hour, min, note_level, to);
                break;
        }
        case DIARY_PAT_TELE:

diff --git a/src/main-win.c b/src/main-win.c
index 0faa3df..c8ceb5e 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -4191,7 +4191,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
                {
                        msg_flag = FALSE;
                        if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
-                       exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
+                       exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "--- Saved and Exited Game ---"));
 
                        p_ptr->panic_save = 1;
                        signals_ignore_tstp();

diff --git a/src/monster1.c b/src/monster1.c
index 4a4a940..23dee9a 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2724,7 +2724,7 @@ void monster_death(player_type *player_ptr, MONSTER_IDX m_idx, bool drop_item)
        current_world_ptr->total_winner = TRUE;
        player_ptr->redraw |= (PR_TITLE);
        play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
-       exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった！", "finally become *WINNER* of Hengband!"));
+       exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった！", "finally became *WINNER* of Hengband!"));
        admire_from_patron(player_ptr);
        msg_print(_("*** おめでとう ***", "*** CONGRATULATIONS ***"));
        msg_print(_("あなたはゲームをコンプリートしました。", "You have won the game!"));

diff --git a/src/patron.c b/src/patron.c
index 5554e1c..df3635c 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -669,7 +669,7 @@ void gain_level_reward(player_type *creature_ptr, int chosen_reward)
        }
        if (reward)
        {
-               exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, format(_("パトロンの報酬で%s", "The patron rewards you with %s."), reward));
+               exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, format(_("パトロンの報酬で%s", "The patron rewarded you with %s."), reward));
        }
 }
 

diff --git a/src/player-damage.c b/src/player-damage.c
index 92ca731..7ab7794 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -547,7 +547,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
 
                        if (winning_seppuku)
                        {
-                               exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "did Seppuku after the winning."));
+                               exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "committed seppuku after the winning."));
                        }
                        else
                        {
@@ -702,7 +702,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
                        if (creature_ptr->image && damage_type == DAMAGE_ATTACK)
                                hit_from = _("何か", "something");
 
-                       sprintf(tmp, _("%sによってピンチに陥った。", "A critical situation because of %s."), hit_from);
+                       sprintf(tmp, _("%sによってピンチに陥った。", "was in a critical situation because of %s."), hit_from);
                        exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, tmp);
                }
 

diff --git a/src/signal-handlers.c b/src/signal-handlers.c
index e0410a5..df473ec 100644 (file)
--- a/src/signal-handlers.c
+++ b/src/signal-handlers.c
@@ -139,7 +139,7 @@ static void handle_signal_abort(int sig)
 
        Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save..."));
 
-       exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----"));
+       exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム異常終了----", "-- Tried Panic Save and Aborted Game --"));
        Term_fresh();
 
        p_ptr->panic_save = 1;

diff --git a/src/spells3.c b/src/spells3.c
index e8db0e9..9c42fa0 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -724,7 +724,7 @@ bool recall_player(player_type *creature_ptr, TIME_EFFECT turns)
                {
                        max_dlv[creature_ptr->dungeon_idx] = creature_ptr->current_floor_ptr->dun_level;
                        if (record_maxdepth)
-                               exe_write_diary(creature_ptr, DIARY_TRUMP, creature_ptr->dungeon_idx, _("帰還のときに", "when recall from dungeon"));
+                               exe_write_diary(creature_ptr, DIARY_TRUMP, creature_ptr->dungeon_idx, _("帰還のときに", "when recalled from dungeon"));
                }
 
        }

diff --git a/src/trap.c b/src/trap.c
index b8574bf..360483a 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -444,7 +444,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
                        if (autosave_l && (trapped_ptr->chp >= 0))
                                do_cmd_save_game(trapped_ptr, TRUE);
 
-                       exe_write_diary(trapped_ptr, DIARY_DESCRIPTION, 0, _("落とし戸に落ちた", "You have fallen through a trap door!"));
+                       exe_write_diary(trapped_ptr, DIARY_DESCRIPTION, 0, _("落とし戸に落ちた", "fell through a trap door!"));
                        prepare_change_floor_mode(trapped_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT);
                        trapped_ptr->leaving = TRUE;
                }