? -U ? i18n_hal_tools.patch Index: utils/meter.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/meter.c,v retrieving revision 1.28 diff -U1 -r1.28 meter.c --- utils/meter.c 13 May 2009 14:49:05 -0000 1.28 +++ utils/meter.c 14 May 2009 05:16:50 -0000 @@ -215,3 +215,3 @@ height = 80; - win_name = "Hal Meter"; + win_name = _("Hal Meter"); } @@ -263,4 +263,4 @@ /* create the buttons and add them to the hbox */ - button_select = gtk_button_new_with_label("_Select"); - button_exit = gtk_button_new_with_label("E_xit"); + button_select = gtk_button_new_with_label(_("_Select")); + button_exit = gtk_button_new_with_label(_("E_xit")); gtk_button_set_use_underline((GtkButton *)button_select, TRUE); @@ -308,3 +308,3 @@ /* define a probe for the display item */ - new->probe = probe_new("Select item to display"); + new->probe = probe_new(_("Select item to display")); if (new->probe == NULL) { @@ -336,3 +336,3 @@ /* no name specified, fake it */ - probe_name = "Select Item to Probe"; + probe_name = _("Select Item to Probe"); } @@ -611,5 +611,5 @@ /* text for tab labels */ - tab_label_text[0] = " _Pins "; - tab_label_text[1] = " _Signals "; - tab_label_text[2] = " Para_meters "; + tab_label_text[0] = _(" _Pins "); + tab_label_text[1] = _(" _Signals "); + tab_label_text[2] = _(" Para_meters "); /* loop to create three identical tabs */ @@ -656,3 +656,3 @@ /* create the close button and add it to the hbox */ - button_close = gtk_button_new_with_label("_Close"); + button_close = gtk_button_new_with_label(_("_Close")); gtk_button_set_use_underline((GtkButton *)button_close, TRUE); Index: utils/scope.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope.c,v retrieving revision 1.24 diff -U1 -r1.24 scope.c --- utils/scope.c 13 May 2009 14:49:05 -0000 1.24 +++ utils/scope.c 14 May 2009 05:16:51 -0000 @@ -477,3 +477,3 @@ GtkWidget *filew; - filew = gtk_file_selection_new("Open Configuration File:" ); + filew = gtk_file_selection_new(_("Open Configuration File:")); gtk_signal_connect (GTK_OBJECT (filew), "destroy", @@ -504,3 +504,3 @@ GtkWidget *filew; - filew = gtk_file_selection_new("Open Configuration File:" ); + filew = gtk_file_selection_new(_("Open Configuration File:")); gtk_signal_connect (GTK_OBJECT (filew), "destroy", @@ -538,3 +538,3 @@ - fileopenconfiguration = gtk_menu_item_new_with_mnemonic("_Open Configuration..."); + fileopenconfiguration = gtk_menu_item_new_with_mnemonic(_("_Open Configuration...")); gtk_menu_append(GTK_MENU(filemenu), fileopenconfiguration); @@ -544,3 +544,3 @@ - filesaveconfiguration = gtk_menu_item_new_with_mnemonic("_Save Configuration..."); + filesaveconfiguration = gtk_menu_item_new_with_mnemonic(_("_Save Configuration...")); gtk_menu_append(GTK_MENU(filemenu), filesaveconfiguration); @@ -553,3 +553,3 @@ - fileopendatafile = gtk_menu_item_new_with_mnemonic("O_pen Data File..."); + fileopendatafile = gtk_menu_item_new_with_mnemonic(_("O_pen Data File...")); gtk_menu_append(GTK_MENU(filemenu), fileopendatafile); @@ -560,3 +560,3 @@ - filesavedatafile = gtk_menu_item_new_with_mnemonic("S_ave Data File..."); + filesavedatafile = gtk_menu_item_new_with_mnemonic(_("S_ave Data File...")); gtk_menu_append(GTK_MENU(filemenu), filesavedatafile); @@ -569,3 +569,3 @@ - filequit = gtk_menu_item_new_with_mnemonic("_Quit"); + filequit = gtk_menu_item_new_with_mnemonic(_("_Quit")); gtk_menu_append(GTK_MENU(filemenu), filequit); @@ -575,3 +575,3 @@ - helpabout = gtk_menu_item_new_with_mnemonic("_About Halscope"); + helpabout = gtk_menu_item_new_with_mnemonic(_("_About Halscope")); gtk_menu_append(GTK_MENU(helpmenu), helpabout); @@ -581,3 +581,3 @@ - file_rootmenu = gtk_menu_item_new_with_mnemonic("_File"); + file_rootmenu = gtk_menu_item_new_with_mnemonic(_("_File")); gtk_widget_show(file_rootmenu); @@ -585,3 +585,3 @@ - help_rootmenu = gtk_menu_item_new_with_mnemonic("_Help"); + help_rootmenu = gtk_menu_item_new_with_mnemonic(_("_Help")); gtk_widget_show(help_rootmenu); @@ -644,3 +644,3 @@ /* set main window title */ - gtk_window_set_title(GTK_WINDOW(ctrl_usr->main_win), "HAL Oscilloscope"); + gtk_window_set_title(GTK_WINDOW(ctrl_usr->main_win), _("HAL Oscilloscope")); @@ -672,3 +672,3 @@ ctrl_usr->horiz_info_win = - gtk_vbox_framed_new_in_box("Horizontal", FALSE, 0, 0, vboxleft, FALSE, + gtk_vbox_framed_new_in_box(_("Horizontal"), FALSE, 0, 0, vboxleft, FALSE, FALSE, 1); @@ -680,3 +680,3 @@ ctrl_usr->chan_info_win = - gtk_hbox_framed_new_in_box("Selected Channel", FALSE, 0, 0, vboxleft, + gtk_hbox_framed_new_in_box(_("Selected Channel"), FALSE, 0, 0, vboxleft, FALSE, FALSE, 0); @@ -686,6 +686,6 @@ ctrl_usr->run_mode_win = - gtk_vbox_framed_new_in_box("Run Mode", TRUE, 0, 0, vboxleft, FALSE, + gtk_vbox_framed_new_in_box(_("Run Mode"), TRUE, 0, 0, vboxleft, FALSE, FALSE, 0); ctrl_usr->trig_info_win = - gtk_vbox_framed_new_in_box("Trigger", FALSE, 0, 0, vboxright, TRUE, + gtk_vbox_framed_new_in_box(_("Trigger"), FALSE, 0, 0, vboxright, TRUE, TRUE, 0); @@ -695,3 +695,3 @@ ctrl_usr->vert_info_win = - gtk_vbox_framed_new_in_box("Vertical", FALSE, 0, 0, vboxleft, TRUE, + gtk_vbox_framed_new_in_box(_("Vertical"), FALSE, 0, 0, vboxleft, TRUE, TRUE, 0); @@ -703,12 +703,12 @@ /* define the radio buttons */ - ctrl_usr->rm_stop_button = gtk_radio_button_new_with_label(NULL, "Stop"); + ctrl_usr->rm_stop_button = gtk_radio_button_new_with_label(NULL, _("Stop")); ctrl_usr->rm_normal_button = gtk_radio_button_new_with_label(gtk_radio_button_group - (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), "Normal"); + (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), _("Normal")); ctrl_usr->rm_single_button = gtk_radio_button_new_with_label(gtk_radio_button_group - (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), "Single"); + (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), _("Single")); ctrl_usr->rm_roll_button = gtk_radio_button_new_with_label(gtk_radio_button_group - (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), "Roll"); + (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), _("Roll")); /* now put them into the box */ Index: utils/scope_horiz.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope_horiz.c,v retrieving revision 1.20 diff -U1 -r1.20 scope_horiz.c --- utils/scope_horiz.c 7 Nov 2008 22:12:44 -0000 1.20 +++ utils/scope_horiz.c 14 May 2009 05:16:52 -0000 @@ -37,2 +37,7 @@ +#include "config.h" +#include +#include +#define _(x) gettext(x) + #include @@ -131,4 +136,4 @@ vbox = gtk_vbox_new_in_box(TRUE, 0, 0, hbox, FALSE, TRUE, 3); - gtk_label_new_in_box("Zoom", vbox, FALSE, TRUE, 0); - gtk_label_new_in_box(" Pos ", vbox, FALSE, TRUE, 0); + gtk_label_new_in_box(_("Zoom"), vbox, FALSE, TRUE, 0); + gtk_label_new_in_box(_(" Pos "), vbox, FALSE, TRUE, 0); /* second column - sliders */ @@ -165,3 +170,3 @@ horiz->record_button = - gtk_button_new_with_label("----- Samples\nat ---- KHz"); + gtk_button_new_with_label(_("----- Samples\nat ---- KHz")); horiz->record_label = (GTK_BIN(horiz->record_button))->child; @@ -201,3 +206,3 @@ gtk_label_new_in_box(" ---- ", vbox, FALSE, FALSE, 3); - gtk_label_size_to_fit(GTK_LABEL(horiz->state_label), " TRIGGERED "); + gtk_label_size_to_fit(GTK_LABEL(horiz->state_label), _(" TRIGGERED ")); } @@ -460,4 +465,4 @@ } - title = "Realtime component not loaded"; - msg = "HALSCOPE uses a realtime component called scope_rt'\n" + title = _("Realtime component not loaded"); + msg = _("HALSCOPE uses a realtime component called scope_rt'\n" "to sample signals for display. It is not currently loaded\n" @@ -467,3 +472,3 @@ "Load the component (using 'halcmd loadrt scope_rt'), then click 'OK'\n" - "or\n" "Click 'Quit' to exit HALSCOPE"; + "or\n" "Click 'Quit' to exit HALSCOPE"); retval = @@ -497,4 +502,4 @@ if (horiz->thread_name == NULL) { - title = "Realtime function not linked"; - msg = "The HALSCOPE realtime sampling function\n" + title = _("Realtime function not linked"); + msg = _("The HALSCOPE realtime sampling function\n" "must be called from a HAL thread in to\n" @@ -503,7 +508,7 @@ "Select a thread name and multiplier then click 'OK'\n" - "or\n" "Click 'Quit' to exit HALSCOPE"; + "or\n" "Click 'Quit' to exit HALSCOPE"); } else { - title = "Select Sample Rate"; - msg = "Select a thread name and multiplier then click 'OK'\n" - "or\n" "Click 'Quit' to exit HALSCOPE"; + title = _("Select Sample Rate"); + msg = _("Select a thread name and multiplier then click 'OK'\n" + "or\n" "Click 'Quit' to exit HALSCOPE"); } @@ -528,3 +533,3 @@ FALSE, TRUE, 5); - gtk_label_new_in_box("Thread:", hbox, TRUE, TRUE, 0); + gtk_label_new_in_box(_("Thread:"), hbox, TRUE, TRUE, 0); horiz->thread_name_label = @@ -536,3 +541,3 @@ FALSE, TRUE, 5); - gtk_label_new_in_box("Sample Period:", hbox, TRUE, TRUE, 0); + gtk_label_new_in_box(_("Sample Period:"), hbox, TRUE, TRUE, 0); horiz->sample_period_label = @@ -544,3 +549,3 @@ FALSE, TRUE, 5); - gtk_label_new_in_box("Sample Rate:", hbox, TRUE, TRUE, 0); + gtk_label_new_in_box(_("Sample Rate:"), hbox, TRUE, TRUE, 0); horiz->sample_rate_label = @@ -560,4 +565,4 @@ /* create a list to hold the threads */ - titles[0] = "Thread"; - titles[1] = "Period"; + titles[0] = _("Thread"); + titles[1] = _("Period"); horiz->thread_list = gtk_clist_new_with_titles(2, titles); @@ -621,3 +626,3 @@ FALSE, TRUE, 5); - gtk_label_new_in_box("Multiplier:", hbox, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Multiplier:"), hbox, FALSE, FALSE, 0); /* set up the multiplier spinbutton - ranges from every run of the @@ -638,3 +643,3 @@ /* box for record length buttons */ - gtk_label_new_in_box("Record Length", + gtk_label_new_in_box(_("Record Length"), GTK_DIALOG(dialog.window)->vbox, TRUE, TRUE, 0); @@ -644,6 +649,6 @@ /* now define the radio buttons */ - snprintf(buf, BUFLEN, "%5d samples (1 channel)", ctrl_shm->buf_len); + snprintf(buf, BUFLEN, _("%5d samples (1 channel)"), ctrl_shm->buf_len); buttons[0] = gtk_radio_button_new_with_label(NULL, buf); buttongroup = gtk_radio_button_group(GTK_RADIO_BUTTON(buttons[0])); - snprintf(buf, BUFLEN, "%5d samples (2 channels)", ctrl_shm->buf_len / 2); + snprintf(buf, BUFLEN, _("%5d samples (2 channels)"), ctrl_shm->buf_len / 2); buttons[1] = @@ -651,3 +656,3 @@ [0]), buf); - snprintf(buf, BUFLEN, "%5d samples (4 channels)", ctrl_shm->buf_len / 4); + snprintf(buf, BUFLEN, _("%5d samples (4 channels)"), ctrl_shm->buf_len / 4); buttons[2] = @@ -655,3 +660,3 @@ [0]), buf); - snprintf(buf, BUFLEN, "%5d samples (8 channels)", ctrl_shm->buf_len / 8); + snprintf(buf, BUFLEN, _("%5d samples (8 channels)"), ctrl_shm->buf_len / 8); buttons[3] = @@ -659,3 +664,3 @@ [0]), buf); - snprintf(buf, BUFLEN, "%5d samples (16 channels)", + snprintf(buf, BUFLEN, _("%5d samples (16 channels)"), ctrl_shm->buf_len / 16); @@ -719,3 +724,3 @@ GTK_SIGNAL_FUNC(dialog_generic_button1), &dialog); - button = gtk_button_new_with_label("Quit"); + button = gtk_button_new_with_label(_("Quit")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog.window)->action_area), @@ -1060,3 +1065,3 @@ format_time_value(tmp, BUFLEN, horiz->disp_scale); - snprintf(scale, BUFLEN, "%s\nper div", tmp); + snprintf(scale, BUFLEN, _("%s\nper div"), tmp); } @@ -1075,3 +1080,3 @@ } - snprintf(msg, BUFLEN, "%s samples\nat %s", rec_len, rate); + snprintf(msg, BUFLEN, _("%s samples\nat %s"), rec_len, rate); gtk_label_set_text_if(horiz->thread_name_label, name); Index: utils/scope_trig.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope_trig.c,v retrieving revision 1.13 diff -U1 -r1.13 scope_trig.c --- utils/scope_trig.c 6 Nov 2008 03:39:58 -0000 1.13 +++ utils/scope_trig.c 14 May 2009 05:16:53 -0000 @@ -36,2 +36,7 @@ +#include "config.h" +#include +#include +#define _(x) gettext(x) + #include @@ -111,5 +116,5 @@ if (ctrl_shm->trig_edge == 0) { - snprintf(buf, BUFLEN, "Falling"); + snprintf(buf, BUFLEN, _("Falling")); } else { - snprintf(buf, BUFLEN, "Rising"); + snprintf(buf, BUFLEN, _("Rising")); } @@ -120,3 +125,3 @@ ctrl_shm->trig_chan = 0; - gtk_label_set_text_if(trig->source_label, "Source\nNone"); + gtk_label_set_text_if(trig->source_label, _("Source\nNone")); gtk_label_set_text_if(trig->level_label, " ---- "); @@ -125,3 +130,3 @@ } - snprintf(buf, BUFLEN, "Source\nChan %2d", ctrl_shm->trig_chan); + snprintf(buf, BUFLEN, _("Source\nChan %2d"), ctrl_shm->trig_chan); gtk_label_set_text_if(trig->source_label, buf); @@ -200,5 +205,5 @@ gtk_radio_button_new_with_label(gtk_radio_button_group - (GTK_RADIO_BUTTON(trig->normal_button)), "Auto"); + (GTK_RADIO_BUTTON(trig->normal_button)), _("Auto")); /* and a regular button */ - trig->force_button = gtk_button_new_with_label("Force"); + trig->force_button = gtk_button_new_with_label(_("Force")); /* now put them into the box */ @@ -236,3 +241,3 @@ vbox = gtk_vbox_new_in_box(FALSE, 0, 0, hbox, TRUE, TRUE, 0); - gtk_label_new_in_box("Level", vbox, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Level"), vbox, FALSE, FALSE, 0); trig->level_adj = @@ -253,3 +258,3 @@ vbox = gtk_vbox_new_in_box(FALSE, 0, 0, hbox, TRUE, TRUE, 0); - gtk_label_new_in_box("Pos", vbox, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Pos"), vbox, FALSE, FALSE, 0); trig->pos_adj = @@ -270,3 +275,3 @@ gtk_hseparator_new_in_box(ctrl_usr->trig_info_win, 3); - gtk_label_new_in_box("Level", ctrl_usr->trig_info_win, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Level"), ctrl_usr->trig_info_win, FALSE, FALSE, 0); trig->level_label = @@ -276,3 +281,3 @@ ctrl_shm->trig_edge = 1; - trig->edge_button = gtk_button_new_with_label("Rising"); + trig->edge_button = gtk_button_new_with_label(_("Rising")); trig->edge_label = (GTK_BIN(trig->edge_button))->child; @@ -284,3 +289,3 @@ /* define a button to set the trigger source */ - trig->source_button = gtk_button_new_with_label("Source\nNone"); + trig->source_button = gtk_button_new_with_label(_("Source\nNone")); trig->source_label = (GTK_BIN(trig->source_button))->child; @@ -308,4 +313,4 @@ trig = &(ctrl_usr->trig); - title = "Trigger Source"; - msg = "Select a channel to use for triggering."; + title = _("Trigger Source"); + msg = _("Select a channel to use for triggering."); /* create dialog window, disable resizing */ @@ -332,4 +337,4 @@ /* create a list to hold the data */ - titles[0] = "Chan"; - titles[1] = "Source"; + titles[0] = _("Chan"); + titles[1] = _("Source"); trig_list = gtk_clist_new_with_titles(2, titles); @@ -372,3 +377,3 @@ /* make Cancel button */ - button = gtk_button_new_with_label("Cancel"); + button = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog.window)->action_area), Index: utils/scope_vert.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope_vert.c,v retrieving revision 1.30 diff -U1 -r1.30 scope_vert.c --- utils/scope_vert.c 7 Nov 2008 22:12:44 -0000 1.30 +++ utils/scope_vert.c 14 May 2009 05:16:54 -0000 @@ -37,2 +37,7 @@ +#include "config.h" +#include +#include +#define _(x) gettext(x) + #include @@ -403,3 +408,3 @@ } - snprintf(buf2, BUFLEN, "Offset\n%s", buf1); + snprintf(buf2, BUFLEN, _("Offset\n%s"), buf1); gtk_label_set_text_if(vert->offset_label, buf2); @@ -614,3 +619,3 @@ vbox = gtk_vbox_new_in_box(FALSE, 0, 0, hbox, TRUE, TRUE, 0); - gtk_label_new_in_box("Gain", vbox, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Gain"), vbox, FALSE, FALSE, 0); vert->scale_adj = gtk_adjustment_new(0, -5, 5, 1, 1, 0); @@ -626,3 +631,3 @@ vbox = gtk_vbox_new_in_box(FALSE, 0, 0, hbox, TRUE, TRUE, 0); - gtk_label_new_in_box("Pos", vbox, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Pos"), vbox, FALSE, FALSE, 0); vert->pos_adj = @@ -640,3 +645,3 @@ gtk_hseparator_new_in_box(ctrl_usr->vert_info_win, 3); - gtk_label_new_in_box("Scale", ctrl_usr->vert_info_win, FALSE, FALSE, 0); + gtk_label_new_in_box(_("Scale"), ctrl_usr->vert_info_win, FALSE, FALSE, 0); vert->scale_label = @@ -653,3 +658,3 @@ /* a button to turn off the channel */ - button = gtk_button_new_with_label("Chan Off"); + button = gtk_button_new_with_label(_("Chan Off")); gtk_box_pack_start(GTK_BOX(ctrl_usr->vert_info_win), button, FALSE, FALSE, @@ -709,5 +714,5 @@ chan = &(ctrl_usr->chan[chan_num - 1]); - title = "Set Offset"; - snprintf(msg, BUFLEN - 1, "Set the vertical offset\n" - "for channel %d.", chan_num); + title = _("Set Offset"); + snprintf(msg, BUFLEN - 1, _("Set the vertical offset\n" + "for channel %d."), chan_num); /* create dialog window, disable resizing */ @@ -730,3 +735,3 @@ /* a checkbox: AC coupled */ - vert->offset_ac = gtk_check_button_new_with_label("AC Coupled"); + vert->offset_ac = gtk_check_button_new_with_label(_("AC Coupled")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog.window)->vbox), @@ -765,3 +770,3 @@ GTK_SIGNAL_FUNC(offset_activated), button); - button = gtk_button_new_with_label("Cancel"); + button = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog.window)->action_area), @@ -1022,5 +1027,5 @@ chan = &(ctrl_usr->chan[chan_num - 1]); - title = "Select Channel Source"; - snprintf(msg, BUFLEN - 1, "Select a pin, signal, or parameter\n" - "as the source for channel %d.", chan_num); + title = _("Select Channel Source"); + snprintf(msg, BUFLEN - 1, _("Select a pin, signal, or parameter\n" + "as the source for channel %d."), chan_num); /* create dialog window, disable resizing */ @@ -1055,5 +1060,5 @@ /* text for tab labels */ - tab_label_text[0] = "Pins"; - tab_label_text[1] = "Signals"; - tab_label_text[2] = "Parameters"; + tab_label_text[0] = _("Pins"); + tab_label_text[1] = _("Signals"); + tab_label_text[2] = _("Parameters"); /* loop to create three identical tabs */ @@ -1167,3 +1172,3 @@ /* make Cancel button */ - button = gtk_button_new_with_label("Cancel"); + button = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog.window)->action_area), @@ -1254,3 +1259,3 @@ } - snprintf(buf2, BUFLEN, "Offset\n%s", buf1); + snprintf(buf2, BUFLEN, _("Offset\n%s"), buf1); gtk_label_set_text_if(vert->offset_label, buf2);