From a4e0456258fa24c0a41002ff24201f1bf8822b54 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 28 Jan 2020 10:59:27 -0300 Subject: [PATCH] Fixing translations. --- locale/pt_BR.po | 4 ++-- src/dialogs/print/settings.c | 2 +- src/dialogs/save/save.c | 4 ++-- src/dialogs/settings/clipboard.c | 8 ++++---- src/dialogs/settings/colors.c | 6 +++--- src/dialogs/settings/host.c | 4 ++-- src/dialogs/settings/tools.c | 4 ++-- src/dialogs/tools.c | 6 +++--- src/filetransfer/settings.c | 20 ++++++++++---------- src/filetransfer/v3270ft.c | 26 +++++++++++++------------- src/filetransfer/v3270ftprogress.c | 6 +++--- src/filetransfer/worker.c | 6 +++--- src/terminal/drawing/oia.c | 2 +- src/terminal/keyboard/accelerator.c | 10 +++++----- src/testprogram/testprogram.c | 4 ++-- 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 7978a57..677c4dd 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1517,7 +1517,7 @@ msgid "" "fields and restore cursor position" msgstr "" "Quando ativo pesquisa a área de transferência por uma tela similar, se " -"encontrar coloca os campos desprotegidos e restaura a posição do cursor" +"encontrar cola os campos desprotegidos e restaura a posição do cursor" #: src/dialogs/settings/clipboard.c:164 msgid "" @@ -1526,7 +1526,7 @@ msgid "" msgstr "" "Quando selecionado a primeira operação de cópia após a seleção definirá o " "conteúdo da área de transferência enquanto as operações subsequentes " -"acrescentaram conteúdo" +"adicionam conteúdo" #: src/dialogs/settings/clipboard.c:144 msgid "" diff --git a/src/dialogs/print/settings.c b/src/dialogs/print/settings.c index 8b09760..9d00ef8 100644 --- a/src/dialogs/print/settings.c +++ b/src/dialogs/print/settings.c @@ -92,7 +92,7 @@ static void V3270PrintSettings_init(V3270PrintSettings *widget) for(f=0;fformat), ix, formats[ix].extension, - g_dgettext(PACKAGE_NAME,formats[ix].name) + g_dgettext(GETTEXT_PACKAGE,formats[ix].name) ); } @@ -315,7 +315,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_ if( (size_t) mode < G_N_ELEMENTS(titles)) { - gtk_window_set_title(GTK_WINDOW(dialog),g_dgettext(PACKAGE_NAME,titles[(size_t) mode])); + gtk_window_set_title(GTK_WINDOW(dialog),g_dgettext(GETTEXT_PACKAGE,titles[(size_t) mode])); } if(filename) diff --git a/src/dialogs/settings/clipboard.c b/src/dialogs/settings/clipboard.c index 9f1cf06..208b820 100644 --- a/src/dialogs/settings/clipboard.c +++ b/src/dialogs/settings/clipboard.c @@ -275,7 +275,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { gtk_grid_attach( GTK_GRID(widget), - v3270_dialog_create_frame(grids[ix],g_dgettext(PACKAGE_NAME,labels[ix])), + v3270_dialog_create_frame(grids[ix],g_dgettext(GETTEXT_PACKAGE,labels[ix])), positions[ix].left, positions[ix].top, positions[ix].width,1 ); @@ -316,7 +316,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { gtk_list_store_set( model, &iter, - 0, g_dgettext(PACKAGE_NAME, html_color_options[ix]), + 0, g_dgettext(GETTEXT_PACKAGE, html_color_options[ix]), 1, id, -1 ); @@ -388,7 +388,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { gtk_list_store_set( model, &iter, - 0, g_dgettext(PACKAGE_NAME, copy_formats[ix]), + 0, g_dgettext(GETTEXT_PACKAGE, copy_formats[ix]), 1, id, -1 ); @@ -438,7 +438,7 @@ static void load(GtkWidget *w, GtkWidget *t) { gtk_list_store_set( model, &iter, - 0, g_dgettext(PACKAGE_NAME, html_font_options[ix]), + 0, g_dgettext(GETTEXT_PACKAGE, html_font_options[ix]), 1, id, -1 ); diff --git a/src/dialogs/settings/colors.c b/src/dialogs/settings/colors.c index 279944c..6ac97f4 100644 --- a/src/dialogs/settings/colors.c +++ b/src/dialogs/settings/colors.c @@ -195,7 +195,7 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal) int f; gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&parent,NULL); - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(PACKAGE_NAME,node[title++].text), 1, V3270_COLOR_COUNT, -1); + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(GETTEXT_PACKAGE,node[title++].text), 1, V3270_COLOR_COUNT, -1); for(f=0;fcolors.list),&parent,NULL); - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(PACKAGE_NAME,node[title++].text), 1, V3270_COLOR_COUNT, -1); + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(GETTEXT_PACKAGE,node[title++].text), 1, V3270_COLOR_COUNT, -1); } gtk_tree_store_append(GTK_TREE_STORE(widget->colors.list),&iter,&parent); - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, g_dgettext(PACKAGE_NAME,color_name[f]), 1, f, -1); + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, g_dgettext(GETTEXT_PACKAGE,color_name[f]), 1, f, -1); } gtk_tree_view_expand_all(GTK_TREE_VIEW(widget->colors.view)); diff --git a/src/dialogs/settings/host.c b/src/dialogs/settings/host.c index 91a5d9c..a3916ee 100644 --- a/src/dialogs/settings/host.c +++ b/src/dialogs/settings/host.c @@ -560,7 +560,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) for(item = 0; combos[combo].labels[item]; item++) { GtkTreeIter iter; gtk_list_store_append((GtkListStore *) model, &iter); - gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME, combos[combo].labels[item]), 1, combos[combo].values[item], -1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE, combos[combo].labels[item]), 1, combos[combo].values[item], -1); } } @@ -628,7 +628,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) { GtkTreeIter iter; gtk_list_store_append((GtkListStore *) model, &iter); - gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME, combos[combo].labels[item]), 1, combos[combo].values[item], -1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE, combos[combo].labels[item]), 1, combos[combo].values[item], -1); } v3270_grid_attach(GTK_GRID(grids[EMULATION]), (struct v3270_entry_field *) & combos[combo], GTK_WIDGET(widget->input.combos[combo])); diff --git a/src/dialogs/settings/tools.c b/src/dialogs/settings/tools.c index b7eb816..88ee1e1 100644 --- a/src/dialogs/settings/tools.c +++ b/src/dialogs/settings/tools.c @@ -137,10 +137,10 @@ for(checkbox = 0; checkbox < length; checkbox++) { - buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(g_dgettext(PACKAGE_NAME,definitions[checkbox].label))); + buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(g_dgettext(GETTEXT_PACKAGE,definitions[checkbox].label))); if(definitions[checkbox].tooltip) - gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),g_dgettext(PACKAGE_NAME,definitions[checkbox].tooltip)); + gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),g_dgettext(GETTEXT_PACKAGE,definitions[checkbox].tooltip)); gtk_widget_set_halign(GTK_WIDGET(buttons[checkbox]),GTK_ALIGN_START); gtk_grid_attach(GTK_GRID(grids[definitions[checkbox].grid]),GTK_WIDGET(buttons[checkbox]),definitions[checkbox].left,definitions[checkbox].top,definitions[checkbox].width,1); diff --git a/src/dialogs/tools.c b/src/dialogs/tools.c index 0782195..ee8e92c 100644 --- a/src/dialogs/tools.c +++ b/src/dialogs/tools.c @@ -163,7 +163,7 @@ GTK_COMBO_BOX_TEXT(widget), ix+1, charsets[ix].name, - g_dgettext(PACKAGE_NAME,charsets[ix].description) + g_dgettext(GETTEXT_PACKAGE,charsets[ix].description) ); } } @@ -174,7 +174,7 @@ void v3270_grid_attach(GtkGrid *grid, const struct v3270_entry_field * description, GtkWidget *widget) { - GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,description->label)); + GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,description->label)); gtk_label_set_mnemonic_widget(GTK_LABEL(label),widget); gtk_widget_set_halign(label,GTK_ALIGN_END); @@ -182,7 +182,7 @@ gtk_grid_attach(grid,widget,description->left+1,description->top,description->width,description->height); if(description->tooltip) - gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,description->tooltip)); + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,description->tooltip)); } diff --git a/src/filetransfer/settings.c b/src/filetransfer/settings.c index 6f4501b..dcab4d4 100644 --- a/src/filetransfer/settings.c +++ b/src/filetransfer/settings.c @@ -178,7 +178,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) { GtkWidget * create_spin_button(V3270FTSettings *widget, GtkWidget *grid, size_t row, LIB3270_FT_VALUE id) { - GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_value[id].label)); + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,ft_value[id].label)); gtk_widget_set_halign(label,GTK_ALIGN_END); 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) { // g_signal_connect(G_OBJECT(button),"value-changed",G_CALLBACK(spin_changed),dialog); g_signal_connect(G_OBJECT(button),"output",G_CALLBACK(spin_format),widget); - gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,ft_value[id].tooltip)); - gtk_widget_set_tooltip_markup(label,g_dgettext(PACKAGE_NAME,ft_value[id].tooltip)); + gtk_widget_set_tooltip_markup(button,g_dgettext(GETTEXT_PACKAGE,ft_value[id].tooltip)); + gtk_widget_set_tooltip_markup(label,g_dgettext(GETTEXT_PACKAGE,ft_value[id].tooltip)); gtk_label_set_mnemonic_widget(GTK_LABEL(label),button); @@ -452,7 +452,7 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP { GtkTreeIter iter; gtk_list_store_append((GtkListStore *) model,&iter); - gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME,ft_type[ix].label), -1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE,ft_type[ix].label), -1); } @@ -499,8 +499,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP for(ix=0;ix<4;ix++) { - widget->options[ix] = gtk_check_button_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_option[ix].label)); - gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip)); + widget->options[ix] = gtk_check_button_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label)); + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(GETTEXT_PACKAGE,ft_option[ix].tooltip)); // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget); gtk_box_pack_start(GTK_BOX(box),widget->options[ix],FALSE,TRUE,0); } @@ -526,8 +526,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP for(ix=4;ix<8;ix++) { - widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label)); - gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip)); + widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label)); + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(GETTEXT_PACKAGE,ft_option[ix].tooltip)); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix])); gtk_box_pack_start(GTK_BOX(widget->recordFormatBox),widget->options[ix],FALSE,TRUE,0); @@ -551,8 +551,8 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP for(ix=8;ix<12;ix++) { - widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label)); - gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip)); + widget->options[ix] = gtk_radio_button_new_with_label(group,g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label)); + gtk_widget_set_tooltip_markup(widget->options[ix],g_dgettext(GETTEXT_PACKAGE,ft_option[ix].tooltip)); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix])); gtk_box_pack_start(GTK_BOX(widget->spaceAllocationBox),widget->options[ix],FALSE,TRUE,0); diff --git a/src/filetransfer/v3270ft.c b/src/filetransfer/v3270ft.c index 6c3bd00..70251fe 100644 --- a/src/filetransfer/v3270ft.c +++ b/src/filetransfer/v3270ft.c @@ -482,7 +482,7 @@ static void v3270ft_init(v3270ft *dialog) { GtkWidget *button = gtk_button_new_from_icon_name(action[f].name,GTK_ICON_SIZE_BUTTON); - gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,action[f].tooltip)); + gtk_widget_set_tooltip_markup(button,g_dgettext(GETTEXT_PACKAGE,action[f].tooltip)); if(action[f].start) { gtk_header_bar_pack_start(GTK_HEADER_BAR(widget),button); @@ -508,7 +508,7 @@ static void v3270ft_init(v3270ft *dialog) { GtkWidget *button = GTK_WIDGET(gtk_tool_button_new(gtk_image_new_from_icon_name(action[f].name,GTK_ICON_SIZE_SMALL_TOOLBAR),NULL)); - gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,action[f].tooltip)); + gtk_widget_set_tooltip_markup(button,g_dgettext(GETTEXT_PACKAGE,action[f].tooltip)); gtk_toolbar_insert(GTK_TOOLBAR(widget),GTK_TOOL_ITEM(button),-1); @@ -547,7 +547,7 @@ static void v3270ft_init(v3270ft *dialog) { GtkTreeIter iter; gtk_list_store_append((GtkListStore *) model,&iter); - gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME,ft_type[f].label),-1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(GETTEXT_PACKAGE,ft_type[f].label),-1); if(!f) { gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter); @@ -590,7 +590,7 @@ static void v3270ft_init(v3270ft *dialog) { gtk_grid_attach(grid,GTK_WIDGET(dialog->remote),1,2,1,1); for(f=0;f< (int) G_N_ELEMENTS(label);f++) { - GtkWidget * widget = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,label[f])); + GtkWidget * widget = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,label[f])); gtk_widget_set_halign(widget,GTK_ALIGN_END); gtk_widget_set_valign(widget,GTK_ALIGN_CENTER); gtk_grid_attach(grid,GTK_WIDGET(widget),0,f,1,1); @@ -598,7 +598,7 @@ static void v3270ft_init(v3270ft *dialog) { } // Transfer options - widget = gtk_frame_new(g_dgettext(PACKAGE_NAME,frame[0])); + widget = gtk_frame_new(g_dgettext(GETTEXT_PACKAGE,frame[0])); g_object_set(G_OBJECT(widget),"margin-top",18,NULL); grid = v3270ft_new_grid(); @@ -609,8 +609,8 @@ static void v3270ft_init(v3270ft *dialog) { for(f=0;f<4;f++) { - dialog->opt[f] = widget = gtk_check_button_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_option[f].label)); - gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_option[f].tooltip)); + dialog->opt[f] = widget = gtk_check_button_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,ft_option[f].label)); + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,ft_option[f].tooltip)); gtk_grid_attach(grid,widget,f&1,f/2,1,1); g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog); @@ -629,7 +629,7 @@ static void v3270ft_init(v3270ft *dialog) { GSList * group = NULL; gtk_container_set_border_width(GTK_CONTAINER(box),6); - dialog->radio[f] = gtk_frame_new(g_dgettext(PACKAGE_NAME,frame[f+1])); + dialog->radio[f] = gtk_frame_new(g_dgettext(GETTEXT_PACKAGE,frame[f+1])); gtk_container_add(GTK_CONTAINER(dialog->radio[f]),GTK_WIDGET(box)); gtk_container_add(GTK_CONTAINER(grid),dialog->radio[f]); @@ -638,10 +638,10 @@ static void v3270ft_init(v3270ft *dialog) { int ix = ((f+1)*4)+i; - dialog->opt[ix] = widget = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label)); + dialog->opt[ix] = widget = gtk_radio_button_new_with_label(group,g_dgettext(GETTEXT_PACKAGE,ft_option[ix].label)); g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog); - gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_option[ix].tooltip)); + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,ft_option[ix].tooltip)); gtk_box_pack_start(box,widget,FALSE,FALSE,2); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget)); @@ -657,7 +657,7 @@ static void v3270ft_init(v3270ft *dialog) { for(f=0;f < LIB3270_FT_VALUE_COUNT;f++) { - GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,ft_value[f].label)); + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,ft_value[f].label)); gtk_widget_set_halign(label,GTK_ALIGN_END); gtk_widget_set_valign(label,GTK_ALIGN_CENTER); @@ -665,8 +665,8 @@ static void v3270ft_init(v3270ft *dialog) { g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(spin_changed),dialog); g_signal_connect(G_OBJECT(widget),"output",G_CALLBACK(spin_format),dialog); - gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,ft_value[f].tooltip)); - gtk_widget_set_tooltip_markup(label,g_dgettext(PACKAGE_NAME,ft_value[f].tooltip)); + gtk_widget_set_tooltip_markup(widget,g_dgettext(GETTEXT_PACKAGE,ft_value[f].tooltip)); + gtk_widget_set_tooltip_markup(label,g_dgettext(GETTEXT_PACKAGE,ft_value[f].tooltip)); gtk_label_set_mnemonic_widget(GTK_LABEL(label),widget); diff --git a/src/filetransfer/v3270ftprogress.c b/src/filetransfer/v3270ftprogress.c index 4380f70..a7a84bc 100644 --- a/src/filetransfer/v3270ftprogress.c +++ b/src/filetransfer/v3270ftprogress.c @@ -352,7 +352,7 @@ static GtkWidget * create_text(guint width) { static GtkWidget * create_label(int id, GtkWidget *entry) { - GtkWidget * widget = gtk_label_new(g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[id].label)); + GtkWidget * widget = gtk_label_new(g_dgettext(GETTEXT_PACKAGE,v3270_ft_worker_fields[id].label)); gtk_widget_set_tooltip_markup(widget,v3270_ft_worker_fields[id].tooltip); 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 while(*text && g_ascii_isspace(*text)) text++; - delay_signal(hSession, V3270FTPROGRESS_SIGNAL_FAILED, text, g_dgettext(PACKAGE_NAME,ftmsg[f].text)); + delay_signal(hSession, V3270FTPROGRESS_SIGNAL_FAILED, text, g_dgettext(GETTEXT_PACKAGE,ftmsg[f].text)); return; @@ -645,7 +645,7 @@ static void ft_complete(H3270 *hSession, unsigned long length,double kbytes_sec, while(*text && g_ascii_isspace(*text)) text++; - delay_signal(hSession, ftmsg[f].failed ? V3270FTPROGRESS_SIGNAL_FAILED : V3270FTPROGRESS_SIGNAL_SUCCESS, text, g_dgettext(PACKAGE_NAME,ftmsg[f].text)); + delay_signal(hSession, ftmsg[f].failed ? V3270FTPROGRESS_SIGNAL_FAILED : V3270FTPROGRESS_SIGNAL_SUCCESS, text, g_dgettext(GETTEXT_PACKAGE,ftmsg[f].text)); return; diff --git a/src/filetransfer/worker.c b/src/filetransfer/worker.c index c13108f..2ff7c4a 100644 --- a/src/filetransfer/worker.c +++ b/src/filetransfer/worker.c @@ -209,7 +209,7 @@ static void create_field(V3270FTWorker *widget, PROGRESS_FIELD id, GtkWidget *grid, gint top) { - GtkWidget * label = gtk_label_new(g_dgettext(PACKAGE_NAME,v3270_ft_worker_fields[id].label)); + GtkWidget * label = gtk_label_new(g_dgettext(GETTEXT_PACKAGE,v3270_ft_worker_fields[id].label)); gtk_widget_set_halign(GTK_WIDGET(label),GTK_ALIGN_END); gtk_grid_attach(GTK_GRID(grid),label,0,top,1,1); @@ -229,8 +229,8 @@ gtk_grid_set_row_spacing(GTK_GRID(widget),6); gtk_grid_set_column_spacing(GTK_GRID(widget),12); - 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)); - 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)); + 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)); + 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)); // Create status elements GtkWidget * views = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6); diff --git a/src/terminal/drawing/oia.c b/src/terminal/drawing/oia.c index 39938a4..b4ee53d 100644 --- a/src/terminal/drawing/oia.c +++ b/src/terminal/drawing/oia.c @@ -489,7 +489,7 @@ static void draw_status_message(cairo_t *cr, LIB3270_MESSAGE id, v3270FontInfo * if(msg && *msg) { - msg = g_dgettext(PACKAGE_NAME,msg); + msg = g_dgettext(GETTEXT_PACKAGE,msg); } if(msg && *msg) diff --git a/src/terminal/keyboard/accelerator.c b/src/terminal/keyboard/accelerator.c index 66bda79..b52faf9 100644 --- a/src/terminal/keyboard/accelerator.c +++ b/src/terminal/keyboard/accelerator.c @@ -170,14 +170,14 @@ case V3270_ACCELERATOR_TYPE_INTERNAL: debug("%s","V3270_ACCELERATOR_TYPE_INTERNAL"); if(property->summary) - description = g_dgettext(PACKAGE_NAME,property->summary); + description = g_dgettext(GETTEXT_PACKAGE,property->summary); break; case V3270_ACCELERATOR_TYPE_PFKEY: debug("%s","V3270_ACCELERATOR_TYPE_PFKEY"); if( ((V3270PFKeyAccelerator *)accel)->description ) - description = g_dgettext(PACKAGE_NAME,((V3270PFKeyAccelerator *)accel)->description); + description = g_dgettext(GETTEXT_PACKAGE,((V3270PFKeyAccelerator *)accel)->description); break; @@ -210,16 +210,16 @@ case V3270_ACCELERATOR_TYPE_INTERNAL: debug("%s","V3270_ACCELERATOR_TYPE_INTERNAL"); if(property->description) - description = g_dgettext(PACKAGE_NAME,property->description); + description = g_dgettext(GETTEXT_PACKAGE,property->description); else if(property->summary) - description = g_dgettext(PACKAGE_NAME,property->summary); + description = g_dgettext(GETTEXT_PACKAGE,property->summary); break; case V3270_ACCELERATOR_TYPE_PFKEY: debug("%s","V3270_ACCELERATOR_TYPE_PFKEY"); if( ((V3270PFKeyAccelerator *)accel)->description ) - description = g_dgettext(PACKAGE_NAME,((V3270PFKeyAccelerator *)accel)->description); + description = g_dgettext(GETTEXT_PACKAGE,((V3270PFKeyAccelerator *)accel)->description); break; diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index ccebda0..2823166 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -201,9 +201,9 @@ int main (int argc, char **argv) { setlocale( LC_ALL, "" ); #endif - textdomain("pw3270"); + textdomain("libv3270"); - app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE); + app = gtk_application_new ("br.com.bb.libv3270",G_APPLICATION_FLAGS_NONE); g_signal_connect (app, "activate", G_CALLBACK(activate), NULL); -- libgit2 0.21.2