• R/O
  • SSH
  • HTTPS

jband: Commit


Commit MetaInfo

Revision128 (tree)
Time2009-06-27 04:47:11
Authorpaulblay

Log Message

More translation. cmd-know now nearly has draft translation finished (but not checked).

Change Summary

Incremental Difference

--- trunk/JBand/src/cmd-know.cpp (revision 127)
+++ trunk/JBand/src/cmd-know.cpp (revision 128)
@@ -107,55 +107,55 @@
107107 static struct
108108 {
109109 const _TCHAR *chars;
110- const _TCHAR *name;
110+ const _TCHAR *name[2];
111111 } monster_group[] =
112-{
113- { (const _TCHAR *)-1, __T("Uniques") }, /* TODO -1 probably doesn't work? */
114- { __T("A"), __T("Angels") },
115- { __T("a"), __T("Ants") },
116- { __T("b"), __T("Bats") },
117- { __T("B"), __T("Birds") },
118- { __T("C"), __T("Canines") },
119- { __T("c"), __T("Centipedes") },
120- { __T("uU"), __T("Demons") },
121- { __T("dD"), __T("Dragons") },
122- { __T("vE"), __T("Elementals/Vortices") },
123- { __T("e"), __T("Eyes/Beholders") },
124- { __T("f"), __T("Felines") },
125- { __T("G"), __T("Ghosts") },
126- { __T("OP"), __T("Giants/Ogres") },
127- { __T("g"), __T("Golems") },
128- { __T("H"), __T("Harpies/Hybrids") },
129- { __T("h"), __T("Hominids (Elves, Dwarves)") },
130- { __T("M"), __T("Hydras") },
131- { __T("i"), __T("Icky Things") },
132- { __T("lFI"), __T("Insects") },
133- { __T("j"), __T("Jellies") },
134- { __T("K"), __T("Killer Beetles") },
135- { __T("k"), __T("Kobolds") },
136- { __T("L"), __T("Lichs") },
137- { __T("tp"), __T("Men") },
138- { __T(".$?!_"), __T("Mimics") },
139- { __T("m"), __T("Molds") },
140- { __T(","), __T("Mushroom Patches") },
141- { __T("n"), __T("Nagas") },
142- { __T("o"), __T("Orcs") },
143- { __T("q"), __T("Quadrupeds") },
144- { __T("Q"), __T("Quylthulgs") },
145- { __T("R"), __T("Reptiles/Amphibians") },
146- { __T("r"), __T("Rodents") },
147- { __T("S"), __T("Scorpions/Spiders") },
148- { __T("s"), __T("Skeletons/Drujs") },
149- { __T("J"), __T("Snakes") },
150- { __T("T"), __T("Trolls") },
151- { __T("V"), __T("Vampires") },
152- { __T("W"), __T("Wights/Wraiths") },
153- { __T("w"), __T("Worms/Worm Masses") },
154- { __T("X"), __T("Xorns/Xarens") },
155- { __T("y"), __T("Yeeks") },
156- { __T("Y"), __T("Yeti") },
157- { __T("Z"), __T("Zephyr Hounds") },
158- { __T("z"), __T("Zombies") },
112+{ /* Translation TBC */
113+ { (const _TCHAR *)-1, {__T("Uniques"),__T("ƒ†ƒj[ƒN")} }, /* TODO -1 probably doesn't work? */
114+ { __T("A"), {__T("Angels"),__T("“VŽg")} },
115+ { __T("a"), {__T("Ants"),__T("‹a")} },
116+ { __T("b"), {__T("Bats"),__T("åžå•")} },
117+ { __T("B"), {__T("Birds"),__T("’¹")} },
118+ { __T("C"), {__T("Canines"),__T("΢")} },
119+ { __T("c"), {__T("Centipedes"),__T("•S‘«")} },
120+ { __T("uU"), {__T("Demons"),__T("ˆ«–‚")} },
121+ { __T("dD"), {__T("Dragons"),__T("—³")} },
122+ { __T("vE"), {__T("Elementals/Vortices"),__T("—³Šª")} },
123+ { __T("e"), {__T("Eyes/Beholders"),__T("–Ú‹Ê")} },
124+ { __T("f"), {__T("Felines"),__T("”L")} },
125+ { __T("G"), {__T("Ghosts"),__T("—H—ì")} },
126+ { __T("OP"), {__T("Giants/Ogres"),__T("‹l")} },
127+ { __T("g"), {__T("Golems"),__T("ƒS[ƒŒƒ€")} },
128+ { __T("H"), {__T("Harpies/Hybrids"),__T("ƒn[ƒs[E”¼lŠÔ")} },
129+ { __T("h"), {__T("Hominids (Elves, Dwarves)"),__T("ƒqƒ…[ƒ}ƒmƒCƒh(ƒGƒ‹ƒtAƒhƒ[ƒt)")} },
130+ { __T("M"), {__T("Hydras"),__T("ƒqƒhƒ‰")} },
131+ { __T("i"), {__T("Icky Things"),__T("ƒlƒoƒlƒo")} },
132+ { __T("lFI"), {__T("Insects"),__T("’Ž—Þ")} },
133+ { __T("j"), {__T("Jellies"),__T("ƒ[ƒŠ[")} },
134+ { __T("K"), {__T("Killer Beetles"),__T("‹‘åƒNƒƒKƒ^")} },
135+ { __T("k"), {__T("Kobolds"),__T("ƒRƒ{ƒ‹ƒg")} },
136+ { __T("L"), {__T("Lichs"),__T("ƒŠƒbƒ`")} },
137+ { __T("tp"), {__T("Men"),__T("lŠÔ")} },
138+ { __T(".$?!_"), {__T("Mimics"),__T("ƒ~ƒ~ƒbƒN")} },
139+ { __T("m"), {__T("Molds"),__T("ƒJƒr")} },
140+ { __T(","), {__T("Mushroom Patches"),__T("ƒLƒmƒR")} },
141+ { __T("n"), {__T("Nagas"),__T("ƒi[ƒK")} },
142+ { __T("o"), {__T("Orcs"),__T("ƒI[ƒN")} },
143+ { __T("q"), {__T("Quadrupeds"),__T("Žl‘«b")} },
144+ { __T("Q"), {__T("Quylthulgs"),__T("ƒNƒBƒ‹ƒXƒ‹ƒO")} },
145+ { __T("R"), {__T("Reptiles/Amphibians"),__T("঒Ž—ށEŠ^’Ùê€")} },
146+ { __T("r"), {__T("Rodents"),__T("ƒlƒYƒ~")} },
147+ { __T("S"), {__T("Scorpions/Spiders"),__T("ƒTƒ\ƒŠE’wå")} },
148+ { __T("s"), {__T("Skeletons/Drujs"),__T("Š[œEƒhƒDƒ‹ƒW")} },
149+ { __T("J"), {__T("Snakes"),__T("ŽÖ")} },
150+ { __T("T"), {__T("Trolls"),__T("ƒgƒ[ƒ‹")} },
151+ { __T("V"), {__T("Vampires"),__T("ƒ”ƒ@ƒ“ƒpƒCƒA")} },
152+ { __T("W"), {__T("Wights/Wraiths"),__T("ƒƒCƒgEƒŒƒCƒX")} },
153+ { __T("w"), {__T("Worms/Worm Masses"),__T("ƒ~ƒ~ƒY")} },
154+ { __T("X"), {__T("Xorns/Xarens"),__T("ƒ][ƒ“EƒUƒŒƒ“")} },
155+ { __T("y"), {__T("Yeeks"),__T("ƒC[ƒN")} },
156+ { __T("Y"), {__T("Yeti"),__T("ƒCƒGƒeƒB")} },
157+ { __T("Z"), {__T("Zephyr Hounds"),__T("ƒ[ƒtƒ@[ƒnƒEƒ“ƒh")} },
158+ { __T("z"), {__T("Zombies"),__T("ƒ]ƒ“ƒr")} },
159159 { NULL, NULL }
160160 };
161161
@@ -162,18 +162,18 @@
162162 /*
163163 * Description of each feature group.
164164 */
165-const _TCHAR *feature_group_text[] =
165+const _TCHAR *feature_group_text[][2] =
166166 {
167- __T("Floors"),
168- __T("Traps"),
169- __T("Doors"),
170- __T("Stairs"),
171- __T("Walls"),
172- __T("Streamers"),
173- __T("Obstructions"),
174- __T("Stores"),
175- __T("Other"),
176- NULL
167+ {__T("Floors"),__T("°")}, /* Translation TBC */
168+ {__T("Traps"),__T("ã©")},
169+ {__T("Doors"),__T("ŒË")},
170+ {__T("Stairs"),__T("ŠK’i")},
171+ {__T("Walls"),__T("•Ç")},
172+ {__T("Streamers"),__T("—¬‚ê‚é’nŒ`")}, /* Bad translation */
173+ {__T("Obstructions"),__T("áŠQ")},
174+ {__T("Stores"),__T("“X")},
175+ {__T("Other"),__T("‚»‚Ì‘¼")},
176+ {NULL, NULL}
177177 };
178178
179179 /* Useful method declarations */
@@ -319,8 +319,9 @@
319319
320320 static const _TCHAR *recall_prompt(int oid)
321321 {
322- (void)oid;
323- return __T(", 'r' to recall");
322+ UNREFERENCED_PARAMETER(oid);
323+
324+ return LS(__T(", 'r' to recall"),__T("A'r'‚ŏڍׂðŽv‚¢o‚·")); /* Translation TBC */
324325 }
325326
326327 #define swap(a, b, what_type) (swapspace = (void*)(a)), ((a) = (what_type*)(b)), ((b) = (what_type*)swapspace)
@@ -459,10 +460,10 @@
459460 if (redraw)
460461 {
461462 /* Print the title bits */
462- region_erase(&title_area);
463- prt(format(__T("Knowledge - %s"), title), 2, 0);
464- prt(__T("Group"), 4, 0);
465- prt(__T("Name"), 4, g_name_len + 3);
463+ region_erase(&title_area); /* Translation TBC */
464+ prt(format(LS(__T("Knowledge - %s"),__T("’mŽ¯ - %s")), title), 2, 0);
465+ prt(LS(__T("Group"),__T("‘°")), 4, 0);
466+ prt(LS(__T("Name"),__T("–¼‘O")), 4, g_name_len + 3);
466467
467468 if (otherfields)
468469 prt(otherfields, 4, 55);
@@ -477,7 +478,6 @@
477478 /* Reset redraw flag */
478479 redraw = FALSE;
479480 }
480-
481481 if (g_cur != grp_old)
482482 {
483483 grp_old = g_cur;
@@ -487,7 +487,6 @@
487487 group_menu.cursor = g_cur;
488488 object_menu.cursor = 0;
489489 }
490-
491490 /* HACK ... */
492491 if (!visual_list)
493492 {
@@ -503,20 +502,20 @@
503502 menu_set_filter(&object_menu, obj_list + o_cur + g_offset[g_cur], 1);
504503 object_menu.cursor = 0;
505504 }
506-
507505 oid = obj_list[g_offset[g_cur]+o_cur];
508506
509507 /* Print prompt */
510508 {
511- const _TCHAR *pedit = (!o_funcs.xattr) ? __T("") :
512- (!(attr_idx|char_idx) ? __T(", 'c' to copy") : __T(", 'c', 'p' to paste"));
509+ const _TCHAR *pedit = (!o_funcs.xattr) ? __T("") : /* Translation TBC */
510+ (!(attr_idx|char_idx) ? LS(__T(", 'c' to copy"),__T("A'c'‚ŃRƒs["))
511+ : LS(__T(", 'c', 'p' to paste"),__T("A'c'A'p'‚Ńy[ƒXƒg")));
513512 const _TCHAR *xtra = o_funcs.xtra_prompt ? o_funcs.xtra_prompt(oid) : __T("");
514513 const _TCHAR *pvs = __T("");
515514
516- if (visual_list)
517- pvs = __T(", ENTER to accept");
515+ if (visual_list) /* Translation TBC */
516+ pvs = LS(__T(", ENTER to accept"),__T("AENTER‚ŏ³‘ø"));
518517 else if (o_funcs.xattr)
519- pvs = __T(", 'v' for visuals");
518+ pvs = LS(__T(", 'v' for visuals"),__T("A'v'‚ŃrƒWƒ…ƒAƒ‹"));
520519
521520 prt(format(__T("<dir>%s%s%s, ESC"), pvs, pedit, xtra), hgt - 1, 0);
522521 }
@@ -678,8 +677,8 @@
678677 OPT(rogue_like_commands) = omode;
679678
680679 /* Prompt */
681- if (!grp_cnt)
682- prt(format(__T("No %s known."), title), 15, 0);
680+ if (!grp_cnt) /* Translation TBC */
681+ prt(format(LS(__T("No %s known."),__T("%s ‚ɂ‚¢‚ĉ½‚à’m‚è‚Ü‚¹‚ñB")), title), 15, 0);
683682
684683 FREE(g_names);
685684 FREE(g_offset);
@@ -964,8 +963,9 @@
964963 big_pad(66, row, a, c);
965964
966965 /* Display kills */
967- if (r_ptr->flags[0] & (RF0_UNIQUE))
968- put_str(format(__T("%s"), (r_ptr->max_num == 0)? __T(" dead") : __T("alive")), row, 70);
966+ if (r_ptr->flags[0] & (RF0_UNIQUE)) /* Translation TBC */
967+ put_str(format(__T("%s"), (r_ptr->max_num == 0)? LS(__T(" dead"),__T("‚ªŽ€‚ñ‚Å‚é")) :
968+ LS(__T("alive"),__T("‚ª¶‚«‚Ä‚¢‚é"))), row, 70);
969969 else
970970 put_str(format(__T("%5d"), l_ptr->pkills), row, 70);
971971 }
@@ -997,7 +997,7 @@
997997
998998 static _TCHAR *m_xchar(int oid) { return &r_info[default_join[oid].oid].x_char; }
999999 static byte *m_xattr(int oid) { return &r_info[default_join[oid].oid].x_attr; }
1000-static const _TCHAR *race_name(int gid) { return monster_group[gid].name; }
1000+static const _TCHAR *race_name(int gid) { return monster_group[gid].name[arg_language]; }
10011001
10021002 static void mon_lore(int oid)
10031003 {
@@ -1036,8 +1036,9 @@
10361036
10371037 /* Different display for the first item if we've got uniques to show */
10381038 if (gid == 0 && ((&r_info[default_join[object_list[0]].oid])->flags[0] & (RF0_UNIQUE)))
1039- {
1040- c_prt(TERM_L_BLUE, format(__T("%d known uniques, %d slain."), n, kills),
1039+ { /* Translation TBC */
1040+ c_prt(TERM_L_BLUE, format(LS(__T("%d known uniques, %d slain."),
1041+ __T("%d‚Ì’m‚Á‚Ä‚¢‚郆ƒj[ƒN‚Ì’†A%d‚ðŽE‚µ‚½B")), n, kills),
10411042 row, col);
10421043 }
10431044 else
@@ -1046,8 +1047,9 @@
10461047
10471048 for (i = 0; i < z_info->r_max; i++)
10481049 tkills += l_list[i].pkills;
1049-
1050- c_prt(TERM_L_BLUE, format(__T("Creatures slain: %d/%d (in group/in total)"),
1050+ /* Translation TBC */
1051+ c_prt(TERM_L_BLUE, format(LS(__T("Creatures slain: %d/%d (in group/in total)"),
1052+ __T("ŽE‚µ‚½ƒ‚ƒmF%d/%d (‘°‚Ì’†/‘S•”)")),
10511053 kills, tkills), row, col);
10521054 }
10531055 }
@@ -1090,8 +1092,8 @@
10901092 int i;
10911093 size_t j;
10921094
1093- (void)obj;
1094- (void)name;
1095+ UNREFERENCED_PARAMETER(obj);
1096+ UNREFERENCED_PARAMETER(name);
10951097
10961098 for (i = 0; i < z_info->r_max; i++)
10971099 {
@@ -1130,8 +1132,8 @@
11301132 default_join[m_count++].gid = j;
11311133 }
11321134 }
1133- display_knowledge(__T("monsters"), monsters, m_count, r_funcs, m_funcs,
1134- __T(" Sym Kills"));
1135+ display_knowledge(LS(__T("monsters"),__T("ƒ‚ƒ“ƒXƒ^[")), monsters, m_count, r_funcs, m_funcs,
1136+ LS(__T(" Sym Kills"),__T(" ‹L† ŽEŠQ”")));
11351137 FREE(default_join);
11361138 FREE(monsters);
11371139 }
@@ -1196,8 +1198,9 @@
11961198
11971199 Term_gotoxy(0, 0);
11981200 object_info_header(o_ptr);
1199- if (!object_info(o_ptr, FALSE))
1200- text_out(__T("\n\nThis item does not seem to possess any special abilities."));
1201+ if (!object_info(o_ptr, FALSE)) /* Translation TBC */
1202+ text_out(LS(__T("\n\nThis item does not seem to possess any special abilities."),
1203+ __T("\n\n‚±‚̃AƒCƒeƒ€‚Í“Á’¥‚È‹@”\‚ðŽ‚Á‚Ä‚¢‚È‚¢‚悤‚¾B")));
12011204
12021205 text_out_c(TERM_L_BLUE, LS(__T("\n\n[Press any key to continue]\n"),
12031206 spaceme(langbuf,__T("\n\n[‰½‚©ƒL[‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢]\n"))));
@@ -1310,7 +1313,8 @@
13101313 /* Collect valid artifacts */
13111314 a_count = collect_known_artifacts(artifacts, z_info->a_max);
13121315
1313- display_knowledge(__T("artifacts"), artifacts, a_count, obj_f, art_f, 0);
1316+ display_knowledge(LS(__T("artifacts"), /* Translation TBC */
1317+ __T("ƒA[ƒeƒBƒtƒ@ƒNƒg")), artifacts, a_count, obj_f, art_f, 0);
13141318 FREE(artifacts);
13151319 }
13161320
@@ -1338,8 +1342,18 @@
13381342 static void desc_ego_fake(int oid)
13391343 {
13401344 /* Hack: dereference the join */
1341- const _TCHAR *cursed[] = { __T("permanently cursed"), __T("heavily cursed"), __T("cursed") };
1342- const _TCHAR *xtra[] = { __T("sustain"), __T("higher resistance"), __T("ability") };
1345+ const _TCHAR *cursed[][2] =
1346+ { /* Translation TBC */
1347+ {__T("permanently cursed"),__T("‰i‰“‚ÌŽô‚¢‚ª‚ ‚é")},
1348+ {__T("heavily cursed"),__T("‹°‚낵‚¢Žô‚¢‚ª‚ ‚é")},
1349+ {__T("cursed"),__T("Žô‚Á‚Ä‚¢‚é")}
1350+ };
1351+ const _TCHAR *xtra[][2] =
1352+ { /* Translation TBC */
1353+ {__T("sustain"),__T("ˆÛŽ")},
1354+ {__T("higher resistance"), __T("‚‘ϐ«")},
1355+ {__T("ability"),__T("”\—Í")}
1356+ };
13431357 u32b f2, i;
13441358 _TCHAR langbuf[200];
13451359
@@ -1374,14 +1388,14 @@
13741388 dummy.name2 = e_idx;
13751389 object_info_spoil(&dummy);
13761390
1377- if (e_ptr->xtra)
1378- text_out(format(__T("It provides one random %s."), xtra[e_ptr->xtra - 1]));
1391+ if (e_ptr->xtra) /* Translation TBC */
1392+ text_out(format(LS(__T("It provides one random %s."),__T("ˆê‚‚Ì%s‚ð“K“–‚É’ñ‹Ÿ‚·‚éB")), xtra[e_ptr->xtra - 1]));
13791393
13801394 for (i = 0, f2 = TR2_PERMA_CURSE; i < 3 ; f2 >>= 1, i++)
13811395 {
13821396 if (e_ptr->flags[2] & f2)
13831397 {
1384- text_out_c(TERM_RED, format(__T("It is %s."), cursed[i]));
1398+ text_out_c(TERM_RED, format(LS(__T("It is %s."),__T("%s")), cursed[i]));
13851399 break;
13861400 }
13871401 }
@@ -1444,7 +1458,7 @@
14441458 }
14451459 }
14461460 }
1447- display_knowledge(__T("ego items"), egoitems, e_count, obj_f, ego_f, __T(""));
1461+ display_knowledge(LS(__T("ego items"),__T("ƒGƒSƒAƒCƒeƒ€")), egoitems, e_count, obj_f, ego_f, __T(""));
14481462
14491463 FREE(default_join);
14501464 FREE(egoitems);
@@ -1510,7 +1524,7 @@
15101524 }
15111525 /* If the type is "tried", display that */
15121526 if (k_ptr->tried && !aware)
1513- _tcscat_s(o_name, _countof(o_name), __T(" {tried}"));
1527+ _tcscat_s(o_name, _countof(o_name), LS(__T(" {tried}"),__T(" {ŽŽ‚µ‚½}"))); /* TODO This probably doesn't work properly */
15141528
15151529 /* Display the name */
15161530 c_prt(attr, o_name, row, col);
@@ -1567,7 +1581,8 @@
15671581 Term_gotoxy(0,0);
15681582 object_info_header(o_ptr);
15691583 if (!object_info(o_ptr, FALSE))
1570- text_out(__T("\n\nThis item does not seem to possess any special abilities."));
1584+ text_out(LS(__T("\n\nThis item does not seem to possess any special abilities."),
1585+ __T("\n\n‚±‚̃AƒCƒeƒ€‚Í“Á’¥‚È‹@”\‚ðŽ‚Á‚Ä‚¢‚È‚¢‚悤‚¾B")));
15711586
15721587 text_out_c(TERM_L_BLUE, LS(__T("\n\n[Press any key to continue]\n"),
15731588 spaceme(langbuf,__T("\n\n[‰½‚©ƒL[‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢]\n"))));
@@ -1644,8 +1659,9 @@
16441659 object_kind *k_ptr = &k_info[oid];
16451660 s16b idx = get_autoinscription_index(oid);
16461661
1647- const _TCHAR *no_insc = __T(", 'r' to recall, '{'");
1648- const _TCHAR *with_insc = __T(", 'r' to recall, '{', '}'");
1662+ /* Translation TBC */
1663+ const _TCHAR *no_insc = LS(__T(", 'r' to recall, '{'"),__T("A'r'‚ŏڍׂðŽv‚¢o‚·A'{'"));
1664+ const _TCHAR *with_insc = LS(__T(", 'r' to recall, '{', '}'"),__T("A'r'‚ŏڍׂðŽv‚¢o‚·A'{'A'}'"));
16491665
16501666 /* Forget it if we've never seen the thing */
16511667 if (k_ptr->flavor && !k_ptr->aware)
@@ -1685,8 +1701,8 @@
16851701 /* Avoid the prompt getting in the way */
16861702 screen_save();
16871703
1688- /* Prompt */
1689- prt(__T("Inscribe with: "), 0, 0);
1704+ /* Prompt */ /* Translation TBC */
1705+ prt(LS(__T("Inscribe with: "),__T("‰½‚ð‚Ý‚Ü‚·‚©B ")), 0, 0);
16901706
16911707 /* Default note */
16921708 if (idx != -1)
@@ -1706,7 +1722,6 @@
17061722 p_ptr->notice |= (PN_AUTOINSCRIBE);
17071723 p_ptr->redraw |= (PR_INVEN | PR_EQUIP);
17081724 }
1709-
17101725 /* Reload the screen */
17111726 screen_load();
17121727 }
@@ -1738,10 +1753,9 @@
17381753 if (c >= 0) objects[o_count++] = i;
17391754 }
17401755 }
1756+ display_knowledge(LS(__T("known objects"),__T("’m‚Á‚Ä‚¢‚éƒAƒCƒeƒ€")), objects, o_count, kind_f, obj_f,
1757+ LS(__T("Inscribed Sym"),__T("‚ñ‚¾ ‹L†")));
17411758
1742- display_knowledge(__T("known objects"), objects, o_count, kind_f, obj_f,
1743- __T("Inscribed Sym"));
1744-
17451759 FREE(objects);
17461760 }
17471761
@@ -1789,7 +1803,7 @@
17891803 return _tcscmp(f_name + fa->name, f_name + fb->name);
17901804 }
17911805
1792-static const _TCHAR *fkind_name(int gid) { return feature_group_text[gid]; }
1806+static const _TCHAR *fkind_name(int gid) { return feature_group_text[gid][arg_language]; }
17931807 static byte *f_xattr(int oid) { return &f_info[oid].x_attr; }
17941808 static _TCHAR *f_xchar(int oid) { return &f_info[oid].x_char; }
17951809 static void feat_lore(int oid) { (void)oid; /* noop */ }
@@ -1822,7 +1836,7 @@
18221836 features[f_count++] = i; /* Currently no filter for features */
18231837 }
18241838
1825- display_knowledge(__T("features"), features, f_count, fkind_f, feat_f, __T(" Sym"));
1839+ display_knowledge(LS(__T("features"),__T("’nŒ`")), features, f_count, fkind_f, feat_f, LS(__T(" Sym"),__T(" ‹L†")));
18261840 FREE(features);
18271841 }
18281842
@@ -1830,8 +1844,8 @@
18301844
18311845 static void do_cmd_self_knowledge(void *obj, const _TCHAR *name)
18321846 {
1833- (void)obj;
1834- (void)name;
1847+ UNREFERENCED_PARAMETER(obj);
1848+ UNREFERENCED_PARAMETER(name);
18351849
18361850 /* display self knowledge we already know about. */
18371851 self_knowledge(FALSE);
@@ -1839,15 +1853,15 @@
18391853
18401854 static void do_cmd_knowledge_scores(void *obj, const _TCHAR *name)
18411855 {
1842- (void)obj;
1843- (void)name;
1856+ UNREFERENCED_PARAMETER(obj);
1857+ UNREFERENCED_PARAMETER(name);
18441858 show_scores();
18451859 }
18461860
18471861 static void do_cmd_knowledge_history(void *obj, const _TCHAR *name)
18481862 {
1849- (void)obj;
1850- (void)name;
1863+ UNREFERENCED_PARAMETER(obj);
1864+ UNREFERENCED_PARAMETER(name);
18511865 history_display();
18521866 }
18531867
--- trunk/JBand/src/cave.cpp (revision 127)
+++ trunk/JBand/src/cave.cpp (revision 128)
@@ -4,9 +4,7 @@
44 * - Fixed __T on this page.
55 *
66 * Translation Status:
7- * - Started work on whole phrases on this page.
8- * - plog() done on this page (weren't any).
9- * - prt() done on this page (only one).
7+ * - Done, but not checked.
108 */
119 /*
1210 * File: cave.c
@@ -174,7 +172,6 @@
174172 /* Assume los */
175173 return (TRUE);
176174 }
177-
178175 /* Extract some signs */
179176 sx = (dx < 0) ? -1 : 1;
180177 sy = (dy < 0) ? -1 : 1;
@@ -914,7 +911,6 @@
914911 {
915912 g->f_idx = FEAT_NONE;
916913 }
917-
918914 /* Objects */
919915 for (o_ptr = get_first_object(y, x); o_ptr; o_ptr = get_next_object(o_ptr))
920916 {
@@ -2207,7 +2203,8 @@
22072203 /* Paranoia */
22082204 if (hack->num_slopes >= VINFO_MAX_SLOPES)
22092205 {
2210- quit_fmt(__T("Too many slopes (%d)!"),
2206+ quit_fmt(LS(__T("Too many slopes (%d)!"),
2207+ __T("斜線が多すぎます!(%d)")), /* Translation TBC */
22112208 VINFO_MAX_SLOPES);
22122209 }
22132210
@@ -2215,7 +2212,6 @@
22152212 hack->slopes[hack->num_slopes++] = m;
22162213 }
22172214 }
2218-
22192215 /* Track slope range */
22202216 if (hack->slopes_min[y][x] > m) hack->slopes_min[y][x] = m;
22212217 if (hack->slopes_max[y][x] < m) hack->slopes_max[y][x] = m;
@@ -2268,7 +2264,8 @@
22682264 /* Paranoia */
22692265 if (num_grids >= VINFO_MAX_GRIDS)
22702266 {
2271- quit_fmt(__T("Too many grids (%d >= %d)!"),
2267+ quit_fmt(LS(__T("Too many grids (%d >= %d)!"),
2268+ __T("マスが多すぎます!(%d >= %d)")), /* Translation TBC */
22722269 num_grids, VINFO_MAX_GRIDS);
22732270 }
22742271
@@ -2304,7 +2301,8 @@
23042301 /* Enforce maximal efficiency */
23052302 if (num_grids < VINFO_MAX_GRIDS)
23062303 {
2307- quit_fmt(__T("Too few grids (%d < %d)!"),
2304+ quit_fmt(LS(__T("Too few grids (%d < %d)!"),
2305+ __T("マスが少なすぎます!(%d < %d)")), /* Translation TBC */
23082306 num_grids, VINFO_MAX_GRIDS);
23092307 }
23102308
@@ -2311,7 +2309,8 @@
23112309 /* Enforce maximal efficiency */
23122310 if (hack->num_slopes < VINFO_MAX_SLOPES)
23132311 {
2314- quit_fmt(__T("Too few slopes (%d < %d)!"),
2312+ quit_fmt(LS(__T("Too few slopes (%d < %d)!"),
2313+ __T("斜線が少なすぎます!(%d < %d)")), /* Translation TBC */
23152314 hack->num_slopes, VINFO_MAX_SLOPES);
23162315 }
23172316
@@ -2371,7 +2370,6 @@
23712370 }
23722371 }
23732372 }
2374-
23752373 /* Default */
23762374 vinfo[e].next_0 = &vinfo[0];
23772375
@@ -2389,7 +2387,6 @@
23892387
23902388 vinfo[e].next_0 = &vinfo[queue_tail - 1];
23912389 }
2392-
23932390 /* Default */
23942391 vinfo[e].next_1 = &vinfo[0];
23952392
@@ -2407,7 +2404,6 @@
24072404
24082405 vinfo[e].next_1 = &vinfo[queue_tail - 1];
24092406 }
2410-
24112407 /* Hack -- main diagonal has special children */
24122408 if (y == x) vinfo[e].next_0 = vinfo[e].next_1;
24132409
@@ -2424,9 +2420,9 @@
24242420 ((vinfo[1].bits_1 | vinfo[2].bits_1) != VINFO_BITS_1) ||
24252421 ((vinfo[1].bits_0 | vinfo[2].bits_0) != VINFO_BITS_0))
24262422 {
2427- quit(__T("Incorrect bit masks!"));
2423+ quit(LS(__T("Incorrect bit masks!"),
2424+ __T("間違ったビット・マスクです!"))); /* Translation TBC */
24282425 }
2429-
24302426 /* Kill hack */
24312427 FREE(hack);
24322428
@@ -2755,9 +2751,7 @@
27552751 fast_view_g[fast_view_n++] = g;
27562752 }
27572753 }
2758-
2759- /* Handle non-wall */
2760- else
2754+ else /* Handle non-wall */
27612755 {
27622756 /* Enqueue child */
27632757 if (last != p->next_0)
@@ -2786,7 +2780,6 @@
27862780 /* Mark as "CAVE_LITE" */
27872781 /* info |= (CAVE_LITE); */
27882782 }
2789-
27902783 /* Perma-lit grids */
27912784 else if (info & (CAVE_GLOW))
27922785 {
@@ -2793,7 +2786,6 @@
27932786 /* Mark as "CAVE_SEEN" */
27942787 info |= (CAVE_SEEN);
27952788 }
2796-
27972789 /* Save cave info */
27982790 fast_cave_info[g] = info;
27992791
@@ -2804,7 +2796,6 @@
28042796 }
28052797 }
28062798 }
2807-
28082799 /*** Step 3 -- Complete the algorithm ***/
28092800
28102801 /* Handle blindness */
@@ -2820,7 +2811,6 @@
28202811 fast_cave_info[g] &= ~(CAVE_SEEN);
28212812 }
28222813 }
2823-
28242814 /* Process "new" grids */
28252815 for (i = 0; i < fast_view_n; i++)
28262816 {
@@ -3156,7 +3146,6 @@
31563146 /* Forget the object */
31573147 o_ptr->marked = FALSE;
31583148 }
3159-
31603149 /* Fully update the visuals */
31613150 p_ptr->update |= (PU_FORGET_VIEW | PU_UPDATE_VIEW | PU_MONSTERS);
31623151
Show on old repository browser