From cc0b6a29aa8a6e4683532870bde55907c39024ee Mon Sep 17 00:00:00 2001 From: SHIRAKATA Kentaro Date: Thu, 3 Jun 2021 18:44:26 +0900 Subject: [PATCH] add translation --- src/botl.c | 5 ++++ src/cmd.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/do_wear.c | 2 ++ src/invent.c | 12 +++++----- src/mon.c | 6 ++--- src/music.c | 6 ++--- src/objnam.c | 6 +++++ src/options.c | 48 ++++++++++++++++++++++++++++++++++++++ src/pager.c | 2 +- src/shk.c | 5 ++++ src/windows.c | 39 +++++++++++++++++++++++++++++++ 11 files changed, 192 insertions(+), 13 deletions(-) diff --git a/src/botl.c b/src/botl.c index ccbe8aa..abf90d3 100644 --- a/src/botl.c +++ b/src/botl.c @@ -2244,7 +2244,12 @@ boolean from_configfile; } else if (fld == BL_HUNGER && is_fld_arrayvalues(s[sidx], hutxt, SATIATED, STARVED + 1, &kidx)) { +#if 0 /*JP*/ txt = hu_stat[kidx]; /* store hu_stat[] val, not hutxt[] */ +#else + /*JP hu_stat‚Í–|–󂳂ê‚Ä‚¢‚é‚Ì‚Åhutxt‚ðŽg‚¤ */ + txt = hutxt[kidx]; +#endif txtval = TRUE; } else if (!strcmpi(s[sidx], "changed")) { changed = TRUE; diff --git a/src/cmd.c b/src/cmd.c index 277fe7a..b4a53cb 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -5234,11 +5234,17 @@ dokeylist(VOID_ARGS) datawin = create_nhwindow(NHW_TEXT); putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, " Full Current Key Bindings List"); +*/ + putstr(datawin, 0, " Œ»Ý‚ÌŠ®‘S‚ȃL[Š„‚è“–‚Ĉꗗ"); /* directional keys */ putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Directional keys:"); +*/ + putstr(datawin, 0, "•ûŒüƒL[:"); show_direction_keys(datawin, '.', FALSE); /* '.'==self in direction grid */ keys_used[(uchar) Cmd.move_NW] = keys_used[(uchar) Cmd.move_N] @@ -5265,16 +5271,31 @@ dokeylist(VOID_ARGS) = keys_used[(uchar) C(Cmd.move_S)] = keys_used[(uchar) C(Cmd.move_SE)] = TRUE; putstr(datawin, 0, ""); +#if 0 /*JP:T*/ putstr(datawin, 0, "Shift- will move in specified direction until you hit"); putstr(datawin, 0, " a wall or run into something."); +#else + putstr(datawin, 0, + "Shift-<•ûŒü> ‚́A•Ç‚ɂԂ‚©‚é‚©‰½‚©‚ª‚ ‚é‚Ü‚ÅŽw’肳‚ꂽ•ûŒü‚É"); + putstr(datawin, 0, " ˆÚ“®‚·‚éD"); +#endif +#if 0 /*JP:T*/ putstr(datawin, 0, "Ctrl- will run in specified direction until something"); putstr(datawin, 0, " very interesting is seen."); +#else + putstr(datawin, 0, + "Ctrl-<•ûŒü> ‚́A‰½‚©‹»–¡[‚¢‚à‚Ì‚ªŒ©‚¦‚é‚Ü‚ÅŽw’肳‚ꂽ•ûŒü‚É"); + putstr(datawin, 0, " ˆÚ“®‚·‚éD"); +#endif } putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Miscellaneous keys:"); +*/ + putstr(datawin, 0, "—lX‚ȃL[:"); for (i = 0; misc_keys[i].desc; i++) { key = Cmd.spkeys[misc_keys[i].nhkf]; if (key && ((misc_keys[i].numpad && iflags.num_pad) @@ -5294,21 +5315,30 @@ dokeylist(VOID_ARGS) if (dokeylist_putcmds(datawin, TRUE, GENERALCMD, WIZMODECMD, keys_used)) { putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "General commands:"); +*/ + putstr(datawin, 0, "ˆê”ʃRƒ}ƒ“ƒh:"); (void) dokeylist_putcmds(datawin, FALSE, GENERALCMD, WIZMODECMD, keys_used); } if (dokeylist_putcmds(datawin, TRUE, 0, WIZMODECMD, keys_used)) { putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Game commands:"); +*/ + putstr(datawin, 0, "ƒQ[ƒ€ƒRƒ}ƒ“ƒh:"); (void) dokeylist_putcmds(datawin, FALSE, 0, WIZMODECMD, keys_used); } if (wizard && dokeylist_putcmds(datawin, TRUE, WIZMODECMD, 0, keys_used)) { putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Wizard-mode commands:"); +*/ + putstr(datawin, 0, "ƒEƒBƒU[ƒhƒ‚[ƒhƒRƒ}ƒ“ƒh:"); (void) dokeylist_putcmds(datawin, FALSE, WIZMODECMD, 0, keys_used); } @@ -6663,13 +6693,25 @@ const char *msg; * general message if it's on. */ dothat = "do that"; +#if 0 /*JP*/ how = " at"; /* for " at yourself"; not used for up/down */ +#else + how = ""; +#endif switch (spkey) { case NHKF_NOPICKUP: +#if 0 /*JP*/ dothat = "move"; +#else + dothat = "ˆÚ“®‚·‚é"; +#endif break; case NHKF_RUSH: +#if 0 /*JP*/ dothat = "rush"; +#else + dothat = "“ːi‚·‚é"; +#endif break; case NHKF_RUN2: if (!Cmd.num_pad) @@ -6677,14 +6719,22 @@ const char *msg; /*FALLTHRU*/ case NHKF_RUN: case NHKF_RUN_NOPICKUP: +#if 0 /*JP*/ dothat = "run"; +#else + dothat = "‘–‚é"; +#endif break; case NHKF_FIGHT2: if (!Cmd.num_pad) break; /*FALLTHRU*/ case NHKF_FIGHT: +#if 0 /*JP*/ dothat = "fight"; +#else + dothat = "í‚¤"; +#endif how = ""; /* avoid "fight at yourself" */ break; default: @@ -6698,13 +6748,21 @@ const char *msg; if (prefixhandling && (sym == Cmd.spkeys[NHKF_GETDIR_SELF] || (Cmd.num_pad && sym == Cmd.spkeys[NHKF_GETDIR_SELF2]))) { +/*JP Sprintf(buf, "You can't %s%s yourself.", dothat, how); +*/ + Sprintf(buf, "Ž©•ªŽ©g‚É%s%s‚±‚Æ‚Í‚Å‚«‚È‚¢D", dothat, how); /* for movement prefix followed by up or down */ } else if (prefixhandling && (sym == '<' || sym == '>')) { +#if 0 /*JP*/ Sprintf(buf, "You can't %s %s.", dothat, /* was "upwards" and "downwards", but they're considered to be variants of canonical "upward" and "downward" */ (sym == '<') ? "upward" : "downward"); +#else + Sprintf(buf, "%s%s‚±‚Æ‚Í‚Å‚«‚È‚¢D", + (sym == '<') ? "ã•ûŒü‚É" : "‰º•ûŒü‚É", dothat); +#endif } /* if '!cmdassist', display via pline() and we're done (note: asking @@ -6712,8 +6770,13 @@ const char *msg; if (!viawindow) { if (prefixhandling) { if (!*buf) +#if 0 /*JP*/ Sprintf(buf, "Invalid direction for '%s' prefix.", visctrl(Cmd.spkeys[spkey])); +#else + Sprintf(buf, "'%s'Ú“ªŽ«‚É‚Í•s³‚È•ûŒüD", + visctrl(Cmd.spkeys[spkey])); +#endif pline("%s", buf); return TRUE; } @@ -6774,13 +6837,24 @@ const char *msg; given but we include up and down for 'm'+invalid_direction; self is excluded as a viable direction for every prefix */ putstr(win, 0, ""); +/*JP putstr(win, 0, " < up"); +*/ + putstr(win, 0, " < ã"); +/*JP putstr(win, 0, " > down"); +*/ + putstr(win, 0, " > ‰º"); if (!prefixhandling) { int selfi = Cmd.num_pad ? NHKF_GETDIR_SELF2 : NHKF_GETDIR_SELF; +#if 0 /*JP:T*/ Sprintf(buf, " %4s direct at yourself", visctrl(Cmd.spkeys[selfi])); +#else + Sprintf(buf, " %4s Ž©•ª‚ÉŒü‚¯‚é", + visctrl(Cmd.spkeys[selfi])); +#endif putstr(win, 0, buf); } } diff --git a/src/do_wear.c b/src/do_wear.c index f960e43..86f3f35 100644 --- a/src/do_wear.c +++ b/src/do_wear.c @@ -2655,6 +2655,7 @@ glibr() thiswep = is_sword(otmp) ? c_sword : weapon_descr(otmp); if (otherwep && strcmp(thiswep, makesingular(otherwep))) otherwep = 0; +#if 0 /*JP*//*“ú–{Œê‚Å‚Í•s—v*/ if (otmp->quan > 1L) { /* most class names for unconventional wielded items are ok, but if wielding multiple apples or rations @@ -2666,6 +2667,7 @@ glibr() else thiswep = makeplural(thiswep); } +#endif hand = body_part(HAND); which = ""; if (bimanual(otmp)) diff --git a/src/invent.c b/src/invent.c index 766a2bb..7578c78 100644 --- a/src/invent.c +++ b/src/invent.c @@ -2045,12 +2045,12 @@ static NEARDATA const char removeables[] = { ARMOR_CLASS, WEAPON_CLASS, /* Interactive version of getobj - used for Drop, Identify, and Takeoff (A). Return the number of times fn was called successfully. If combo is TRUE, we just use this to get a category list. */ -/*JP CHECK: 3.6.0 ‚̌Ăяo‚µŒ³ -do.c:962: || (result = ggetobj("drop", drop, 0, FALSE, (unsigned *) 0)) < -1) -do.c:1009: i = ggetobj("drop", drop, 0, TRUE, &ggoresults); -do_wear.c:2955: || (result = ggetobj("take off", select_off, 0, FALSE, -do_wear.c:3007: if (ggetobj("take off", select_off, 0, TRUE, (unsigned *) 0) == -2) -invent.c:2014: n = ggetobj("identify", identify, id_limit, FALSE, +/*JP CHECK: 3.6.6 ‚̌Ăяo‚µŒ³ +do.c:1068: || (result = ggetobj("drop", drop, 0, FALSE, (unsigned *) 0)) < -1) +do.c:1117: i = ggetobj("drop", drop, 0, TRUE, &ggoresults); +do_wear.c:3153: || (result = ggetobj("take off", select_off, 0, FALSE, +do_wear.c:3207: i = ggetobj("take off", select_off, 0, TRUE, &ggofeedback); +invent.c:2564: n = ggetobj("identify", identify, id_limit, FALSE, */ int ggetobj(word, fn, mx, combo, resultflags) diff --git a/src/mon.c b/src/mon.c index 22f5fa5..f6639df 100644 --- a/src/mon.c +++ b/src/mon.c @@ -2696,12 +2696,12 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */ /*JP pline("That was probably a bad idea..."); */ - pline("‚æ‚­‚È‚¢sˆ×‚¾‚Á‚½DDD"); + pline("‚½‚Ô‚ñ‚æ‚­‚È‚¢sˆ×‚¾‚Á‚½DDD"); else /*JP pline("Whoopsie-daisy!"); */ - pline("ƒVƒ“ƒWƒ}ƒbƒ^[I"); + pline("ƒ„ƒbƒ`ƒ}ƒbƒ^[I"); } else if (mtmp->ispriest) { adjalign((p_coaligned(mtmp)) ? -2 : 2); /* cancel divine protection for killing your priest */ @@ -2721,7 +2721,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */ /*JP You_hear("the studio audience applaud!"); */ - pline("’®O‚ÌŠ…Ñ‚𗁂т½I"); + pline("ŠÏ‹q‚ÌŠ…Ñ‚𗁂т½I"); } else if (mtmp->mpeaceful) adjalign(-5); diff --git a/src/music.c b/src/music.c index c29b0f9..c6bed7a 100644 --- a/src/music.c +++ b/src/music.c @@ -1063,7 +1063,7 @@ struct obj *instr; tumblers, plur(tumblers), gears, plur(gears)); #else - You_hear("%d‚Ì‹à‹ï‚ªƒJƒ`‚Á‚Æ‚È‚èC%d‚ÌŽ•ŽÔ‚ª‚Ü‚í‚鉹‚ð•·‚¢‚½D", + You_hear("%dŒÂ‚Ì‹à‹ï‚ªƒJƒ`‚Á‚Æ‚È‚èC%dŒÂ‚ÌŽ•ŽÔ‚ª‚Ü‚í‚鉹‚ð•·‚¢‚½D", tumblers, gears); #endif else @@ -1071,14 +1071,14 @@ struct obj *instr; You_hear("%d tumbler%s click.", tumblers, plur(tumblers)); #else - You_hear("%d‚Ì‹à‹ï‚ªƒJƒ`‚Á‚ƂȂ鉹‚ð•·‚¢‚½D", + You_hear("%dŒÂ‚Ì‹à‹ï‚ªƒJƒ`‚Á‚ƂȂ鉹‚ð•·‚¢‚½D", tumblers); #endif } else if (gears) { /*JP You_hear("%d gear%s turn.", gears, plur(gears)); */ - You_hear("%d‚ÌŽ•ŽÔ‚ª‰ñ‚鉹‚ð•·‚¢‚½D", gears); + You_hear("%dŒÂ‚ÌŽ•ŽÔ‚ª‰ñ‚鉹‚ð•·‚¢‚½D", gears); /* could only get `gears == 5' by playing five correct notes followed by excess; otherwise, tune would have matched above */ diff --git a/src/objnam.c b/src/objnam.c index 30b1cf3..10adf16 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -5158,7 +5158,10 @@ const char * gloves_simple_name(gloves) struct obj *gloves; { +/*JP static const char gauntlets[] = "gauntlets"; +*/ + static const char gauntlets[] = "¬Žè"; if (gloves && gloves->dknown) { int otyp = gloves->otyp; @@ -5170,7 +5173,10 @@ struct obj *gloves; gauntlets)) return gauntlets; } +/*JP return "gloves"; +*/ + return "Žè‘Ü"; } const char * diff --git a/src/options.c b/src/options.c index 59f9f44..aff46c0 100644 --- a/src/options.c +++ b/src/options.c @@ -4763,7 +4763,10 @@ boolean dolist; { char buf[BUFSZ]; +/*JP putstr(win, 0, "Menu control keys:"); +*/ + putstr(win, 0, "ƒƒjƒ…[§ŒäƒL[:"); if (dolist) { int i; @@ -4781,48 +4784,93 @@ boolean dolist; fmt0[] = " %14s %s"; putstr(win, 0, ""); +/*JP putstr(win, 0, "Selection: On page Full menu"); +*/ + putstr(win, 0, "‘I‘ð: ƒy[ƒW Š®‘Sƒƒjƒ…["); +/*JP Sprintf(buf, fmt2, "Select all", +*/ + Sprintf(buf, fmt2, "‘S‚Ä‘I‘ð", visctrl(get_menu_cmd_key(MENU_SELECT_PAGE)), visctrl(get_menu_cmd_key(MENU_SELECT_ALL))); putstr(win, 0, buf); +/*JP Sprintf(buf, fmt2, "Deselect all", +*/ + Sprintf(buf, fmt2, "‘S‚Ä‘I‘ð‰ðœ", visctrl(get_menu_cmd_key(MENU_UNSELECT_PAGE)), visctrl(get_menu_cmd_key(MENU_UNSELECT_ALL))); putstr(win, 0, buf); +/*JP Sprintf(buf, fmt2, "Invert all", +*/ + Sprintf(buf, fmt2, "‘S‚Ä”½“]", visctrl(get_menu_cmd_key(MENU_INVERT_PAGE)), visctrl(get_menu_cmd_key(MENU_INVERT_ALL))); putstr(win, 0, buf); +/*JP Sprintf(buf, fmt3, "Text match", "", +*/ + Sprintf(buf, fmt3, "ƒeƒLƒXƒgƒ}ƒbƒ`", "", visctrl(get_menu_cmd_key(MENU_SEARCH)), +/*JP "Search and toggle matching entries"); +*/ + "ŒŸõ‚µ‚ă}ƒbƒ`‚µ‚½ƒGƒ“ƒgƒŠ‚ðƒgƒOƒ‹"); putstr(win, 0, buf); putstr(win, 0, ""); +/*JP putstr(win, 0, "Navigation:"); +*/ + putstr(win, 0, "‘€ì:"); +/*JP Sprintf(buf, fmt1, "Go to ", +*/ + Sprintf(buf, fmt1, "ˆÚ“® ", visctrl(get_menu_cmd_key(MENU_NEXT_PAGE)), +/*JP "Next page"); +*/ + "ŽŸ‚̃y[ƒW"); putstr(win, 0, buf); Sprintf(buf, fmt1, "", visctrl(get_menu_cmd_key(MENU_PREVIOUS_PAGE)), +/*JP "Previous page"); +*/ + "‘O‚̃y[ƒW"); putstr(win, 0, buf); Sprintf(buf, fmt1, "", visctrl(get_menu_cmd_key(MENU_FIRST_PAGE)), +/*JP "First page"); +*/ + "æ“ªƒy[ƒW"); putstr(win, 0, buf); Sprintf(buf, fmt1, "", visctrl(get_menu_cmd_key(MENU_LAST_PAGE)), +/*JP "Last page"); +*/ + "ÅIƒy[ƒW"); putstr(win, 0, buf); +/*JP Sprintf(buf, fmt0, "SPACE", "Next page, if any, otherwise RETURN"); +*/ + Sprintf(buf, fmt0, "SPACE", "‚ ‚ê‚ÎŽŸ‚̃y[ƒWA‚È‚¯‚ê‚ÎRETURN"); putstr(win, 0, buf); Sprintf(buf, fmt0, "RETURN/ENTER", +/*JP "Finish menu with any selection(s) made"); +*/ + "‘I‘ð‚µ‚Äƒƒjƒ…[I—¹"); putstr(win, 0, buf); Sprintf(buf, fmt0, "ESCAPE", +/*JP "Cancel menu without selecting anything"); +*/ + "‰½‚à‘I‘ð‚¹‚¸‚Ƀƒjƒ…[‚ðƒLƒƒƒ“ƒZƒ‹"); putstr(win, 0, buf); } } diff --git a/src/pager.c b/src/pager.c index 49c1324..8dbcaa5 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2415,7 +2415,7 @@ static struct { /*JP { domenucontrols, "List menu control keys" }, */ - { domenucontrols, "ƒƒjƒ…[§ŒäƒL[ˆê——s" }, + { domenucontrols, "ƒƒjƒ…[§ŒäƒL[ˆê——" }, /*JP { dispfile_license, "The NetHack license." }, */ diff --git a/src/shk.c b/src/shk.c index 6d5cc56..9f340cd 100644 --- a/src/shk.c +++ b/src/shk.c @@ -6053,10 +6053,15 @@ struct obj *obj_absorber, *obj_absorbed; || (floor_absorber && !costly_spot(x, y)))) { amount = bp->price; bill_dummy_object(obj_absorbed); +#if 0 /*JP*/ verbalize("You owe me %ld %s for my %s that you %s with your%s", amount, currency(amount), obj_typename(obj_absorbed->otyp), ANGRY(shkp) ? "had the audacity to mix" : "just mixed", ANGRY(shkp) ? " stinking batch!" : "s."); +#else /*JP:TODO “{‚Á‚Ä‚¢‚é‚Æ‚«‚Í–¢‘Ήž */ + verbalize("Ž„‚Ì%s‚ð‚ ‚È‚½‚Ì‚à‚̂ƍ¬‚º‚½‚±‚Æ‚Å‚ ‚È‚½‚ÍŽ„‚É%ld%s‚̎؂肪‚ ‚éD", + obj_typename(obj_absorbed->otyp), amount, currency(amount)); +#endif return; } /************************************************************** diff --git a/src/windows.c b/src/windows.c index 94ac40f..099a7bb 100644 --- a/src/windows.c +++ b/src/windows.c @@ -978,31 +978,70 @@ unsigned long *colormasks UNUSED; nb = status_vals[idx]; *nb = '\0'; if (cond & BL_MASK_STONE) +/*JP Strcpy(nb = eos(nb), " Stone"); +*/ + Strcpy(nb = eos(nb), " Î‰»"); if (cond & BL_MASK_SLIME) +/*JP Strcpy(nb = eos(nb), " Slime"); +*/ + Strcpy(nb = eos(nb), " ‚Ç‚ë‚Ç‚ë"); if (cond & BL_MASK_STRNGL) +/*JP Strcpy(nb = eos(nb), " Strngl"); +*/ + Strcpy(nb = eos(nb), " ’‚‘§"); if (cond & BL_MASK_FOODPOIS) +/*JP Strcpy(nb = eos(nb), " FoodPois"); +*/ + Strcpy(nb = eos(nb), " H“Å"); if (cond & BL_MASK_TERMILL) +/*JP Strcpy(nb = eos(nb), " TermIll"); +*/ + Strcpy(nb = eos(nb), " •a‹C"); if (cond & BL_MASK_BLIND) +/*JP Strcpy(nb = eos(nb), " Blind"); +*/ + Strcpy(nb = eos(nb), " –Ó–Ú"); if (cond & BL_MASK_DEAF) +/*JP Strcpy(nb = eos(nb), " Deaf"); +*/ + Strcpy(nb = eos(nb), " Ž¨˜W"); if (cond & BL_MASK_STUN) +/*JP Strcpy(nb = eos(nb), " Stun"); +*/ + Strcpy(nb = eos(nb), " ῝ò"); if (cond & BL_MASK_CONF) +/*JP Strcpy(nb = eos(nb), " Conf"); +*/ + Strcpy(nb = eos(nb), " ¬—"); if (cond & BL_MASK_HALLU) +/*JP Strcpy(nb = eos(nb), " Hallu"); +*/ + Strcpy(nb = eos(nb), " Œ¶Šo"); if (cond & BL_MASK_LEV) +/*JP Strcpy(nb = eos(nb), " Lev"); +*/ + Strcpy(nb = eos(nb), " •‚—V"); if (cond & BL_MASK_FLY) +/*JP Strcpy(nb = eos(nb), " Fly"); +*/ + Strcpy(nb = eos(nb), " ”òs"); if (cond & BL_MASK_RIDE) +/*JP Strcpy(nb = eos(nb), " Ride"); +*/ + Strcpy(nb = eos(nb), " ‹Ræ"); break; default: Sprintf(status_vals[idx], -- 2.11.0