• R/O
  • SSH
  • HTTPS

jband: Commit


Commit MetaInfo

Revision129 (tree)
Time2009-06-27 05:22:21
Authorpaulblay

Log Message

More translation work (menu items).

Change Summary

Incremental Difference

--- trunk/JBand/src/death.cpp (revision 128)
+++ trunk/JBand/src/death.cpp (revision 129)
@@ -398,17 +398,17 @@
398398 * Menu structures for the death menu. Note that Quit must always be the
399399 * last option, due to a hard-coded check in death_screen
400400 */
401-static menu_type death_menu;
401+static menu_type death_menu;
402402 static menu_action death_actions[] =
403403 {
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 },
412412 };
413413
414414 /* Return the tag for a menu entry */
@@ -424,7 +424,7 @@
424424 byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
425425 (void)menu;
426426 (void)width;
427- c_prt(attr, death_actions[oid].name, row, col);
427+ c_prt(attr, death_actions[oid].name[arg_language], row, col);
428428 }
429429
430430 static const menu_iter death_iter =
--- trunk/JBand/src/cmd-know.cpp (revision 128)
+++ trunk/JBand/src/cmd-know.cpp (revision 129)
@@ -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() started on this page.
7+ * - First draft done, but not checked.
108 */
119 /*
1210 * File: cmd-know.c
@@ -1870,14 +1868,14 @@
18701868 */
18711869 static menu_item knowledge_actions[] =
18721870 {
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("ƒAƒCƒeƒ€’mŽ¯‚Ì•\Ž¦")}, do_cmd_knowledge_objects, 0}, 'a', 0 },
1872+{ {0, {__T("Display artifact knowledge"),__T("ƒA[ƒeƒBƒtƒ@ƒNƒg’mŽ¯‚Ì•\Ž¦")}, do_cmd_knowledge_artifacts, 0}, 'b', 0 },
1873+{ {0, {__T("Display ego item knowledge"),__T("ƒGƒSƒAƒCƒeƒ€’mŽ¯‚Ì•\Ž¦")}, 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("ƒXƒRƒA•\Ž¦")}, do_cmd_knowledge_scores, 0}, 'g', 0 },
1878+{ {0, {__T("Display character history"),__T("ƒLƒƒƒ‰—ï‚Ì•\Ž¦")}, do_cmd_knowledge_history, 0}, 'h', 0 },
18811879 };
18821880
18831881 static menu_type knowledge_menu;
@@ -1893,7 +1891,7 @@
18931891 /* Initialize the menus */
18941892 menu_type *menu = &knowledge_menu;
18951893 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? */
18971895 menu->menu_data = knowledge_actions;
18981896 menu->count = N_ELEMENTS(knowledge_actions),
18991897 menu_init(menu, MN_SKIN_SCROLL, find_menu_iter(MN_ITER_ITEMS), &SCREEN_REGION);
--- trunk/JBand/src/cmd4.cpp (revision 128)
+++ trunk/JBand/src/cmd4.cpp (revision 129)
@@ -1540,23 +1540,23 @@
15401540
15411541 static menu_action option_actions [] =
15421542 {
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},
15601560 };
15611561
15621562 static menu_type option_menu;
@@ -1586,7 +1586,7 @@
15861586 (void)menu;
15871587 (void)width;
15881588 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);
15901590 }
15911591
15921592 static const menu_iter options_iter =
@@ -1615,7 +1615,7 @@
16151615 if (c.type == EVT_SELECT && option_actions[cursor].action)
16161616 {
16171617 option_actions[cursor].action(option_actions[cursor].data,
1618- option_actions[cursor].name);
1618+ option_actions[cursor].name[arg_language]);
16191619 }
16201620 message_flush();
16211621 }
--- trunk/JBand/src/ui-menu.h (revision 128)
+++ trunk/JBand/src/ui-menu.h (revision 129)
@@ -67,7 +67,7 @@
6767 typedef struct menu_action
6868 {
6969 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 */
7171 action_f action; /* Action to perform, if any */
7272 void *data; /* Local environment for the action, if required */
7373 } menu_action;
--- trunk/JBand/src/ui-menu.cpp (revision 128)
+++ trunk/JBand/src/ui-menu.cpp (revision 129)
@@ -59,7 +59,7 @@
5959 Term_erase(col, row, wid);
6060
6161 if (act->name)
62- Term_putstr(col, row, wid, color, act->name);
62+ Term_putstr(col, row, wid, color, act->name[arg_language]);
6363 }
6464
6565 static void display_action(menu_type *menu, int oid, bool cursor, int row, int col, int width)
@@ -78,7 +78,7 @@
7878
7979 if (cmd == MOUSEY && act->action)
8080 {
81- act->action(act->data, act->name);
81+ act->action(act->data, act->name[arg_language]);
8282 return TRUE;
8383 }
8484 else if (cmd == MOUSEY)
@@ -137,7 +137,7 @@
137137 return TRUE;
138138
139139 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]);
141141
142142 if (item->flags & MN_SELECTABLE)
143143 item->flags ^= MN_SELECTED;
@@ -144,7 +144,6 @@
144144
145145 return TRUE;
146146 }
147-
148147 return FALSE;
149148 }
150149
Show on old repository browser