Download as
Browse Code »

Commit 1108431d2428182eb7329c1e98cc2ba227965f91

Authored by Perry Werneck
1 parent cfbfcf97
Exists in master and in 1 other branch develop

libv3270 now uses his own translation domain.

Showing 27 changed files with 58 additions and 67 deletions   Show diff stats
src/dialogs/colorscheme.c
  Diff comments   View file @1108431
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 #include <internals.h> 30 #include <internals.h>
31 31
32 #include <libintl.h> 32 #include <libintl.h>
33 - #include <glib/gi18n.h>  
34 33
35 #include <v3270.h> 34 #include <v3270.h>
36 #include <lib3270/log.h> 35 #include <lib3270/log.h>
src/dialogs/print/settings.c
  Diff comments   View file @1108431
@@ -92,7 +92,7 @@ static void V3270PrintSettings_init(V3270PrintSettings *widget) @@ -92,7 +92,7 @@ static void V3270PrintSettings_init(V3270PrintSettings *widget)
92 92
93 for(f=0;f<G_N_ELEMENTS(text);f++) 93 for(f=0;f<G_N_ELEMENTS(text);f++)
94 { 94 {
95 - GtkWidget *label = gtk_label_new_with_mnemonic(gettext(text[f])); 95 + GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,text[f]));
96 gtk_widget_set_halign(label,GTK_ALIGN_START); 96 gtk_widget_set_halign(label,GTK_ALIGN_START);
97 gtk_grid_attach(GTK_GRID(widget),label,0,f,1,1); 97 gtk_grid_attach(GTK_GRID(widget),label,0,f,1,1);
98 } 98 }
src/dialogs/save/private.h
  Diff comments   View file @1108431
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 #include <internals.h> 30 #include <internals.h>
31 31
32 #include <libintl.h> 32 #include <libintl.h>
33 - #include <glib/gi18n.h>  
34 #include <gtk/gtk.h> 33 #include <gtk/gtk.h>
35 #include <lib3270.h> 34 #include <lib3270.h>
36 #include <v3270.h> 35 #include <v3270.h>
src/dialogs/save/save.c
  Diff comments   View file @1108431
@@ -239,7 +239,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_ @@ -239,7 +239,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
239 GTK_COMBO_BOX_TEXT(dialog->format), 239 GTK_COMBO_BOX_TEXT(dialog->format),
240 ix, 240 ix,
241 formats[ix].extension, 241 formats[ix].extension,
242 - gettext(formats[ix].name) 242 + g_dgettext(PACKAGE_NAME,formats[ix].name)
243 ); 243 );
244 } 244 }
245 245
@@ -315,7 +315,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_ @@ -315,7 +315,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
315 315
316 if( (size_t) mode < G_N_ELEMENTS(titles)) 316 if( (size_t) mode < G_N_ELEMENTS(titles))
317 { 317 {
318 - gtk_window_set_title(GTK_WINDOW(dialog),gettext(titles[(size_t) mode])); 318 + gtk_window_set_title(GTK_WINDOW(dialog),g_dgettext(PACKAGE_NAME,titles[(size_t) mode]));
319 } 319 }
320 320
321 if(filename) 321 if(filename)
src/dialogs/security.c
  Diff comments   View file @1108431
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 34
35 #include <gtk/gtk.h> 35 #include <gtk/gtk.h>
36 #include <libintl.h> 36 #include <libintl.h>
37 - #include <glib/gi18n.h> 37 + #include <glib/gi18n-lib.h>
38 #include <internals.h> 38 #include <internals.h>
39 39
40 #include <v3270.h> 40 #include <v3270.h>
src/dialogs/settings/accelerator.c
  Diff comments   View file @1108431
@@ -237,6 +237,8 @@ LIB3270_EXPORT GtkWidget * v3270_accelerator_settings_new() @@ -237,6 +237,8 @@ LIB3270_EXPORT GtkWidget * v3270_accelerator_settings_new()
237 settings->title = _("Keyboard accelerators"); 237 settings->title = _("Keyboard accelerators");
238 settings->label = _("Accelerators"); 238 settings->label = _("Accelerators");
239 239
  240 + debug("*********** [%s] [%s] [%s]",settings->title,gettext(settings->title),g_dgettext(GETTEXT_PACKAGE,settings->title));
  241 +
240 return GTK_WIDGET(settings); 242 return GTK_WIDGET(settings);
241 } 243 }
242 244
src/dialogs/settings/colors.c
  Diff comments   View file @1108431
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
32 * 32 *
33 */ 33 */
34 34
35 -// #include "private.h"  
36 #include <internals.h> 35 #include <internals.h>
37 #include <lib3270.h> 36 #include <lib3270.h>
38 #include <v3270/colorscheme.h> 37 #include <v3270/colorscheme.h>
@@ -196,7 +195,7 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal) @@ -196,7 +195,7 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal)
196 int f; 195 int f;
197 196
198 gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&parent,NULL); 197 gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&parent,NULL);
199 - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, gettext(node[title++].text), 1, V3270_COLOR_COUNT, -1); 198 + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(PACKAGE_NAME,node[title++].text), 1, V3270_COLOR_COUNT, -1);
200 199
201 for(f=0;f<V3270_COLOR_COUNT;f++) 200 for(f=0;f<V3270_COLOR_COUNT;f++)
202 { 201 {
@@ -205,10 +204,10 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal) @@ -205,10 +204,10 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal)
205 if(f == node[title].id) 204 if(f == node[title].id)
206 { 205 {
207 gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&parent,NULL); 206 gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&parent,NULL);
208 - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, gettext(node[title++].text), 1, V3270_COLOR_COUNT, -1); 207 + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(PACKAGE_NAME,node[title++].text), 1, V3270_COLOR_COUNT, -1);
209 } 208 }
210 gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&iter,&parent); 209 gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&iter,&parent);
211 - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, gettext(color_name[f]), 1, f, -1); 210 + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, g_dgettext(PACKAGE_NAME,color_name[f]), 1, f, -1);
212 } 211 }
213 212
214 gtk_tree_view_expand_all(GTK_TREE_VIEW(widget->colors.view)); 213 gtk_tree_view_expand_all(GTK_TREE_VIEW(widget->colors.view));
src/dialogs/settings/host.c
  Diff comments   View file @1108431
@@ -553,7 +553,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) @@ -553,7 +553,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget)
553 { 553 {
554 GtkTreeIter iter; 554 GtkTreeIter iter;
555 gtk_list_store_append((GtkListStore *) model, &iter); 555 gtk_list_store_append((GtkListStore *) model, &iter);
556 - gtk_list_store_set((GtkListStore *) model, &iter, 0, gettext(combos[combo].labels[item]), 1, combos[combo].values[item], -1); 556 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME, combos[combo].labels[item]), 1, combos[combo].values[item], -1);
557 } 557 }
558 558
559 v3270_grid_attach(GTK_GRID(emulation), (struct v3270_entry_field *) & combos[combo], GTK_WIDGET(widget->input.combos[combo])); 559 v3270_grid_attach(GTK_GRID(emulation), (struct v3270_entry_field *) & combos[combo], GTK_WIDGET(widget->input.combos[combo]));
src/dialogs/tools.c
  Diff comments   View file @1108431
@@ -163,7 +163,7 @@ @@ -163,7 +163,7 @@
163 GTK_COMBO_BOX_TEXT(widget), 163 GTK_COMBO_BOX_TEXT(widget),
164 ix+1, 164 ix+1,
165 charsets[ix].name, 165 charsets[ix].name,
166 - gettext(charsets[ix].description) 166 + g_dgettext(PACKAGE_NAME,charsets[ix].description)
167 ); 167 );
168 } 168 }
169 } 169 }
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 174
175 void v3270_grid_attach(GtkGrid *grid, const struct v3270_entry_field * description, GtkWidget *widget) 175 void v3270_grid_attach(GtkGrid *grid, const struct v3270_entry_field * description, GtkWidget *widget)
176 { 176 {
177 - GtkWidget *label = gtk_label_new_with_mnemonic(gettext(description->label)); 177 + GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,description->label));
178 gtk_label_set_mnemonic_widget(GTK_LABEL(label),widget); 178 gtk_label_set_mnemonic_widget(GTK_LABEL(label),widget);
179 179
180 gtk_widget_set_halign(label,GTK_ALIGN_END); 180 gtk_widget_set_halign(label,GTK_ALIGN_END);
@@ -182,7 +182,7 @@ @@ -182,7 +182,7 @@
182 gtk_grid_attach(grid,widget,description->left+1,description->top,description->width,description->height); 182 gtk_grid_attach(grid,widget,description->left+1,description->top,description->width,description->height);
183 183
184 if(description->tooltip) 184 if(description->tooltip)
185 - gtk_widget_set_tooltip_markup(widget,gettext(description->tooltip)); 185 + gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,description->tooltip));
186 186
187 } 187 }
188 188
src/dialogs/transfer.c
  Diff comments   View file @1108431
@@ -28,14 +28,10 @@ @@ -28,14 +28,10 @@
28 */ 28 */
29 29
30 #include <config.h> 30 #include <config.h>
31 -  
32 - #define ENABLE_NLS  
33 - #define GETTEXT_PACKAGE PACKAGE_NAME 31 + #include <internals.h>
34 32
35 #include <gtk/gtk.h> 33 #include <gtk/gtk.h>
36 #include <libintl.h> 34 #include <libintl.h>
37 - #include <glib/gi18n.h>  
38 - #include <internals.h>  
39 35
40 #include <v3270.h> 36 #include <v3270.h>
41 #include <v3270/filetransfer.h> 37 #include <v3270/filetransfer.h>
src/filetransfer/private.h
  Diff comments   View file @1108431
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 #define GETTEXT_PACKAGE PACKAGE_NAME 38 #define GETTEXT_PACKAGE PACKAGE_NAME
39 39
40 #include <libintl.h> 40 #include <libintl.h>
41 - #include <glib/gi18n.h> 41 + #include <glib/gi18n-lib.h>
42 42
43 #include <v3270/filetransfer.h> 43 #include <v3270/filetransfer.h>
44 #include <v3270/ftprogress.h> 44 #include <v3270/ftprogress.h>
src/filetransfer/settings.c
  Diff comments   View file @1108431
@@ -178,7 +178,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) { @@ -178,7 +178,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) {
178 178
179 GtkWidget * create_spin_button(V3270FTSettings *widget, GtkWidget *grid, size_t row, LIB3270_FT_VALUE id) 179 GtkWidget * create_spin_button(V3270FTSettings *widget, GtkWidget *grid, size_t row, LIB3270_FT_VALUE id)
180 { 180 {
181 - GtkWidget * label = gtk_label_new_with_mnemonic(gettext(ft_value[id].label)); 181 + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_value[id].label));
182 gtk_widget_set_halign(label,GTK_ALIGN_END); 182 gtk_widget_set_halign(label,GTK_ALIGN_END);
183 183
184 gtk_grid_attach(GTK_GRID(grid),label,0,row,1,1); 184 gtk_grid_attach(GTK_GRID(grid),label,0,row,1,1);
@@ -187,8 +187,8 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) { @@ -187,8 +187,8 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) {
187 // g_signal_connect(G_OBJECT(button),"value-changed",G_CALLBACK(spin_changed),dialog); 187 // g_signal_connect(G_OBJECT(button),"value-changed",G_CALLBACK(spin_changed),dialog);
188 g_signal_connect(G_OBJECT(button),"output",G_CALLBACK(spin_format),widget); 188 g_signal_connect(G_OBJECT(button),"output",G_CALLBACK(spin_format),widget);
189 189
190 - gtk_widget_set_tooltip_markup(button,gettext(ft_value[id].tooltip));  
191 - gtk_widget_set_tooltip_markup(label,gettext(ft_value[id].tooltip)); 190 + gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,ft_value[id].tooltip));
  191 + gtk_widget_set_tooltip_markup(label,g_dgettext(PACKAGE_NAME,ft_value[id].tooltip));
192 192
193 gtk_label_set_mnemonic_widget(GTK_LABEL(label),button); 193 gtk_label_set_mnemonic_widget(GTK_LABEL(label),button);
194 194
@@ -452,7 +452,7 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP @@ -452,7 +452,7 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
452 { 452 {
453 GtkTreeIter iter; 453 GtkTreeIter iter;
454 gtk_list_store_append((GtkListStore *) model,&iter); 454 gtk_list_store_append((GtkListStore *) model,&iter);
455 - gtk_list_store_set((GtkListStore *) model, &iter, 0, gettext(ft_type[ix].label), -1); 455 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME,ft_type[ix].label), -1);
456 } 456 }
457 457
458 458
@@ -499,8 +499,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP @@ -499,8 +499,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
499 499
500 for(ix=0;ix<4;ix++) 500 for(ix=0;ix<4;ix++)
501 { 501 {
502 - widget->options[ix] = gtk_check_button_new_with_mnemonic(gettext(ft_option[ix].label));  
503 - gtk_widget_set_tooltip_markup(widget->options[ix],gettext(ft_option[ix].tooltip)); 502 + widget->options[ix] = gtk_check_button_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_option[ix].label));
  503 + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip));
504 // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget); 504 // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget);
505 gtk_box_pack_start(GTK_BOX(box),widget->options[ix],FALSE,TRUE,0); 505 gtk_box_pack_start(GTK_BOX(box),widget->options[ix],FALSE,TRUE,0);
506 } 506 }
@@ -526,10 +526,9 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP @@ -526,10 +526,9 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
526 526
527 for(ix=4;ix<8;ix++) 527 for(ix=4;ix<8;ix++)
528 { 528 {
529 - widget->options[ix] = gtk_radio_button_new_with_label(group,gettext(ft_option[ix].label));  
530 - gtk_widget_set_tooltip_markup(widget->options[ix],gettext(ft_option[ix].tooltip)); 529 + widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label));
  530 + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip));
531 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix])); 531 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix]));
532 - // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget);  
533 gtk_box_pack_start(GTK_BOX(widget->recordFormatBox),widget->options[ix],FALSE,TRUE,0); 532 gtk_box_pack_start(GTK_BOX(widget->recordFormatBox),widget->options[ix],FALSE,TRUE,0);
534 533
535 } 534 }
@@ -552,10 +551,9 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP @@ -552,10 +551,9 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
552 551
553 for(ix=8;ix<12;ix++) 552 for(ix=8;ix<12;ix++)
554 { 553 {
555 - widget->options[ix] = gtk_radio_button_new_with_label(group,gettext(ft_option[ix].label));  
556 - gtk_widget_set_tooltip_markup(widget->options[ix],gettext(ft_option[ix].tooltip)); 554 + widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label));
  555 + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip));
557 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix])); 556 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix]));
558 - // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget);  
559 gtk_box_pack_start(GTK_BOX(widget->spaceAllocationBox),widget->options[ix],FALSE,TRUE,0); 557 gtk_box_pack_start(GTK_BOX(widget->spaceAllocationBox),widget->options[ix],FALSE,TRUE,0);
560 558
561 } 559 }
src/filetransfer/v3270ft.c
  Diff comments   View file @1108431
@@ -482,7 +482,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -482,7 +482,7 @@ static void v3270ft_init(v3270ft *dialog) {
482 482
483 GtkWidget *button = gtk_button_new_from_icon_name(action[f].name,GTK_ICON_SIZE_BUTTON); 483 GtkWidget *button = gtk_button_new_from_icon_name(action[f].name,GTK_ICON_SIZE_BUTTON);
484 484
485 - gtk_widget_set_tooltip_markup(button,gettext(action[f].tooltip)); 485 + gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,action[f].tooltip));
486 486
487 if(action[f].start) { 487 if(action[f].start) {
488 gtk_header_bar_pack_start(GTK_HEADER_BAR(widget),button); 488 gtk_header_bar_pack_start(GTK_HEADER_BAR(widget),button);
@@ -508,7 +508,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -508,7 +508,7 @@ static void v3270ft_init(v3270ft *dialog) {
508 508
509 GtkWidget *button = GTK_WIDGET(gtk_tool_button_new(gtk_image_new_from_icon_name(action[f].name,GTK_ICON_SIZE_SMALL_TOOLBAR),NULL)); 509 GtkWidget *button = GTK_WIDGET(gtk_tool_button_new(gtk_image_new_from_icon_name(action[f].name,GTK_ICON_SIZE_SMALL_TOOLBAR),NULL));
510 510
511 - gtk_widget_set_tooltip_markup(button,gettext(action[f].tooltip)); 511 + gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,action[f].tooltip));
512 512
513 gtk_toolbar_insert(GTK_TOOLBAR(widget),GTK_TOOL_ITEM(button),-1); 513 gtk_toolbar_insert(GTK_TOOLBAR(widget),GTK_TOOL_ITEM(button),-1);
514 514
@@ -547,7 +547,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -547,7 +547,7 @@ static void v3270ft_init(v3270ft *dialog) {
547 GtkTreeIter iter; 547 GtkTreeIter iter;
548 548
549 gtk_list_store_append((GtkListStore *) model,&iter); 549 gtk_list_store_append((GtkListStore *) model,&iter);
550 - gtk_list_store_set((GtkListStore *) model, &iter, 0, gettext(ft_type[f].label),-1); 550 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME,ft_type[f].label),-1);
551 551
552 if(!f) { 552 if(!f) {
553 gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter); 553 gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
@@ -590,7 +590,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -590,7 +590,7 @@ static void v3270ft_init(v3270ft *dialog) {
590 gtk_grid_attach(grid,GTK_WIDGET(dialog->remote),1,2,1,1); 590 gtk_grid_attach(grid,GTK_WIDGET(dialog->remote),1,2,1,1);
591 591
592 for(f=0;f< (int) G_N_ELEMENTS(label);f++) { 592 for(f=0;f< (int) G_N_ELEMENTS(label);f++) {
593 - GtkWidget * widget = gtk_label_new_with_mnemonic(gettext(label[f])); 593 + GtkWidget * widget = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,label[f]));
594 gtk_widget_set_halign(widget,GTK_ALIGN_END); 594 gtk_widget_set_halign(widget,GTK_ALIGN_END);
595 gtk_widget_set_valign(widget,GTK_ALIGN_CENTER); 595 gtk_widget_set_valign(widget,GTK_ALIGN_CENTER);
596 gtk_grid_attach(grid,GTK_WIDGET(widget),0,f,1,1); 596 gtk_grid_attach(grid,GTK_WIDGET(widget),0,f,1,1);
@@ -598,7 +598,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -598,7 +598,7 @@ static void v3270ft_init(v3270ft *dialog) {
598 } 598 }
599 599
600 // Transfer options 600 // Transfer options
601 - widget = gtk_frame_new(gettext(frame[0])); 601 + widget = gtk_frame_new(g_dgettext(PACKAGE_NAME,frame[0]));
602 g_object_set(G_OBJECT(widget),"margin-top",18,NULL); 602 g_object_set(G_OBJECT(widget),"margin-top",18,NULL);
603 603
604 grid = v3270ft_new_grid(); 604 grid = v3270ft_new_grid();
@@ -609,8 +609,8 @@ static void v3270ft_init(v3270ft *dialog) { @@ -609,8 +609,8 @@ static void v3270ft_init(v3270ft *dialog) {
609 609
610 for(f=0;f<4;f++) { 610 for(f=0;f<4;f++) {
611 611
612 - dialog->opt[f] = widget = gtk_check_button_new_with_mnemonic(gettext(ft_option[f].label));  
613 - gtk_widget_set_tooltip_markup(widget,gettext(ft_option[f].tooltip)); 612 + dialog->opt[f] = widget = gtk_check_button_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_option[f].label));
  613 + gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_option[f].tooltip));
614 gtk_grid_attach(grid,widget,f&1,f/2,1,1); 614 gtk_grid_attach(grid,widget,f&1,f/2,1,1);
615 g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog); 615 g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog);
616 616
@@ -629,7 +629,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -629,7 +629,7 @@ static void v3270ft_init(v3270ft *dialog) {
629 GSList * group = NULL; 629 GSList * group = NULL;
630 630
631 gtk_container_set_border_width(GTK_CONTAINER(box),6); 631 gtk_container_set_border_width(GTK_CONTAINER(box),6);
632 - dialog->radio[f] = gtk_frame_new(gettext(frame[f+1])); 632 + dialog->radio[f] = gtk_frame_new(g_dgettext(PACKAGE_NAME,frame[f+1]));
633 633
634 gtk_container_add(GTK_CONTAINER(dialog->radio[f]),GTK_WIDGET(box)); 634 gtk_container_add(GTK_CONTAINER(dialog->radio[f]),GTK_WIDGET(box));
635 gtk_container_add(GTK_CONTAINER(grid),dialog->radio[f]); 635 gtk_container_add(GTK_CONTAINER(grid),dialog->radio[f]);
@@ -638,10 +638,10 @@ static void v3270ft_init(v3270ft *dialog) { @@ -638,10 +638,10 @@ static void v3270ft_init(v3270ft *dialog) {
638 638
639 int ix = ((f+1)*4)+i; 639 int ix = ((f+1)*4)+i;
640 640
641 - dialog->opt[ix] = widget = gtk_radio_button_new_with_label(group,gettext(ft_option[ix].label)); 641 + dialog->opt[ix] = widget = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label));
642 642
643 g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog); 643 g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog);
644 - gtk_widget_set_tooltip_markup(widget,gettext(ft_option[ix].tooltip)); 644 + gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip));
645 gtk_box_pack_start(box,widget,FALSE,FALSE,2); 645 gtk_box_pack_start(box,widget,FALSE,FALSE,2);
646 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget)); 646 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget));
647 647
@@ -657,7 +657,7 @@ static void v3270ft_init(v3270ft *dialog) { @@ -657,7 +657,7 @@ static void v3270ft_init(v3270ft *dialog) {
657 657
658 for(f=0;f < LIB3270_FT_VALUE_COUNT;f++) { 658 for(f=0;f < LIB3270_FT_VALUE_COUNT;f++) {
659 659
660 - GtkWidget * label = gtk_label_new_with_mnemonic(gettext(ft_value[f].label)); 660 + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_value[f].label));
661 gtk_widget_set_halign(label,GTK_ALIGN_END); 661 gtk_widget_set_halign(label,GTK_ALIGN_END);
662 gtk_widget_set_valign(label,GTK_ALIGN_CENTER); 662 gtk_widget_set_valign(label,GTK_ALIGN_CENTER);
663 663
@@ -665,8 +665,8 @@ static void v3270ft_init(v3270ft *dialog) { @@ -665,8 +665,8 @@ static void v3270ft_init(v3270ft *dialog) {
665 g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(spin_changed),dialog); 665 g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(spin_changed),dialog);
666 g_signal_connect(G_OBJECT(widget),"output",G_CALLBACK(spin_format),dialog); 666 g_signal_connect(G_OBJECT(widget),"output",G_CALLBACK(spin_format),dialog);
667 667
668 - gtk_widget_set_tooltip_markup(widget,gettext(ft_value[f].tooltip));  
669 - gtk_widget_set_tooltip_markup(label,gettext(ft_value[f].tooltip)); 668 + gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_value[f].tooltip));
  669 + gtk_widget_set_tooltip_markup(label,g_dgettext(PACKAGE_NAME,ft_value[f].tooltip));
670 670
671 gtk_label_set_mnemonic_widget(GTK_LABEL(label),widget); 671 gtk_label_set_mnemonic_widget(GTK_LABEL(label),widget);
672 672
src/filetransfer/v3270ftprogress.c
  Diff comments   View file @1108431
@@ -352,7 +352,7 @@ static GtkWidget * create_text(guint width) { @@ -352,7 +352,7 @@ static GtkWidget * create_text(guint width) {
352 352
353 static GtkWidget * create_label(int id, GtkWidget *entry) { 353 static GtkWidget * create_label(int id, GtkWidget *entry) {
354 354
355 - GtkWidget * widget = gtk_label_new(gettext(v3270_ft_worker_fields[id].label)); 355 + GtkWidget * widget = gtk_label_new(g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[id].label));
356 356
357 gtk_widget_set_tooltip_markup(widget,v3270_ft_worker_fields[id].tooltip); 357 gtk_widget_set_tooltip_markup(widget,v3270_ft_worker_fields[id].tooltip);
358 gtk_widget_set_tooltip_markup(entry,v3270_ft_worker_fields[id].tooltip); 358 gtk_widget_set_tooltip_markup(entry,v3270_ft_worker_fields[id].tooltip);
@@ -645,7 +645,7 @@ static void ft_complete(H3270 *hSession, unsigned long length,double kbytes_sec, @@ -645,7 +645,7 @@ static void ft_complete(H3270 *hSession, unsigned long length,double kbytes_sec,
645 while(*text && g_ascii_isspace(*text)) 645 while(*text && g_ascii_isspace(*text))
646 text++; 646 text++;
647 647
648 - delay_signal(hSession, ftmsg[f].failed ? V3270FTPROGRESS_SIGNAL_FAILED : V3270FTPROGRESS_SIGNAL_SUCCESS, text, gettext(ftmsg[f].text)); 648 + delay_signal(hSession, ftmsg[f].failed ? V3270FTPROGRESS_SIGNAL_FAILED : V3270FTPROGRESS_SIGNAL_SUCCESS, text, g_dgettext(PACKAGE_NAME,ftmsg[f].text));
649 649
650 return; 650 return;
651 651
src/filetransfer/worker.c
  Diff comments   View file @1108431
@@ -209,7 +209,7 @@ @@ -209,7 +209,7 @@
209 209
210 static void create_field(V3270FTWorker *widget, PROGRESS_FIELD id, GtkWidget *grid, gint top) 210 static void create_field(V3270FTWorker *widget, PROGRESS_FIELD id, GtkWidget *grid, gint top)
211 { 211 {
212 - GtkWidget * label = gtk_label_new(gettext(v3270_ft_worker_fields[id].label)); 212 + GtkWidget * label = gtk_label_new(g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[id].label));
213 gtk_widget_set_halign(GTK_WIDGET(label),GTK_ALIGN_END); 213 gtk_widget_set_halign(GTK_WIDGET(label),GTK_ALIGN_END);
214 gtk_grid_attach(GTK_GRID(grid),label,0,top,1,1); 214 gtk_grid_attach(GTK_GRID(grid),label,0,top,1,1);
215 215
@@ -229,8 +229,8 @@ @@ -229,8 +229,8 @@
229 gtk_grid_set_row_spacing(GTK_GRID(widget),6); 229 gtk_grid_set_row_spacing(GTK_GRID(widget),6);
230 gtk_grid_set_column_spacing(GTK_GRID(widget),12); 230 gtk_grid_set_column_spacing(GTK_GRID(widget),12);
231 231
232 - widget->field[PROGRESS_FIELD_LOCAL] = GTK_ENTRY(create_entry(widget,gettext(v3270_ft_worker_fields[PROGRESS_FIELD_LOCAL].label),gtk_entry_new(),0,0,9));  
233 - widget->field[PROGRESS_FIELD_REMOTE] = GTK_ENTRY(create_entry(widget,gettext(v3270_ft_worker_fields[PROGRESS_FIELD_REMOTE].label),gtk_entry_new(),0,1,9)); 232 + widget->field[PROGRESS_FIELD_LOCAL] = GTK_ENTRY(create_entry(widget,g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[PROGRESS_FIELD_LOCAL].label),gtk_entry_new(),0,0,9));
  233 + widget->field[PROGRESS_FIELD_REMOTE] = GTK_ENTRY(create_entry(widget,g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[PROGRESS_FIELD_REMOTE].label),gtk_entry_new(),0,1,9));
234 234
235 // Create status elements 235 // Create status elements
236 GtkWidget * views = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6); 236 GtkWidget * views = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6);
@@ -591,12 +591,12 @@ static gboolean do_timer(V3270FTWorker *worker) { @@ -591,12 +591,12 @@ static gboolean do_timer(V3270FTWorker *worker) {
591 if(!message) 591 if(!message)
592 message = N_("Can't start file transfer session"); 592 message = N_("Can't start file transfer session");
593 593
594 - gtk_progress_bar_set_text(worker->pbar,gettext(message)); 594 + gtk_progress_bar_set_text(worker->pbar,g_dgettext(PACKAGE_NAME,message));
595 595
596 pulse_stop(worker); 596 pulse_stop(worker);
597 597
598 // Emit "transfer failed" 598 // Emit "transfer failed"
599 - g_signal_emit(GTK_WIDGET(widget),v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL], 0, gettext(message), NULL); 599 + g_signal_emit(GTK_WIDGET(widget),v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL], 0, g_dgettext(PACKAGE_NAME,message), NULL);
600 600
601 // Emit "no transfer" 601 // Emit "no transfer"
602 ft_state_changed(worker->hSession, LIB3270_FT_STATE_NONE, _("No transfer in progress"), widget); 602 ft_state_changed(worker->hSession, LIB3270_FT_STATE_NONE, _("No transfer in progress"), widget);
src/include/hostselect.h
  Diff comments   View file @1108431
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 #endif 39 #endif
40 40
41 #include <libintl.h> 41 #include <libintl.h>
42 - #include <glib/gi18n.h> 42 + #include <glib/gi18n-lib.h>
43 #include <gtk/gtk.h> 43 #include <gtk/gtk.h>
44 #include <lib3270.h> 44 #include <lib3270.h>
45 45
src/include/internals.h
  Diff comments   View file @1108431
@@ -37,7 +37,8 @@ @@ -37,7 +37,8 @@
37 #define GETTEXT_PACKAGE PACKAGE_NAME 37 #define GETTEXT_PACKAGE PACKAGE_NAME
38 38
39 #include <glib.h> 39 #include <glib.h>
40 - #include <glib/gi18n.h> 40 + #include <glib/gi18n-lib.h>
  41 +
41 #include <gtk/gtk.h> 42 #include <gtk/gtk.h>
42 #include <lib3270.h> 43 #include <lib3270.h>
43 #include <lib3270/log.h> 44 #include <lib3270/log.h>
src/include/v3270/filetransfer.h
  Diff comments   View file @1108431
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
32 32
33 #define V3270FT_H_INCLUDED 1 33 #define V3270FT_H_INCLUDED 1
34 34
35 - #include <glib/gi18n.h>  
36 #include <gtk/gtk.h> 35 #include <gtk/gtk.h>
37 #include <lib3270.h> 36 #include <lib3270.h>
38 #include <lib3270/filetransfer.h> 37 #include <lib3270/filetransfer.h>
src/include/v3270/ftprogress.h
  Diff comments   View file @1108431
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
32 32
33 #define V3270FTPROGRESS_H_INCLUDED 33 #define V3270FTPROGRESS_H_INCLUDED
34 34
35 - #include <glib/gi18n.h>  
36 #include <gtk/gtk.h> 35 #include <gtk/gtk.h>
37 36
38 G_BEGIN_DECLS 37 G_BEGIN_DECLS
src/terminal/accessible.c
  Diff comments   View file @1108431
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 34
35 #include <gtk/gtk.h> 35 #include <gtk/gtk.h>
36 #include <libintl.h> 36 #include <libintl.h>
37 - #include <glib/gi18n.h> 37 + #include <glib/gi18n-lib.h>
38 38
39 #include <lib3270.h> 39 #include <lib3270.h>
40 #include <lib3270/log.h> 40 #include <lib3270/log.h>
src/terminal/actions/action.c
  Diff comments   View file @1108431
@@ -392,7 +392,7 @@ @@ -392,7 +392,7 @@
392 const gchar * domainname = ((V3270Action *) action)->translation_domain ? ((V3270Action *) action)->translation_domain : G_STRINGIFY(PRODUCT_NAME); 392 const gchar * domainname = ((V3270Action *) action)->translation_domain ? ((V3270Action *) action)->translation_domain : G_STRINGIFY(PRODUCT_NAME);
393 393
394 if (msgid && *msgid) 394 if (msgid && *msgid)
395 - return (const gchar*) g_dgettext (domainname, msgid); 395 + return (const gchar*) g_dgettext(domainname, msgid);
396 396
397 return msgid; 397 return msgid;
398 398
src/terminal/callbacks.c
  Diff comments   View file @1108431
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 39
40 #include <gtk/gtk.h> 40 #include <gtk/gtk.h>
41 #include <libintl.h> 41 #include <libintl.h>
42 - #include <glib/gi18n.h>  
43 42
44 #include <lib3270.h> 43 #include <lib3270.h>
45 #include <lib3270/session.h> 44 #include <lib3270/session.h>
src/terminal/drawing/oia.c
  Diff comments   View file @1108431
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 39
40 #include <gtk/gtk.h> 40 #include <gtk/gtk.h>
41 #include <libintl.h> 41 #include <libintl.h>
42 - #include <glib/gi18n.h> 42 + #include <glib/gi18n-lib.h>
43 43
44 #include <lib3270.h> 44 #include <lib3270.h>
45 #include <lib3270/session.h> 45 #include <lib3270/session.h>
@@ -489,7 +489,7 @@ static void draw_status_message(cairo_t *cr, LIB3270_MESSAGE id, v3270FontInfo * @@ -489,7 +489,7 @@ static void draw_status_message(cairo_t *cr, LIB3270_MESSAGE id, v3270FontInfo *
489 489
490 if(msg && *msg) 490 if(msg && *msg)
491 { 491 {
492 - msg = gettext(msg); 492 + msg = g_dgettext(PACKAGE_NAME,msg);
493 } 493 }
494 494
495 if(msg && *msg) 495 if(msg && *msg)
src/terminal/keyboard/accelerator.c
  Diff comments   View file @1108431
@@ -167,10 +167,10 @@ @@ -167,10 +167,10 @@
167 case V3270_ACCELERATOR_TYPE_INTERNAL: 167 case V3270_ACCELERATOR_TYPE_INTERNAL:
168 168
169 if( ((V3270_ACTION *) accel->arg)->summary ) 169 if( ((V3270_ACTION *) accel->arg)->summary )
170 - return gettext(((V3270_ACTION *) accel->arg)->summary); 170 + return g_dgettext(PACKAGE_NAME,((V3270_ACTION *) accel->arg)->summary);
171 171
172 if( ((V3270_ACTION *) accel->arg)->description ) 172 if( ((V3270_ACTION *) accel->arg)->description )
173 - return gettext(((V3270_ACTION *) accel->arg)->description); 173 + return g_dgettext(PACKAGE_NAME,((V3270_ACTION *) accel->arg)->description);
174 174
175 break; 175 break;
176 176
@@ -187,7 +187,7 @@ @@ -187,7 +187,7 @@
187 case V3270_ACCELERATOR_TYPE_PFKEY: 187 case V3270_ACCELERATOR_TYPE_PFKEY:
188 188
189 if( ((V3270PFKeyAccelerator *)accel)->description ) 189 if( ((V3270PFKeyAccelerator *)accel)->description )
190 - return gettext(((V3270PFKeyAccelerator *)accel)->description); 190 + return g_dgettext(PACKAGE_NAME,((V3270PFKeyAccelerator *)accel)->description);
191 191
192 break; 192 break;
193 193
src/terminal/security.c
  Diff comments   View file @1108431
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 34
35 #include <gtk/gtk.h> 35 #include <gtk/gtk.h>
36 #include <libintl.h> 36 #include <libintl.h>
37 - #include <glib/gi18n.h> 37 + #include <glib/gi18n-lib.h>
38 #include <terminal.h> 38 #include <terminal.h>
39 39
40 /*--[ Implement ]------------------------------------------------------------------------------------*/ 40 /*--[ Implement ]------------------------------------------------------------------------------------*/
src/trace/private.h
  Diff comments   View file @1108431
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 #define GETTEXT_PACKAGE PACKAGE_NAME 37 #define GETTEXT_PACKAGE PACKAGE_NAME
38 38
39 #include <libintl.h> 39 #include <libintl.h>
40 - #include <glib/gi18n.h> 40 + #include <glib/gi18n-lib.h>
41 41
42 #include <v3270.h> 42 #include <v3270.h>
43 #include <v3270/trace.h> 43 #include <v3270/trace.h>
src/trace/tracewindow.c
  Diff comments   View file @1108431
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 #define GETTEXT_PACKAGE PACKAGE_NAME 42 #define GETTEXT_PACKAGE PACKAGE_NAME
43 43
44 #include <libintl.h> 44 #include <libintl.h>
45 - #include <glib/gi18n.h> 45 + #include <glib/gi18n-lib.h>
46 46
47 #include <v3270.h> 47 #include <v3270.h>
48 #include <lib3270.h> 48 #include <lib3270.h>