Merge remote-tracking branch 'remotes/origin/feature/Refactoring-Hourier' into For2...

diff --git a/lib/edit/q0000004.txt b/lib/edit/q0000004.txt
index 94ed488..50a309c 100644 (file)
--- a/lib/edit/q0000004.txt
+++ b/lib/edit/q0000004.txt
@@ -50,7 +50,7 @@ Q:4:T:蔵の物品はお礼にお持ちください。空いた蔵は演劇場
 # Description for quest failed
 ?:[AND [EQU $QUEST4 5] [EQU $QUEST_TYPE4 3]]
 Q:$4:T:You didn't find the weapon? Well, the monsters have probably
-Q:$4:T:carried it away.  Too bad, it would have been quiet helpful
+Q:$4:T:carried it away.  Too bad, it would have been quite helpful
 Q:$4:T:in driving the evil out of our town.
 Q:4:T:あの武器を見つけられなかったのですか？おそらく、モンスターどもが持っていって
 Q:4:T:しまったんでしょうな。とても残念です。アレはこの街から悪を一掃する

diff --git a/lib/edit/q0000005.txt b/lib/edit/q0000005.txt
index e91e028..3d6af9a 100644 (file)
--- a/lib/edit/q0000005.txt
+++ b/lib/edit/q0000005.txt
@@ -32,7 +32,7 @@ Q:5:T:どうかモンスターどもを一掃して塔を取り戻してくだ
 Q:$5:T:Thank you for cleaning the tower of all these strange creatures.
 Q:$5:T:I've talked with Astinus, the local librarian, Suiyan, the local
 Q:$5:T:weaponmaster, and Lorien, the local beastmaster. They will offer you
-Q:$5:T:a special discount price when they serve you. And a small reward
+Q:$5:T:a special discount price when they serve you, and a small reward
 Q:$5:T:awaits you outside.
 Q:5:T:塔の怪物を一掃して下さって有難うございます。この街の司書のアスティヌス、
 Q:5:T:武器匠の水庵、モンスター仙人のロリエンに話を付けておいたので、

diff --git a/lib/edit/q0dumpwitness.txt b/lib/edit/q0dumpwitness.txt
index 4b987f7..ac3835a 100644 (file)
--- a/lib/edit/q0dumpwitness.txt
+++ b/lib/edit/q0dumpwitness.txt
@@ -11,8 +11,8 @@ Q:34:Q:6:0:0:0:5:0:0:0:6
 
 # Description for quest
 ?:[LEQ $QUEST34 2]
-Q:$34:T:Adventures are dead in the building behind this one. All windows and 
-Q:$34:T:doors are locked, we guess the murderer still hide in the house.
+Q:$34:T:Adventurers are dead in the building behind this one. All windows and 
+Q:$34:T:doors are locked. We guess the murderer still hides in the house.
 Q:$34:T:Your task is to clean everything up in the room.
 Q:34:T:この建物の裏の一軒家で冒険者が不審な死に方をしているとの報告がありました。
 Q:34:T:窓にも扉にも鍵がかかっており、殺戮者はまだ内部に潜んでいると思われます。

diff --git a/lib/edit/q0willow.txt b/lib/edit/q0willow.txt
index d86f0bf..1caec87 100644 (file)
--- a/lib/edit/q0willow.txt
+++ b/lib/edit/q0willow.txt
@@ -25,7 +25,7 @@ Q:31:T:クエストは街の東の平地にあります。
 
 # Description for quest reward
 ?:[EQU $QUEST31 3]
-Q:$31:T:Thank you!  Your reward is wating outside.
+Q:$31:T:Thank you!  Your reward is waiting outside.
 Q:31:T:ありがとうございます！外にお礼が置いてあります。
 ?:1
 

diff --git a/lib/edit/qdarkelf.txt b/lib/edit/qdarkelf.txt
index 856da57..8cd8f70 100644 (file)
--- a/lib/edit/qdarkelf.txt
+++ b/lib/edit/qdarkelf.txt
@@ -25,7 +25,7 @@ Q:32:T:たくさん護衛がいますから注意して下さい。
 
 # Description for quest reward
 ?:[EQU $QUEST32 3]
-Q:$32:T:Thank you!  Your reward is wating outside.
+Q:$32:T:Thank you!  Your reward is waiting outside.
 Q:32:T:ありがとうございます！外にお礼が置いてあります。
 ?:1
 

diff --git a/lib/edit/qhaunted.txt b/lib/edit/qhaunted.txt
index 3facf69..796b775 100644 (file)
--- a/lib/edit/qhaunted.txt
+++ b/lib/edit/qhaunted.txt
@@ -23,7 +23,7 @@ Q:25:T:我々はその家に住み着いている悪霊を退治してくれる
 ?:[EQU $QUEST25 3]
 Q:$25:T:Well done, indeed! Our citizens can finally sigh in relief.
 Q:$25:T:As a reward, we would like to give you something that will
-Q:$25:T:help you sence enemy even more efficiently!
+Q:$25:T:help you sense the enemy even more efficiently!
 Q:25:T:本当に良くやってくれました！我々住民はようやく安心することが出来ます。
 Q:25:T:お礼として、邪悪な者どもを更に効果的に感知することができるアイテムを
 Q:25:T:差し上げます。

diff --git a/src/mind.c b/src/mind.c
index 2feec38..b6ea3e4 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -464,7 +464,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
        "Gives aura which damages all monsters which attacked you for a while.",
        "Damages an adjacent monster, and blow it away.",
        "Fires a large energy ball.",
-       "Dispels all magics which is effecting a monster.",
+       "Dispels all magics which is affecting a monster.",
        "Summons ghosts.",
        "Generates a huge ball of frame which centered on you.",
        "Fires a long, powerful energy beam.",

diff --git a/src/player-effects.c b/src/player-effects.c
index cde4c56..311ff6b 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -3395,26 +3395,25 @@ bool hp_player(player_type *creature_ptr, int num)
  */
 static concptr desc_stat_pos[] =
 {
-       _("強く", "strong"),
-       _("知的に", "smart"),
-       _("賢く", "wise"),
-       _("器用に", "dextrous"),
-       _("健康に", "healthy"),
-       _("美しく", "cute")
+       _("強く", "stronger"),
+       _("知的に", "smarter"),
+       _("賢く", "wiser"),
+       _("器用に", "more dextrous"),
+       _("健康に", "healthier"),
+       _("美しく", "cuter")
 };
 
-
 /*
  * Array of stat "descriptions"
  */
 static concptr desc_stat_neg[] =
 {
-       _("弱く", "weak"),
-       _("無知に", "stupid"),
-       _("愚かに", "naive"),
-       _("不器用に", "clumsy"),
-       _("不健康に", "sickly"),
-       _("醜く", "ugly")
+       _("弱く", "weaker"),
+       _("無知に", "stupider"),
+       _("愚かに", "more naive"),
+       _("不器用に", "clumsier"),
+       _("不健康に", "more sickly"),
+       _("醜く", "uglier")
 };
 
 
@@ -3449,7 +3448,7 @@ bool do_dec_stat(player_type *creature_ptr, int stat)
        /* Attempt to reduce the stat */
        if (dec_stat(creature_ptr, stat, 10, (ironman_nightmare && !randint0(13))))
        {
-               msg_format(_("ひどく%sなった気がする。", "You feel very %s."), desc_stat_neg[stat]);
+               msg_format(_("ひどく%sなった気がする。", "You feel %s."), desc_stat_neg[stat]);
 
                /* Notice effect */
                return TRUE;
@@ -3468,7 +3467,7 @@ bool do_res_stat(player_type *creature_ptr, int stat)
        /* Attempt to increase */
        if (res_stat(creature_ptr, stat))
        {
-               msg_format(_("元通りに%sなった気がする。", "You feel more %s."), desc_stat_pos[stat]);
+               msg_format(_("元通りに%sなった気がする。", "You feel %s."), desc_stat_pos[stat]);
                return TRUE;
        }
 
@@ -3503,7 +3502,7 @@ bool do_inc_stat(player_type *creature_ptr, int stat)
                else if (stat == A_CON)
                        chg_virtue(creature_ptr, V_VITALITY, 1);
 
-               msg_format(_("ワーオ！とても%sなった！", "Wow!  You feel very %s!"), desc_stat_pos[stat]);
+               msg_format(_("ワーオ！とても%sなった！", "Wow! You feel %s!"), desc_stat_pos[stat]);
 
                return TRUE;
        }
@@ -3511,7 +3510,7 @@ bool do_inc_stat(player_type *creature_ptr, int stat)
        /* Restoration worked */
        if (res)
        {
-               msg_format(_("元通りに%sなった気がする。", "You feel more %s."), desc_stat_pos[stat]);
+               msg_format(_("元通りに%sなった気がする。", "You feel %s."), desc_stat_pos[stat]);
 
                return TRUE;
        }