More translation work (menu items).
@@ -398,17 +398,17 @@ | ||
398 | 398 | * Menu structures for the death menu. Note that Quit must always be the |
399 | 399 | * last option, due to a hard-coded check in death_screen |
400 | 400 | */ |
401 | -static menu_type death_menu; | |
401 | +static menu_type death_menu; | |
402 | 402 | static menu_action death_actions[] = |
403 | 403 | { |
404 | - { 'i', __T("Information"), death_info, NULL }, | |
405 | - { 'm', __T("Messages"), death_messages, NULL }, | |
406 | - { 'f', __T("File dump"), death_file, NULL }, | |
407 | - { 'v', __T("View scores"), death_scores, NULL }, | |
408 | - { 'x', __T("Examine items"), death_examine, NULL }, | |
409 | - { 'h', __T("History"), death_history, NULL }, | |
410 | - { 's', __T("Spoilers"), death_spoilers, NULL }, | |
411 | - { 'q', __T("Quit"), death_examine, NULL }, | |
404 | + { 'i', {__T("Information"),__T("[未訳]Information")}, death_info, NULL }, | |
405 | + { 'm', {__T("Messages"),__T("[未訳]Messages")}, death_messages, NULL }, | |
406 | + { 'f', {__T("File dump"),__T("[未訳]File dump")}, death_file, NULL }, | |
407 | + { 'v', {__T("View scores"),__T("[未訳]View scores")}, death_scores, NULL }, | |
408 | + { 'x', {__T("Examine items"),__T("[未訳]Examine items")}, death_examine, NULL }, | |
409 | + { 'h', {__T("History"),__T("[未訳]History")}, death_history, NULL }, | |
410 | + { 's', {__T("Spoilers"),__T("[未訳]Spoilers")}, death_spoilers, NULL }, | |
411 | + { 'q', {__T("Quit"),__T("[未訳]Quit")}, death_examine, NULL }, | |
412 | 412 | }; |
413 | 413 | |
414 | 414 | /* Return the tag for a menu entry */ |
@@ -424,7 +424,7 @@ | ||
424 | 424 | byte attr = curs_attrs[CURS_KNOWN][(int)cursor]; |
425 | 425 | (void)menu; |
426 | 426 | (void)width; |
427 | - c_prt(attr, death_actions[oid].name, row, col); | |
427 | + c_prt(attr, death_actions[oid].name[arg_language], row, col); | |
428 | 428 | } |
429 | 429 | |
430 | 430 | static const menu_iter death_iter = |
@@ -4,9 +4,7 @@ | ||
4 | 4 | * - Fixed __T on this page. |
5 | 5 | * |
6 | 6 | * Translation Status: |
7 | - * - Started work on whole phrases on this page. | |
8 | - * - plog() done on this page (weren't any). | |
9 | - * - prt() started on this page. | |
7 | + * - First draft done, but not checked. | |
10 | 8 | */ |
11 | 9 | /* |
12 | 10 | * File: cmd-know.c |
@@ -1870,14 +1868,14 @@ | ||
1870 | 1868 | */ |
1871 | 1869 | static menu_item knowledge_actions[] = |
1872 | 1870 | { |
1873 | -{ {0, __T("Display object knowledge"), do_cmd_knowledge_objects, 0}, 'a', 0 }, | |
1874 | -{ {0, __T("Display artifact knowledge"), do_cmd_knowledge_artifacts, 0}, 'b', 0 }, | |
1875 | -{ {0, __T("Display ego item knowledge"), do_cmd_knowledge_ego_items, 0}, 'c', 0 }, | |
1876 | -{ {0, __T("Display monster knowledge"), do_cmd_knowledge_monsters, 0}, 'd', 0 }, | |
1877 | -{ {0, __T("Display feature knowledge"), do_cmd_knowledge_features, 0}, 'e', 0 }, | |
1878 | -{ {0, __T("Display self-knowledge"), do_cmd_self_knowledge, 0}, 'f', 0 }, | |
1879 | -{ {0, __T("Display hall of fame"), do_cmd_knowledge_scores, 0}, 'g', 0 }, | |
1880 | -{ {0, __T("Display character history"), do_cmd_knowledge_history, 0}, 'h', 0 }, | |
1871 | +{ {0, {__T("Display object knowledge"),__T("ACem¯Ì\¦")}, do_cmd_knowledge_objects, 0}, 'a', 0 }, | |
1872 | +{ {0, {__T("Display artifact knowledge"),__T("A[eBt@Ngm¯Ì\¦")}, do_cmd_knowledge_artifacts, 0}, 'b', 0 }, | |
1873 | +{ {0, {__T("Display ego item knowledge"),__T("GSACem¯Ì\¦")}, do_cmd_knowledge_ego_items, 0}, 'c', 0 }, | |
1874 | +{ {0, {__T("Display monster knowledge"),__T("X^[m¯Ì\¦")}, do_cmd_knowledge_monsters, 0}, 'd', 0 }, | |
1875 | +{ {0, {__T("Display feature knowledge"),__T("n`m¯Ì\¦")}, do_cmd_knowledge_features, 0}, 'e', 0 }, | |
1876 | +{ {0, {__T("Display self-knowledge"),__T("©ÈF¯Ì\¦")}, do_cmd_self_knowledge, 0}, 'f', 0 }, | |
1877 | +{ {0, {__T("Display hall of fame"),__T("XRA\¦")}, do_cmd_knowledge_scores, 0}, 'g', 0 }, | |
1878 | +{ {0, {__T("Display character history"),__T("LïÌ\¦")}, do_cmd_knowledge_history, 0}, 'h', 0 }, | |
1881 | 1879 | }; |
1882 | 1880 | |
1883 | 1881 | static menu_type knowledge_menu; |
@@ -1893,7 +1891,7 @@ | ||
1893 | 1891 | /* Initialize the menus */ |
1894 | 1892 | menu_type *menu = &knowledge_menu; |
1895 | 1893 | WIPE(menu, menu_type); |
1896 | - menu->title = __T("Display current knowledge"); | |
1894 | + menu->title = __T("Display current knowledge"); /* TODO Should have Japanese title implemented too? */ | |
1897 | 1895 | menu->menu_data = knowledge_actions; |
1898 | 1896 | menu->count = N_ELEMENTS(knowledge_actions), |
1899 | 1897 | menu_init(menu, MN_SKIN_SCROLL, find_menu_iter(MN_ITER_ITEMS), &SCREEN_REGION); |
@@ -1540,23 +1540,23 @@ | ||
1540 | 1540 | |
1541 | 1541 | static menu_action option_actions [] = |
1542 | 1542 | { |
1543 | - {'a', __T("Interface options"), do_cmd_options_aux, (void*)0}, | |
1544 | - {'b', __T("Display options"), do_cmd_options_aux, (void*)1}, | |
1545 | - {'e', __T("Warning and disturbance options"), do_cmd_options_aux, (void*)2}, | |
1546 | - {'f', __T("Birth (difficulty) options"), do_cmd_options_aux, (void*)3}, | |
1547 | - {'g', __T("Cheat options"), do_cmd_options_aux, (void*)4}, | |
1548 | - {0, 0, 0, 0}, /* Load and append */ | |
1549 | - {'w', __T("Subwindow display settings"), (action_f) do_cmd_options_win, 0}, | |
1550 | - {'s', __T("Item squelch settings"), (action_f) do_cmd_options_item, 0}, | |
1551 | - {'d', __T("Set base delay factor"), (action_f) do_cmd_delay, 0}, | |
1552 | - {'h', __T("Set hitpoint warning"), (action_f) do_cmd_hp_warn, 0}, | |
1553 | - {'i', __T("Set movement delay"), (action_f) do_cmd_lazymove_delay, 0}, | |
1554 | - {'l', __T("Load a user pref file"), (action_f) do_cmd_pref_file_hack, (void*)20}, | |
1555 | - {'o', __T("Save options"), do_dump_options, 0}, | |
1556 | - {0, 0, 0, 0}, /* Interact with */ | |
1557 | - {'m', __T("Interact with macros (advanced)"), (action_f) do_cmd_macros, 0}, | |
1558 | - {'v', __T("Interact with visuals (advanced)"), (action_f) do_cmd_visuals, 0}, | |
1559 | - {'c', __T("Interact with colours (advanced)"), (action_f) do_cmd_colors, 0}, | |
1543 | + {'a', {__T("Interface options"),__T("[未訳]Interface options")}, do_cmd_options_aux, (void*)0}, | |
1544 | + {'b', {__T("Display options"),__T("[未訳]Display options")}, do_cmd_options_aux, (void*)1}, | |
1545 | + {'e', {__T("Warning and disturbance options"),__T("[未訳]Warning and disturbance options")}, do_cmd_options_aux, (void*)2}, | |
1546 | + {'f', {__T("Birth (difficulty) options"),__T("[未訳]Birth (difficulty) options")}, do_cmd_options_aux, (void*)3}, | |
1547 | + {'g', {__T("Cheat options"),__T("[未訳]Cheat options")}, do_cmd_options_aux, (void*)4}, | |
1548 | + {0, {0,0}, 0, 0}, /* Load and append */ | |
1549 | + {'w', {__T("Subwindow display settings"),__T("[未訳]Subwindow display settings")}, (action_f) do_cmd_options_win, 0}, | |
1550 | + {'s', {__T("Item squelch settings"),__T("[未訳]Item squelch settings")}, (action_f) do_cmd_options_item, 0}, | |
1551 | + {'d', {__T("Set base delay factor"),__T("[未訳]Set base delay factor")}, (action_f) do_cmd_delay, 0}, | |
1552 | + {'h', {__T("Set hitpoint warning"),__T("[未訳]Set hitpoint warning")}, (action_f) do_cmd_hp_warn, 0}, | |
1553 | + {'i', {__T("Set movement delay"),__T("[未訳]Set movement delay")}, (action_f) do_cmd_lazymove_delay, 0}, | |
1554 | + {'l', {__T("Load a user pref file"),__T("[未訳]Load a user pref file")}, (action_f) do_cmd_pref_file_hack, (void*)20}, | |
1555 | + {'o', {__T("Save options"),__T("[未訳]Save options")}, do_dump_options, 0}, | |
1556 | + {0, {0,0}, 0, 0}, /* Interact with */ | |
1557 | + {'m', {__T("Interact with macros (advanced)"),__T("[未訳]Interact with macros (advanced)")}, (action_f) do_cmd_macros, 0}, | |
1558 | + {'v', {__T("Interact with visuals (advanced)"),__T("[未訳]Interact with visuals (advanced)")}, (action_f) do_cmd_visuals, 0}, | |
1559 | + {'c', {__T("Interact with colours (advanced)"),__T("[未訳]Interact with colours (advanced)")}, (action_f) do_cmd_colors, 0}, | |
1560 | 1560 | }; |
1561 | 1561 | |
1562 | 1562 | static menu_type option_menu; |
@@ -1586,7 +1586,7 @@ | ||
1586 | 1586 | (void)menu; |
1587 | 1587 | (void)width; |
1588 | 1588 | if (option_actions[oid].name) |
1589 | - c_prt(attr, option_actions[oid].name, row, col); | |
1589 | + c_prt(attr, option_actions[oid].name[arg_language], row, col); | |
1590 | 1590 | } |
1591 | 1591 | |
1592 | 1592 | static const menu_iter options_iter = |
@@ -1615,7 +1615,7 @@ | ||
1615 | 1615 | if (c.type == EVT_SELECT && option_actions[cursor].action) |
1616 | 1616 | { |
1617 | 1617 | option_actions[cursor].action(option_actions[cursor].data, |
1618 | - option_actions[cursor].name); | |
1618 | + option_actions[cursor].name[arg_language]); | |
1619 | 1619 | } |
1620 | 1620 | message_flush(); |
1621 | 1621 | } |
@@ -67,7 +67,7 @@ | ||
67 | 67 | typedef struct menu_action |
68 | 68 | { |
69 | 69 | int id; /* Object id used to define macros &c */ |
70 | - const _TCHAR *name; /* Name of the action */ | |
70 | + const _TCHAR *name[2]; /* Name of the action */ | |
71 | 71 | action_f action; /* Action to perform, if any */ |
72 | 72 | void *data; /* Local environment for the action, if required */ |
73 | 73 | } menu_action; |
@@ -59,7 +59,7 @@ | ||
59 | 59 | Term_erase(col, row, wid); |
60 | 60 | |
61 | 61 | if (act->name) |
62 | - Term_putstr(col, row, wid, color, act->name); | |
62 | + Term_putstr(col, row, wid, color, act->name[arg_language]); | |
63 | 63 | } |
64 | 64 | |
65 | 65 | static void display_action(menu_type *menu, int oid, bool cursor, int row, int col, int width) |
@@ -78,7 +78,7 @@ | ||
78 | 78 | |
79 | 79 | if (cmd == MOUSEY && act->action) |
80 | 80 | { |
81 | - act->action(act->data, act->name); | |
81 | + act->action(act->data, act->name[arg_language]); | |
82 | 82 | return TRUE; |
83 | 83 | } |
84 | 84 | else if (cmd == MOUSEY) |
@@ -137,7 +137,7 @@ | ||
137 | 137 | return TRUE; |
138 | 138 | |
139 | 139 | if (item->act.action) |
140 | - item->act.action(item->act.data, item->act.name); | |
140 | + item->act.action(item->act.data, item->act.name[arg_language]); | |
141 | 141 | |
142 | 142 | if (item->flags & MN_SELECTABLE) |
143 | 143 | item->flags ^= MN_SELECTED; |
@@ -144,7 +144,6 @@ | ||
144 | 144 | |
145 | 145 | return TRUE; |
146 | 146 | } |
147 | - | |
148 | 147 | return FALSE; |
149 | 148 | } |
150 | 149 |