Kentaro Shirakata
argra****@users*****
2005年 6月 11日 (土) 07:02:05 JST
ForkIndex: jnethack/src/dig.c
diff -u jnethack/src/dig.c:1.25 jnethack/src/dig.c:1.26
--- jnethack/src/dig.c:1.25 Sat Jun 11 03:43:49 2005
+++ jnethack/src/dig.c Sat Jun 11 07:02:04 2005
@@ -105,12 +105,12 @@
if(rockit) pline("Crash! The ceiling collapses around you!");
*/
if(rockit) pline("げげん！あなたのまわりの天井が崩れた！");
-#if 0 /*JP*/
+#if 0 /*JP:T*/
else pline("A mysterious force %s cave around you!",
(levl[u.ux][u.uy].typ == CORR) ? "creates a" : "extends the");
#else
- else pline("神秘的な力によりあなたのまわり%s！",
- (levl[u.ux][u.uy].typ == CORR) ? "に洞窟ができた" : "の洞窟が広がった");
+ else pline("神秘的な力によりあなたのまわり%sた！",
+ (levl[u.ux][u.uy].typ == CORR) ? "に洞窟ができ" : "の洞窟が広がっ");
#endif
display_nhwindow(WIN_MESSAGE, TRUE);
@@ -227,7 +227,7 @@
(levl[x][y].wall_info & W_NONDIGGABLE) != 0)
|| (ttmp &&
(ttmp->ttyp == MAGIC_PORTAL || !Can_dig_down(&u.uz)))) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
if(verbose) pline_The("%s here is too hard to %s.",
surface(x,y), verb);
#else
@@ -301,12 +301,12 @@
/*JP
You("fumble and drop your %s.", xname(uwep));
*/
- You("手が滑り%sを落した．", xname(uwep));
+ You("手が滑り%sを落した．", xname(uwep));
dropx(uwep);
} else {
#ifdef STEED
if (u.usteed)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("%s %s and %s %s!",
xname(uwep),
otense(uwep, "bounce"), otense(uwep, "hit"),
@@ -317,7 +317,7 @@
#endif
else
#endif
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("Ouch! Your %s %s and %s you!",
xname(uwep),
otense(uwep, "bounce"), otense(uwep, "hit"));
@@ -338,7 +338,7 @@
/*JP
default: Your("swing misses its mark.");
*/
- default: You("狙いを定めて振りおろしたがはずした．");
+ default: You("狙いを定めて振りおろしたがはずした．");
break;
}
return(0);
@@ -540,7 +540,7 @@
} else if (!IS_ROCK(lev->typ) && dig_target == DIGTYP_ROCK)
return(0); /* statue or boulder got taken */
if(!did_dig_msg) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("hit the %s with all your might.",
d_target[dig_target]);
#else
@@ -695,7 +695,7 @@
} else if(mtmp) {
if(is_flyer(mtmp->data) || is_floater(mtmp->data)) {
if(canseemon(mtmp))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s over the pit.", Monnam(mtmp),
(is_flyer(mtmp->data)) ?
"flies" : "floats");
@@ -833,7 +833,7 @@
pline("%sはとても固くて掘れない．", surface(u.ux,u.uy));
} else if (is_pool(u.ux, u.uy) || is_lava(u.ux, u.uy)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline_The("%s sloshes furiously for a moment, then subsides.",
is_lava(u.ux, u.uy) ? "lava" : "water");
#else
@@ -913,7 +913,7 @@
/* if any objects were frozen here, they're released now */
unearth_objs(u.ux, u.uy);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("As you dig, the hole fills with %s!",
typ == LAVAPOOL ? "lava" : "water");
#else
@@ -999,7 +999,7 @@
otmp->age -= 100; /* this is an *OLD* corpse */;
break;
case 2:
-#if 0 /*JP*/
+#if 0 /*JP:T*/
if (!Blind) pline(Hallucination ? "Dude! The living dead!" :
"The grave's owner is very upset!");
#else
@@ -1009,7 +1009,7 @@
(void) makemon(mkclass(S_ZOMBIE,0), u.ux, u.uy, NO_MM_FLAGS);
break;
case 3:
-#if 0 /*JP*/
+#if 0 /*JP:T*/
if (!Blind) pline(Hallucination ? "I want my mummy!" :
"You've disturbed a tomb!");
#else
@@ -1058,14 +1058,15 @@
verb = ispick ? "掘る" : "砕く";
if (u.utrap && u.utraptype == TT_WEB) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s you can't %s while entangled in a web.",
/* res==0 => no prior message;
res==1 => just got "You now wield a pick-axe." message */
!res ? "Unfortunately," : "But", verb);
-#endif
- pline("%sくもの巣にひかかっている間は%s．",
+#else
+ pline("%sくもの巣にひっかかっている間は%s．",
!res ? "残念ながら" : "しかし", jconj(verb, "ない"));
+#endif
return res;
}
@@ -1219,7 +1220,7 @@
if (vibrate) losehp(2, "固いものに斧を使おうとして", KILLED_BY);
}
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("swing your %s through thin air.",
aobjnam(obj, (char *)0));
#else
@@ -1284,8 +1285,8 @@
You("%s %s.", digging.chew ? "begin" : "continue",
d_action[dig_target]);
#else
- You("%sのを再開した．",
- d_action2[dig_target]);
+ You("%sのを%sした．", d_action2[dig_target],
+ digging.chew ? "開始" : "再開");
#endif
digging.chew = FALSE;
}
@@ -1304,7 +1305,7 @@
You("%sに届かない．", surface(u.ux,u.uy));
} else if (is_pool(u.ux, u.uy) || is_lava(u.ux, u.uy)) {
/* Monsters which swim also happen not to be able to dig */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("cannot stay under%s long enough.",
is_pool(u.ux, u.uy) ? "water" : " the lava");
#else
@@ -1539,7 +1540,7 @@
if (!Is_airlevel(&u.uz) && !Is_waterlevel(&u.uz) && !Underwater) {
if (u.dz < 0 || On_stairs(u.ux, u.uy)) {
if (On_stairs(u.ux, u.uy))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline_The("beam bounces off the %s and hits the %s.",
(u.ux == xdnladder || u.ux == xupladder) ?
"ladder" : "stairs", ceiling(u.ux, u.uy));
@@ -1556,7 +1557,7 @@
pline("It falls on your %s!", body_part(HEAD));
*/
pline("それはあなたの%sに落ちてきた！", body_part(HEAD));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
losehp(rnd((uarmh && is_metallic(uarmh)) ? 2 : 6),
"falling rock", KILLED_BY_AN);
#else
@@ -1937,16 +1938,16 @@
noncorporeal(youmonst.data) || unsolid(youmonst.data) ||
(tunnels(youmonst.data) && !needspick(youmonst.data))) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("%s up through the %s.",
(tunnels(youmonst.data) && !needspick(youmonst.data)) ?
"try to tunnel" : (amorphous(youmonst.data)) ?
"ooze" : "phase", surface(u.ux, u.uy));
#else
- You("床に%s．",
+ You("床に%sろうとした．",
(tunnels(youmonst.data) && !needspick(youmonst.data)) ?
- "トンネルを掘ろうとした" : (amorphous(youmonst.data)) ?
- "にじみのぼろうとした" : "徐々にはいあがろうとした");
+ "トンネルを掘" : (amorphous(youmonst.data)) ?
+ "にじみのぼ" : "徐々にはいあが");
#endif
if(tunnels(youmonst.data) && !needspick(youmonst.data))
Index: jnethack/src/eat.c
diff -u jnethack/src/eat.c:1.39 jnethack/src/eat.c:1.40
--- jnethack/src/eat.c:1.39 Sun Jun 5 17:17:57 2005
+++ jnethack/src/eat.c Sat Jun 11 07:02:04 2005
@@ -3109,7 +3109,7 @@
(otmp->quan == 1L) ? "it" : "one");
#else
Sprintf(qbuf, "ここには%sがある．%sか？",
- doname(otmp), jconj(jverb, "ます"));
+ doname(otmp), jpolite(jverb));
#endif
if((c = yn_function(qbuf,ynqchars,'n')) == 'y')
return(otmp);
Index: jnethack/src/engrave.c
diff -u jnethack/src/engrave.c:1.29 jnethack/src/engrave.c:1.30
--- jnethack/src/engrave.c:1.29 Wed Apr 27 05:51:16 2005
+++ jnethack/src/engrave.c Sat Jun 11 07:02:04 2005
@@ -1353,7 +1353,7 @@
/*JP
Sprintf(qbuf,"What do you want to %s the %s here?", everb, eloc);
*/
- Sprintf(qbuf,"%sに何と%sか？", eloc, jconj(everb, "ます"));
+ Sprintf(qbuf,"%sに何と%sか？", eloc, jpolite(everb));
getlin(qbuf, ebuf);
/* Count the actual # of chars engraved not including spaces */
Index: jnethack/src/invent.c
diff -u jnethack/src/invent.c:1.34 jnethack/src/invent.c:1.35
--- jnethack/src/invent.c:1.34 Sun May 1 20:27:04 2005
+++ jnethack/src/invent.c Sat Jun 11 07:02:04 2005
@@ -1047,14 +1047,14 @@
/*JP
Sprintf(qbuf, "What do you want to %s? [*]", word);
*/
- Sprintf(qbuf, "%s%s%sか？[*]", what, joshi, jconj(jword, "ます"));
+ Sprintf(qbuf, "%s%s%sか？[*]", what, joshi, jpolite(jword));
} else {
#if 0 /*JP*/
Sprintf(qbuf, "What do you want to %s? [%s or ?*]",
word, buf);
#else
Sprintf(qbuf, "%s%s%sか？[%s or ?*]", what, joshi,
- jconj(jword, "ます"), buf);
+ jpolite(jword), buf);
#endif
}
#ifdef REDO
@@ -1416,7 +1416,7 @@
word, ilets);
#else
Sprintf(qbuf,"どの種類のもの%s%sか？[%s]",joshi,
- jconj(jword,"ます"), ilets);
+ jpolite(jword), ilets);
#endif
getlin(qbuf, buf);
if (buf[0] == '\033') return(0);
Index: jnethack/src/pickup.c
diff -u jnethack/src/pickup.c:1.35 jnethack/src/pickup.c:1.36
--- jnethack/src/pickup.c:1.35 Sat Apr 30 20:51:19 2005
+++ jnethack/src/pickup.c Sat Jun 11 07:02:04 2005
@@ -223,7 +223,7 @@
action, ilets);
#else
Sprintf(qbuf,"どの種類のものを%sか？[%s]",
- jconj(action,"ます"), ilets);
+ jpolite(action), ilets);
#endif
getlin(qbuf,inbuf);
if (*inbuf == '\033') return FALSE;