? i18n_haltools.patch Index: utils/meter.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/meter.c,v retrieving revision 1.28 diff -r1.28 meter.c 216c216 < win_name = "Hal Meter"; --- > win_name = _("Hal Meter"); 264,265c264,265 < 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")); 309c309 < new->probe = probe_new("Select item to display"); --- > new->probe = probe_new(_("Select item to display")); 337c337 < probe_name = "Select Item to Probe"; --- > probe_name = _("Select Item to Probe"); 612,614c612,614 < 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 "); 657c657 < button_close = gtk_button_new_with_label("_Close"); --- > button_close = gtk_button_new_with_label(_("_Close")); Index: utils/scope.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope.c,v retrieving revision 1.24 diff -r1.24 scope.c 478c478 < filew = gtk_file_selection_new("Open Configuration File:" ); --- > filew = gtk_file_selection_new(_("Open Configuration File:")); 505c505 < filew = gtk_file_selection_new("Open Configuration File:" ); --- > filew = gtk_file_selection_new(_("Open Configuration File:")); 539c539 < fileopenconfiguration = gtk_menu_item_new_with_mnemonic("_Open Configuration..."); --- > fileopenconfiguration = gtk_menu_item_new_with_mnemonic(_("_Open Configuration...")); 545c545 < filesaveconfiguration = gtk_menu_item_new_with_mnemonic("_Save Configuration..."); --- > filesaveconfiguration = gtk_menu_item_new_with_mnemonic(_("_Save Configuration...")); 554c554 < fileopendatafile = gtk_menu_item_new_with_mnemonic("O_pen Data File..."); --- > fileopendatafile = gtk_menu_item_new_with_mnemonic(_("O_pen Data File...")); 561c561 < filesavedatafile = gtk_menu_item_new_with_mnemonic("S_ave Data File..."); --- > filesavedatafile = gtk_menu_item_new_with_mnemonic(_("S_ave Data File...")); 570c570 < filequit = gtk_menu_item_new_with_mnemonic("_Quit"); --- > filequit = gtk_menu_item_new_with_mnemonic(_("_Quit")); 576c576 < helpabout = gtk_menu_item_new_with_mnemonic("_About Halscope"); --- > helpabout = gtk_menu_item_new_with_mnemonic(_("_About Halscope")); 582c582 < file_rootmenu = gtk_menu_item_new_with_mnemonic("_File"); --- > file_rootmenu = gtk_menu_item_new_with_mnemonic(_("_File")); 586c586 < help_rootmenu = gtk_menu_item_new_with_mnemonic("_Help"); --- > help_rootmenu = gtk_menu_item_new_with_mnemonic(_("_Help")); 645c645 < gtk_window_set_title(GTK_WINDOW(ctrl_usr->main_win), "HAL Oscilloscope"); --- > gtk_window_set_title(GTK_WINDOW(ctrl_usr->main_win), _("HAL Oscilloscope")); 673c673 < gtk_vbox_framed_new_in_box("Horizontal", FALSE, 0, 0, vboxleft, FALSE, --- > gtk_vbox_framed_new_in_box(_("Horizontal"), FALSE, 0, 0, vboxleft, FALSE, 681c681 < gtk_hbox_framed_new_in_box("Selected Channel", FALSE, 0, 0, vboxleft, --- > gtk_hbox_framed_new_in_box(_("Selected Channel"), FALSE, 0, 0, vboxleft, 687c687 < 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, 690c690 < gtk_vbox_framed_new_in_box("Trigger", FALSE, 0, 0, vboxright, TRUE, --- > gtk_vbox_framed_new_in_box(_("Trigger"), FALSE, 0, 0, vboxright, TRUE, 696c696 < gtk_vbox_framed_new_in_box("Vertical", FALSE, 0, 0, vboxleft, TRUE, --- > gtk_vbox_framed_new_in_box(_("Vertical"), FALSE, 0, 0, vboxleft, TRUE, 704c704 < 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")); 707c707 < (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), "Normal"); --- > (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), _("Normal")); 710c710 < (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), "Single"); --- > (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), _("Single")); 713c713 < (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), "Roll"); --- > (GTK_RADIO_BUTTON(ctrl_usr->rm_stop_button)), _("Roll")); Index: utils/scope_horiz.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope_horiz.c,v retrieving revision 1.20 diff -r1.20 scope_horiz.c 37a38,42 > #include "config.h" > #include > #include > #define _(x) gettext(x) > 132,133c137,138 < 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); 166c171 < gtk_button_new_with_label("----- Samples\nat ---- KHz"); --- > gtk_button_new_with_label(_("----- Samples\nat ---- KHz")); 202c207 < gtk_label_size_to_fit(GTK_LABEL(horiz->state_label), " TRIGGERED "); --- > gtk_label_size_to_fit(GTK_LABEL(horiz->state_label), _(" TRIGGERED ")); 461,462c466,467 < 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" 468c473 < "or\n" "Click 'Quit' to exit HALSCOPE"; --- > "or\n" "Click 'Quit' to exit HALSCOPE"); 498,499c503,504 < title = "Realtime function not linked"; < msg = "The HALSCOPE realtime sampling function\n" --- > title = _("Realtime function not linked"); > msg = _("The HALSCOPE realtime sampling function\n" 504c509 < "or\n" "Click 'Quit' to exit HALSCOPE"; --- > "or\n" "Click 'Quit' to exit HALSCOPE"); 506,508c511,513 < 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"); 529c534 < gtk_label_new_in_box("Thread:", hbox, TRUE, TRUE, 0); --- > gtk_label_new_in_box(_("Thread:"), hbox, TRUE, TRUE, 0); 537c542 < gtk_label_new_in_box("Sample Period:", hbox, TRUE, TRUE, 0); --- > gtk_label_new_in_box(_("Sample Period:"), hbox, TRUE, TRUE, 0); 545c550 < gtk_label_new_in_box("Sample Rate:", hbox, TRUE, TRUE, 0); --- > gtk_label_new_in_box(_("Sample Rate:"), hbox, TRUE, TRUE, 0); 561,562c566,567 < titles[0] = "Thread"; < titles[1] = "Period"; --- > titles[0] = _("Thread"); > titles[1] = _("Period"); 622c627 < gtk_label_new_in_box("Multiplier:", hbox, FALSE, FALSE, 0); --- > gtk_label_new_in_box(_("Multiplier:"), hbox, FALSE, FALSE, 0); 639c644 < gtk_label_new_in_box("Record Length", --- > gtk_label_new_in_box(_("Record Length"), 645c650 < snprintf(buf, BUFLEN, "%5d samples (1 channel)", ctrl_shm->buf_len); --- > snprintf(buf, BUFLEN, _("%5d samples (1 channel)"), ctrl_shm->buf_len); 648c653 < snprintf(buf, BUFLEN, "%5d samples (2 channels)", ctrl_shm->buf_len / 2); --- > snprintf(buf, BUFLEN, _("%5d samples (2 channels)"), ctrl_shm->buf_len / 2); 652c657 < snprintf(buf, BUFLEN, "%5d samples (4 channels)", ctrl_shm->buf_len / 4); --- > snprintf(buf, BUFLEN, _("%5d samples (4 channels)"), ctrl_shm->buf_len / 4); 656c661 < snprintf(buf, BUFLEN, "%5d samples (8 channels)", ctrl_shm->buf_len / 8); --- > snprintf(buf, BUFLEN, _("%5d samples (8 channels)"), ctrl_shm->buf_len / 8); 660c665 < snprintf(buf, BUFLEN, "%5d samples (16 channels)", --- > snprintf(buf, BUFLEN, _("%5d samples (16 channels)"), 720c725 < button = gtk_button_new_with_label("Quit"); --- > button = gtk_button_new_with_label(_("Quit")); 1061c1066 < snprintf(scale, BUFLEN, "%s\nper div", tmp); --- > snprintf(scale, BUFLEN, _("%s\nper div"), tmp); 1076c1081 < snprintf(msg, BUFLEN, "%s samples\nat %s", rec_len, rate); --- > snprintf(msg, BUFLEN, _("%s samples\nat %s"), rec_len, rate); Index: utils/scope_trig.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope_trig.c,v retrieving revision 1.13 diff -r1.13 scope_trig.c 36a37,41 > #include "config.h" > #include > #include > #define _(x) gettext(x) > 112c117 < snprintf(buf, BUFLEN, "Falling"); --- > snprintf(buf, BUFLEN, _("Falling")); 114c119 < snprintf(buf, BUFLEN, "Rising"); --- > snprintf(buf, BUFLEN, _("Rising")); 121c126 < gtk_label_set_text_if(trig->source_label, "Source\nNone"); --- > gtk_label_set_text_if(trig->source_label, _("Source\nNone")); 126c131 < snprintf(buf, BUFLEN, "Source\nChan %2d", ctrl_shm->trig_chan); --- > snprintf(buf, BUFLEN, _("Source\nChan %2d"), ctrl_shm->trig_chan); 201c206 < (GTK_RADIO_BUTTON(trig->normal_button)), "Auto"); --- > (GTK_RADIO_BUTTON(trig->normal_button)), _("Auto")); 203c208 < trig->force_button = gtk_button_new_with_label("Force"); --- > trig->force_button = gtk_button_new_with_label(_("Force")); 237c242 < gtk_label_new_in_box("Level", vbox, FALSE, FALSE, 0); --- > gtk_label_new_in_box(_("Level"), vbox, FALSE, FALSE, 0); 254c259 < gtk_label_new_in_box("Pos", vbox, FALSE, FALSE, 0); --- > gtk_label_new_in_box(_("Pos"), vbox, FALSE, FALSE, 0); 271c276 < 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); 277c282 < trig->edge_button = gtk_button_new_with_label("Rising"); --- > trig->edge_button = gtk_button_new_with_label(_("Rising")); 285c290 < trig->source_button = gtk_button_new_with_label("Source\nNone"); --- > trig->source_button = gtk_button_new_with_label(_("Source\nNone")); 309,310c314,315 < title = "Trigger Source"; < msg = "Select a channel to use for triggering."; --- > title = _("Trigger Source"); > msg = _("Select a channel to use for triggering."); 333,334c338,339 < titles[0] = "Chan"; < titles[1] = "Source"; --- > titles[0] = _("Chan"); > titles[1] = _("Source"); 373c378 < button = gtk_button_new_with_label("Cancel"); --- > button = gtk_button_new_with_label(_("Cancel")); Index: utils/scope_vert.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/scope_vert.c,v retrieving revision 1.30 diff -r1.30 scope_vert.c 37a38,42 > #include "config.h" > #include > #include > #define _(x) gettext(x) > 404c409 < snprintf(buf2, BUFLEN, "Offset\n%s", buf1); --- > snprintf(buf2, BUFLEN, _("Offset\n%s"), buf1); 615c620 < gtk_label_new_in_box("Gain", vbox, FALSE, FALSE, 0); --- > gtk_label_new_in_box(_("Gain"), vbox, FALSE, FALSE, 0); 627c632 < gtk_label_new_in_box("Pos", vbox, FALSE, FALSE, 0); --- > gtk_label_new_in_box(_("Pos"), vbox, FALSE, FALSE, 0); 641c646 < 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); 654c659 < button = gtk_button_new_with_label("Chan Off"); --- > button = gtk_button_new_with_label(_("Chan Off")); 710,712c715,717 < 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); 731c736 < vert->offset_ac = gtk_check_button_new_with_label("AC Coupled"); --- > vert->offset_ac = gtk_check_button_new_with_label(_("AC Coupled")); 766c771 < button = gtk_button_new_with_label("Cancel"); --- > button = gtk_button_new_with_label(_("Cancel")); 1023,1025c1028,1030 < 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); 1056,1058c1061,1063 < 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"); 1168c1173 < button = gtk_button_new_with_label("Cancel"); --- > button = gtk_button_new_with_label(_("Cancel")); 1255c1260 < snprintf(buf2, BUFLEN, "Offset\n%s", buf1); --- > snprintf(buf2, BUFLEN, _("Offset\n%s"), buf1);