Merge remote-tracking branch 'remotes/hengbandosx/english-market-edits' into feature...

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index f3d27cb..4ae83a9 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -119,7 +119,7 @@ static PRICE repair_broken_weapon_aux(player_type *player_ptr, PRICE bcost)
     prt(format(_("修復する武器　： %s", "Repairing: %s"), basenm), row + 3, 2);
 
     q = _("材料となる武器は？", "Which weapon for material? ");
-    s = _("材料となる武器がありません。", "You have no material to repair.");
+    s = _("材料となる武器がありません。", "You have no material for the repair.");
 
     item_tester_hook = item_tester_hook_orthodox_melee_weapons;
     OBJECT_IDX mater;
@@ -128,7 +128,7 @@ static PRICE repair_broken_weapon_aux(player_type *player_ptr, PRICE bcost)
     if (!mo_ptr)
         return 0;
     if (mater == item) {
-        msg_print(_("クラインの壷じゃない！", "This is not a klein bottle!"));
+        msg_print(_("クラインの壷じゃない！", "This is not a Klein bottle!"));
         return 0;
     }
 

diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index 2d23196..d78a574 100644 (file)
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -417,7 +417,7 @@ PRICE compare_weapons(player_type *customer_ptr, PRICE bcost)
             continue;
 
         if (i2_ptr == o_ptr[0] || (n == 2 && i2_ptr == o_ptr[1])) {
-            msg_print(_("表示中の武器は選べません！", "You can not select a weapon which is shown now!"));
+            msg_print(_("表示中の武器は選べません！", "Select a different weapon than those displayed."));
             msg_print(NULL);
             continue;
         }

diff --git a/src/market/building-monster.c b/src/market/building-monster.c
index 35d69cb..1c737bb 100644 (file)
--- a/src/market/building-monster.c
+++ b/src/market/building-monster.c
@@ -72,7 +72,7 @@ bool research_mon(player_type *player_ptr)
             return FALSE;
         }
 
-        sprintf(buf, _("名前:%sにマッチ", "Monsters with a name \"%s\""), temp);
+        sprintf(buf, _("名前:%sにマッチ", "Monsters' names with \"%s\""), temp);
     } else if (ident_info[i]) {
         sprintf(buf, "%c - %s.", sym, ident_info[i] + 2);
     } else {

diff --git a/src/market/building-recharger.c b/src/market/building-recharger.c
index 303d877..c5493a2 100644 (file)
--- a/src/market/building-recharger.c
+++ b/src/market/building-recharger.c
@@ -141,7 +141,7 @@ void building_recharge(player_type *player_ptr)
             max_charges = o_ptr->number * k_ptr->pval - o_ptr->pval;
 
         charges = (PARAMETER_VALUE)get_quantity(
-            format(_("一回分＄%d で何回分充填しますか？", "Add how many charges for %d gold? "), price), MIN(player_ptr->au / price, max_charges));
+            format(_("一回分＄%d で何回分充填しますか？", "Add how many charges for %d gold apiece? "), price), MIN(player_ptr->au / price, max_charges));
 
         if (charges < 1)
             return;

diff --git a/src/market/play-gamble.c b/src/market/play-gamble.c
index 0f5536a..a64ec9f 100644 (file)
--- a/src/market/play-gamble.c
+++ b/src/market/play-gamble.c
@@ -192,13 +192,13 @@ bool gamble_comm(player_type *player_ptr, int cmd)
 
                case BACT_DICE_SLOTS: /* The Dice Slots */
                        c_put_str(TERM_GREEN, _("ダイス・スロット", "Dice Slots"), 5, 2);
-                       c_put_str(TERM_YELLOW, _("レモン   レモン            2", ""), 6, 37);
-                       c_put_str(TERM_YELLOW, _("レモン   レモン   レモン   5", ""), 7, 37);
-                       c_put_str(TERM_ORANGE, _("オレンジ オレンジ オレンジ 10", ""), 8, 37);
-                       c_put_str(TERM_UMBER, _("剣       剣       剣       20", ""), 9, 37);
-                       c_put_str(TERM_SLATE, _("盾       盾       盾       50", ""), 10, 37);
-                       c_put_str(TERM_VIOLET, _("プラム   プラム   プラム   200", ""), 11, 37);
-                       c_put_str(TERM_RED, _("チェリー チェリー チェリー 1000", ""), 12, 37);
+                       c_put_str(TERM_YELLOW, _("レモン   レモン            2", "Lemon    Lemon             2"), 6, 37);
+                       c_put_str(TERM_YELLOW, _("レモン   レモン   レモン   5", "Lemon    Lemon    Lemon    5"), 7, 37);
+                       c_put_str(TERM_ORANGE, _("オレンジ オレンジ オレンジ 10", "Orange   Orange   Orange   10"), 8, 37);
+                       c_put_str(TERM_UMBER, _("剣       剣       剣       20", "Sword    Sword    Sword    20"), 9, 37);
+                       c_put_str(TERM_SLATE, _("盾       盾       盾       50", "Shield   Shield   Shield   50"), 10, 37);
+                       c_put_str(TERM_VIOLET, _("プラム   プラム   プラム   200", "Plum     Plum     Plum     200"), 11, 37);
+                       c_put_str(TERM_RED, _("チェリー チェリー チェリー 1000", "Cherry   Cherry   Cherry   1000"), 12, 37);
 
                        win = FALSE;
                        roll1 = randint1(21);

diff --git a/src/market/poker.c b/src/market/poker.c
index 02bb131..83a7b9c 100644 (file)
--- a/src/market/poker.c
+++ b/src/market/poker.c
@@ -605,7 +605,7 @@ int do_poker(void)
                is_put[i] = 0;
        }
 
-       prt(_("残すカードを決めて下さい(方向で移動, スペースで選択)。", "Stay witch? "), 0, 0);
+       prt(_("残すカードを決めて下さい(方向で移動, スペースで選択)。", "Keep which cards (direction keys move; space selects)? "), 0, 0);
 
        display_cards();
        poker_hand_check();