Download as
Browse Code »

Commit a4e0456258fa24c0a41002ff24201f1bf8822b54

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

Fixing translations.

Showing 15 changed files with 56 additions and 56 deletions   Show diff stats
locale/pt_BR.po
  Diff comments   View file @a4e0456
@@ -1517,7 +1517,7 @@ msgid "" @@ -1517,7 +1517,7 @@ msgid ""
1517 "fields and restore cursor position" 1517 "fields and restore cursor position"
1518 msgstr "" 1518 msgstr ""
1519 "Quando ativo pesquisa a área de transferência por uma tela similar, se " 1519 "Quando ativo pesquisa a área de transferência por uma tela similar, se "
1520 -"encontrar coloca os campos desprotegidos e restaura a posição do cursor" 1520 +"encontrar cola os campos desprotegidos e restaura a posição do cursor"
1521 1521
1522 #: src/dialogs/settings/clipboard.c:164 1522 #: src/dialogs/settings/clipboard.c:164
1523 msgid "" 1523 msgid ""
@@ -1526,7 +1526,7 @@ msgid "" @@ -1526,7 +1526,7 @@ msgid ""
1526 msgstr "" 1526 msgstr ""
1527 "Quando selecionado a primeira operação de cópia após a seleção definirá o " 1527 "Quando selecionado a primeira operação de cópia após a seleção definirá o "
1528 "conteúdo da área de transferência enquanto as operações subsequentes " 1528 "conteúdo da área de transferência enquanto as operações subsequentes "
1529 -"acrescentaram conteúdo" 1529 +"adicionam conteúdo"
1530 1530
1531 #: src/dialogs/settings/clipboard.c:144 1531 #: src/dialogs/settings/clipboard.c:144
1532 msgid "" 1532 msgid ""
src/dialogs/print/settings.c
  Diff comments   View file @a4e0456
@@ -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(g_dgettext(PACKAGE_NAME,text[f])); 95 + GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,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/save.c
  Diff comments   View file @a4e0456
@@ -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 - g_dgettext(PACKAGE_NAME,formats[ix].name) 242 + g_dgettext(GETTEXT_PACKAGE,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),g_dgettext(PACKAGE_NAME,titles[(size_t) mode])); 318 + gtk_window_set_title(GTK_WINDOW(dialog),g_dgettext(GETTEXT_PACKAGE,titles[(size_t) mode]));
319 } 319 }
320 320
321 if(filename) 321 if(filename)
src/dialogs/settings/clipboard.c
  Diff comments   View file @a4e0456
@@ -275,7 +275,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { @@ -275,7 +275,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
275 275
276 gtk_grid_attach( 276 gtk_grid_attach(
277 GTK_GRID(widget), 277 GTK_GRID(widget),
278 - v3270_dialog_create_frame(grids[ix],g_dgettext(PACKAGE_NAME,labels[ix])), 278 + v3270_dialog_create_frame(grids[ix],g_dgettext(GETTEXT_PACKAGE,labels[ix])),
279 positions[ix].left, positions[ix].top, 279 positions[ix].left, positions[ix].top,
280 positions[ix].width,1 280 positions[ix].width,1
281 ); 281 );
@@ -316,7 +316,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { @@ -316,7 +316,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
316 gtk_list_store_set( 316 gtk_list_store_set(
317 model, 317 model,
318 &iter, 318 &iter,
319 - 0, g_dgettext(PACKAGE_NAME, html_color_options[ix]), 319 + 0, g_dgettext(GETTEXT_PACKAGE, html_color_options[ix]),
320 1, id, 320 1, id,
321 -1 321 -1
322 ); 322 );
@@ -388,7 +388,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { @@ -388,7 +388,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
388 gtk_list_store_set( 388 gtk_list_store_set(
389 model, 389 model,
390 &iter, 390 &iter,
391 - 0, g_dgettext(PACKAGE_NAME, copy_formats[ix]), 391 + 0, g_dgettext(GETTEXT_PACKAGE, copy_formats[ix]),
392 1, id, 392 1, id,
393 -1 393 -1
394 ); 394 );
@@ -438,7 +438,7 @@ static void load(GtkWidget *w, GtkWidget *t) { @@ -438,7 +438,7 @@ static void load(GtkWidget *w, GtkWidget *t) {
438 gtk_list_store_set( 438 gtk_list_store_set(
439 model, 439 model,
440 &iter, 440 &iter,
441 - 0, g_dgettext(PACKAGE_NAME, html_font_options[ix]), 441 + 0, g_dgettext(GETTEXT_PACKAGE, html_font_options[ix]),
442 1, id, 442 1, id,
443 -1 443 -1
444 ); 444 );
src/dialogs/settings/colors.c
  Diff comments   View file @a4e0456
@@ -195,7 +195,7 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal) @@ -195,7 +195,7 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal)
195 int f; 195 int f;
196 196
197 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);
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); 198 + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(GETTEXT_PACKAGE,node[title++].text), 1, V3270_COLOR_COUNT, -1);
199 199
200 for(f=0;f<V3270_COLOR_COUNT;f++) 200 for(f=0;f<V3270_COLOR_COUNT;f++)
201 { 201 {
@@ -204,10 +204,10 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal) @@ -204,10 +204,10 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal)
204 if(f == node[title].id) 204 if(f == node[title].id)
205 { 205 {
206 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);
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); 207 + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(GETTEXT_PACKAGE,node[title++].text), 1, V3270_COLOR_COUNT, -1);
208 } 208 }
209 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);
210 - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, g_dgettext(PACKAGE_NAME,color_name[f]), 1, f, -1); 210 + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, g_dgettext(GETTEXT_PACKAGE,color_name[f]), 1, f, -1);
211 } 211 }
212 212
213 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 @a4e0456
@@ -560,7 +560,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) @@ -560,7 +560,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget)
560 for(item = 0; combos[combo].labels[item]; item++) { 560 for(item = 0; combos[combo].labels[item]; item++) {
561 GtkTreeIter iter; 561 GtkTreeIter iter;
562 gtk_list_store_append((GtkListStore *) model, &iter); 562 gtk_list_store_append((GtkListStore *) model, &iter);
563 - gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME, combos[combo].labels[item]), 1, combos[combo].values[item], -1); 563 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE, combos[combo].labels[item]), 1, combos[combo].values[item], -1);
564 } 564 }
565 565
566 } 566 }
@@ -628,7 +628,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) @@ -628,7 +628,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget)
628 { 628 {
629 GtkTreeIter iter; 629 GtkTreeIter iter;
630 gtk_list_store_append((GtkListStore *) model, &iter); 630 gtk_list_store_append((GtkListStore *) model, &iter);
631 - gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME, combos[combo].labels[item]), 1, combos[combo].values[item], -1); 631 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE, combos[combo].labels[item]), 1, combos[combo].values[item], -1);
632 } 632 }
633 633
634 v3270_grid_attach(GTK_GRID(grids[EMULATION]), (struct v3270_entry_field *) & combos[combo], GTK_WIDGET(widget->input.combos[combo])); 634 v3270_grid_attach(GTK_GRID(grids[EMULATION]), (struct v3270_entry_field *) & combos[combo], GTK_WIDGET(widget->input.combos[combo]));
src/dialogs/settings/tools.c
  Diff comments   View file @a4e0456
@@ -137,10 +137,10 @@ @@ -137,10 +137,10 @@
137 137
138 for(checkbox = 0; checkbox < length; checkbox++) { 138 for(checkbox = 0; checkbox < length; checkbox++) {
139 139
140 - buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(g_dgettext(PACKAGE_NAME,definitions[checkbox].label))); 140 + buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(g_dgettext(GETTEXT_PACKAGE,definitions[checkbox].label)));
141 141
142 if(definitions[checkbox].tooltip) 142 if(definitions[checkbox].tooltip)
143 - gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),g_dgettext(PACKAGE_NAME,definitions[checkbox].tooltip)); 143 + gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),g_dgettext(GETTEXT_PACKAGE,definitions[checkbox].tooltip));
144 144
145 gtk_widget_set_halign(GTK_WIDGET(buttons[checkbox]),GTK_ALIGN_START); 145 gtk_widget_set_halign(GTK_WIDGET(buttons[checkbox]),GTK_ALIGN_START);
146 gtk_grid_attach(GTK_GRID(grids[definitions[checkbox].grid]),GTK_WIDGET(buttons[checkbox]),definitions[checkbox].left,definitions[checkbox].top,definitions[checkbox].width,1); 146 gtk_grid_attach(GTK_GRID(grids[definitions[checkbox].grid]),GTK_WIDGET(buttons[checkbox]),definitions[checkbox].left,definitions[checkbox].top,definitions[checkbox].width,1);
src/dialogs/tools.c
  Diff comments   View file @a4e0456
@@ -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 - g_dgettext(PACKAGE_NAME,charsets[ix].description) 166 + g_dgettext(GETTEXT_PACKAGE,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(g_dgettext(PACKAGE_NAME,description->label)); 177 + GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,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,g_dgettext(PACKAGE_NAME,description->tooltip)); 185 + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,description->tooltip));
186 186
187 } 187 }
188 188
src/filetransfer/settings.c
  Diff comments   View file @a4e0456
@@ -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(g_dgettext(PACKAGE_NAME,ft_value[id].label)); 181 + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,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,g_dgettext(PACKAGE_NAME,ft_value[id].tooltip));  
191 - gtk_widget_set_tooltip_markup(label,g_dgettext(PACKAGE_NAME,ft_value[id].tooltip)); 190 + gtk_widget_set_tooltip_markup(button,g_dgettext(GETTEXT_PACKAGE,ft_value[id].tooltip));
  191 + gtk_widget_set_tooltip_markup(label,g_dgettext(GETTEXT_PACKAGE,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, g_dgettext(PACKAGE_NAME,ft_type[ix].label), -1); 455 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE,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(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)); 502 + widget->options[ix] = gtk_check_button_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label));
  503 + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(GETTEXT_PACKAGE,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,8 +526,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP @@ -526,8 +526,8 @@ 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,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)); 529 + widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label));
  530 + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(GETTEXT_PACKAGE,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 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);
533 533
@@ -551,8 +551,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP @@ -551,8 +551,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
551 551
552 for(ix=8;ix<12;ix++) 552 for(ix=8;ix<12;ix++)
553 { 553 {
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)); 554 + widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label));
  555 + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(GETTEXT_PACKAGE,ft_option[ix].tooltip));
556 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]));
557 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);
558 558
src/filetransfer/v3270ft.c
  Diff comments   View file @a4e0456
@@ -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,g_dgettext(PACKAGE_NAME,action[f].tooltip)); 485 + gtk_widget_set_tooltip_markup(button,g_dgettext(GETTEXT_PACKAGE,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,g_dgettext(PACKAGE_NAME,action[f].tooltip)); 511 + gtk_widget_set_tooltip_markup(button,g_dgettext(GETTEXT_PACKAGE,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, g_dgettext(PACKAGE_NAME,ft_type[f].label),-1); 550 + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE,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(g_dgettext(PACKAGE_NAME,label[f])); 593 + GtkWidget * widget = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,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(g_dgettext(PACKAGE_NAME,frame[0])); 601 + widget = gtk_frame_new(g_dgettext(GETTEXT_PACKAGE,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(g_dgettext(PACKAGE_NAME,ft_option[f].label));  
613 - gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_option[f].tooltip)); 612 + dialog->opt[f] = widget = gtk_check_button_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,ft_option[f].label));
  613 + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,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(g_dgettext(PACKAGE_NAME,frame[f+1])); 632 + dialog->radio[f] = gtk_frame_new(g_dgettext(GETTEXT_PACKAGE,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,g_dgettext(PACKAGE_NAME,ft_option[ix].label)); 641 + dialog->opt[ix] = widget = gtk_radio_button_new_with_label(group,g_dgettext(GETTEXT_PACKAGE,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,g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip)); 644 + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,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(g_dgettext(PACKAGE_NAME,ft_value[f].label)); 660 + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,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,g_dgettext(PACKAGE_NAME,ft_value[f].tooltip));  
669 - gtk_widget_set_tooltip_markup(label,g_dgettext(PACKAGE_NAME,ft_value[f].tooltip)); 668 + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,ft_value[f].tooltip));
  669 + gtk_widget_set_tooltip_markup(label,g_dgettext(GETTEXT_PACKAGE,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 @a4e0456
@@ -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(g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[id].label)); 355 + GtkWidget * widget = gtk_label_new(g_dgettext(GETTEXT_PACKAGE,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);
@@ -602,7 +602,7 @@ static void ft_failed(H3270 *hSession, unsigned long length,double kbytes_sec,co @@ -602,7 +602,7 @@ static void ft_failed(H3270 *hSession, unsigned long length,double kbytes_sec,co
602 while(*text && g_ascii_isspace(*text)) 602 while(*text && g_ascii_isspace(*text))
603 text++; 603 text++;
604 604
605 - delay_signal(hSession, V3270FTPROGRESS_SIGNAL_FAILED, text, g_dgettext(PACKAGE_NAME,ftmsg[f].text)); 605 + delay_signal(hSession, V3270FTPROGRESS_SIGNAL_FAILED, text, g_dgettext(GETTEXT_PACKAGE,ftmsg[f].text));
606 606
607 return; 607 return;
608 608
@@ -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, g_dgettext(PACKAGE_NAME,ftmsg[f].text)); 648 + delay_signal(hSession, ftmsg[f].failed ? V3270FTPROGRESS_SIGNAL_FAILED : V3270FTPROGRESS_SIGNAL_SUCCESS, text, g_dgettext(GETTEXT_PACKAGE,ftmsg[f].text));
649 649
650 return; 650 return;
651 651
src/filetransfer/worker.c
  Diff comments   View file @a4e0456
@@ -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(g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[id].label)); 212 + GtkWidget * label = gtk_label_new(g_dgettext(GETTEXT_PACKAGE,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,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)); 232 + widget->field[PROGRESS_FIELD_LOCAL] = GTK_ENTRY(create_entry(widget,g_dgettext(GETTEXT_PACKAGE,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(GETTEXT_PACKAGE,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);
src/terminal/drawing/oia.c
  Diff comments   View file @a4e0456
@@ -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 = g_dgettext(PACKAGE_NAME,msg); 492 + msg = g_dgettext(GETTEXT_PACKAGE,msg);
493 } 493 }
494 494
495 if(msg && *msg) 495 if(msg && *msg)
src/terminal/keyboard/accelerator.c
  Diff comments   View file @a4e0456
@@ -170,14 +170,14 @@ @@ -170,14 +170,14 @@
170 case V3270_ACCELERATOR_TYPE_INTERNAL: 170 case V3270_ACCELERATOR_TYPE_INTERNAL:
171 debug("%s","V3270_ACCELERATOR_TYPE_INTERNAL"); 171 debug("%s","V3270_ACCELERATOR_TYPE_INTERNAL");
172 if(property->summary) 172 if(property->summary)
173 - description = g_dgettext(PACKAGE_NAME,property->summary); 173 + description = g_dgettext(GETTEXT_PACKAGE,property->summary);
174 break; 174 break;
175 175
176 case V3270_ACCELERATOR_TYPE_PFKEY: 176 case V3270_ACCELERATOR_TYPE_PFKEY:
177 debug("%s","V3270_ACCELERATOR_TYPE_PFKEY"); 177 debug("%s","V3270_ACCELERATOR_TYPE_PFKEY");
178 178
179 if( ((V3270PFKeyAccelerator *)accel)->description ) 179 if( ((V3270PFKeyAccelerator *)accel)->description )
180 - description = g_dgettext(PACKAGE_NAME,((V3270PFKeyAccelerator *)accel)->description); 180 + description = g_dgettext(GETTEXT_PACKAGE,((V3270PFKeyAccelerator *)accel)->description);
181 181
182 break; 182 break;
183 183
@@ -210,16 +210,16 @@ @@ -210,16 +210,16 @@
210 case V3270_ACCELERATOR_TYPE_INTERNAL: 210 case V3270_ACCELERATOR_TYPE_INTERNAL:
211 debug("%s","V3270_ACCELERATOR_TYPE_INTERNAL"); 211 debug("%s","V3270_ACCELERATOR_TYPE_INTERNAL");
212 if(property->description) 212 if(property->description)
213 - description = g_dgettext(PACKAGE_NAME,property->description); 213 + description = g_dgettext(GETTEXT_PACKAGE,property->description);
214 else if(property->summary) 214 else if(property->summary)
215 - description = g_dgettext(PACKAGE_NAME,property->summary); 215 + description = g_dgettext(GETTEXT_PACKAGE,property->summary);
216 break; 216 break;
217 217
218 case V3270_ACCELERATOR_TYPE_PFKEY: 218 case V3270_ACCELERATOR_TYPE_PFKEY:
219 debug("%s","V3270_ACCELERATOR_TYPE_PFKEY"); 219 debug("%s","V3270_ACCELERATOR_TYPE_PFKEY");
220 220
221 if( ((V3270PFKeyAccelerator *)accel)->description ) 221 if( ((V3270PFKeyAccelerator *)accel)->description )
222 - description = g_dgettext(PACKAGE_NAME,((V3270PFKeyAccelerator *)accel)->description); 222 + description = g_dgettext(GETTEXT_PACKAGE,((V3270PFKeyAccelerator *)accel)->description);
223 223
224 break; 224 break;
225 225
src/testprogram/testprogram.c
  Diff comments   View file @a4e0456
@@ -201,9 +201,9 @@ int main (int argc, char **argv) { @@ -201,9 +201,9 @@ int main (int argc, char **argv) {
201 setlocale( LC_ALL, "" ); 201 setlocale( LC_ALL, "" );
202 #endif 202 #endif
203 203
204 - textdomain("pw3270"); 204 + textdomain("libv3270");
205 205
206 - app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE); 206 + app = gtk_application_new ("br.com.bb.libv3270",G_APPLICATION_FLAGS_NONE);
207 207
208 g_signal_connect (app, "activate", G_CALLBACK(activate), NULL); 208 g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
209 209