diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c index d552041..ceb81f5 100644 --- a/src/dialogs/colorscheme.c +++ b/src/dialogs/colorscheme.c @@ -30,7 +30,6 @@ #include #include - #include #include #include diff --git a/src/dialogs/print/settings.c b/src/dialogs/print/settings.c index 5d347dc..8b09760 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;f #include - #include #include #include #include diff --git a/src/dialogs/save/save.c b/src/dialogs/save/save.c index 40acd6c..fe82629 100644 --- a/src/dialogs/save/save.c +++ b/src/dialogs/save/save.c @@ -239,7 +239,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_ GTK_COMBO_BOX_TEXT(dialog->format), ix, formats[ix].extension, - gettext(formats[ix].name) + g_dgettext(PACKAGE_NAME,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),gettext(titles[(size_t) mode])); + gtk_window_set_title(GTK_WINDOW(dialog),g_dgettext(PACKAGE_NAME,titles[(size_t) mode])); } if(filename) diff --git a/src/dialogs/security.c b/src/dialogs/security.c index ed7750a..d28b094 100644 --- a/src/dialogs/security.c +++ b/src/dialogs/security.c @@ -34,7 +34,7 @@ #include #include - #include + #include #include #include diff --git a/src/dialogs/settings/accelerator.c b/src/dialogs/settings/accelerator.c index 4b38c97..6d47939 100644 --- a/src/dialogs/settings/accelerator.c +++ b/src/dialogs/settings/accelerator.c @@ -237,6 +237,8 @@ LIB3270_EXPORT GtkWidget * v3270_accelerator_settings_new() settings->title = _("Keyboard accelerators"); settings->label = _("Accelerators"); + debug("*********** [%s] [%s] [%s]",settings->title,gettext(settings->title),g_dgettext(GETTEXT_PACKAGE,settings->title)); + return GTK_WIDGET(settings); } diff --git a/src/dialogs/settings/colors.c b/src/dialogs/settings/colors.c index 534e3c5..279944c 100644 --- a/src/dialogs/settings/colors.c +++ b/src/dialogs/settings/colors.c @@ -32,7 +32,6 @@ * */ -// #include "private.h" #include #include #include @@ -196,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, gettext(node[title++].text), 1, V3270_COLOR_COUNT, -1); + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &parent, 0, g_dgettext(PACKAGE_NAME,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, gettext(node[title++].text), 1, V3270_COLOR_COUNT, -1); + 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_append(GTK_TREE_STORE(widget->colors.list),&iter,&parent); - gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, gettext(color_name[f]), 1, f, -1); + gtk_tree_store_set(GTK_TREE_STORE(widget->colors.list), &iter, 0, g_dgettext(PACKAGE_NAME,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 3ff8385..3d1065d 100644 --- a/src/dialogs/settings/host.c +++ b/src/dialogs/settings/host.c @@ -553,7 +553,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) { GtkTreeIter iter; gtk_list_store_append((GtkListStore *) model, &iter); - gtk_list_store_set((GtkListStore *) model, &iter, 0, gettext(combos[combo].labels[item]), 1, combos[combo].values[item], -1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME, combos[combo].labels[item]), 1, combos[combo].values[item], -1); } v3270_grid_attach(GTK_GRID(emulation), (struct v3270_entry_field *) & combos[combo], GTK_WIDGET(widget->input.combos[combo])); diff --git a/src/dialogs/tools.c b/src/dialogs/tools.c index e5dd004..0782195 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, - gettext(charsets[ix].description) + g_dgettext(PACKAGE_NAME,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(gettext(description->label)); + GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,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,gettext(description->tooltip)); + gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,description->tooltip)); } diff --git a/src/dialogs/transfer.c b/src/dialogs/transfer.c index 7d958a3..4125a35 100644 --- a/src/dialogs/transfer.c +++ b/src/dialogs/transfer.c @@ -28,14 +28,10 @@ */ #include - - #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME + #include #include #include - #include - #include #include #include diff --git a/src/filetransfer/private.h b/src/filetransfer/private.h index ef8dd96..1a2b01e 100644 --- a/src/filetransfer/private.h +++ b/src/filetransfer/private.h @@ -38,7 +38,7 @@ #define GETTEXT_PACKAGE PACKAGE_NAME #include - #include + #include #include #include diff --git a/src/filetransfer/settings.c b/src/filetransfer/settings.c index dccf557..6f4501b 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(gettext(ft_value[id].label)); + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,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,gettext(ft_value[id].tooltip)); - gtk_widget_set_tooltip_markup(label,gettext(ft_value[id].tooltip)); + 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_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, gettext(ft_type[ix].label), -1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME,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(gettext(ft_option[ix].label)); - gtk_widget_set_tooltip_markup(widget->options[ix],gettext(ft_option[ix].tooltip)); + 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)); // 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,10 +526,9 @@ 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,gettext(ft_option[ix].label)); - gtk_widget_set_tooltip_markup(widget->options[ix],gettext(ft_option[ix].tooltip)); + 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)); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix])); - // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget); gtk_box_pack_start(GTK_BOX(widget->recordFormatBox),widget->options[ix],FALSE,TRUE,0); } @@ -552,10 +551,9 @@ 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,gettext(ft_option[ix].label)); - gtk_widget_set_tooltip_markup(widget->options[ix],gettext(ft_option[ix].tooltip)); + 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)); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(widget->options[ix])); - // g_signal_connect(G_OBJECT(widget->options[ix]),"toggled",G_CALLBACK(option_toggled),widget); 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 1b13a9d..6c3bd00 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,gettext(action[f].tooltip)); + gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,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,gettext(action[f].tooltip)); + gtk_widget_set_tooltip_markup(button,g_dgettext(PACKAGE_NAME,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, gettext(ft_type[f].label),-1); + gtk_list_store_set((GtkListStore *) model, &iter, 0, g_dgettext(PACKAGE_NAME,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(gettext(label[f])); + GtkWidget * widget = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,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(gettext(frame[0])); + widget = gtk_frame_new(g_dgettext(PACKAGE_NAME,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(gettext(ft_option[f].label)); - gtk_widget_set_tooltip_markup(widget,gettext(ft_option[f].tooltip)); + 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)); 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(gettext(frame[f+1])); + dialog->radio[f] = gtk_frame_new(g_dgettext(PACKAGE_NAME,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,gettext(ft_option[ix].label)); + dialog->opt[ix] = widget = gtk_radio_button_new_with_label(group,g_dgettext(PACKAGE_NAME,ft_option[ix].label)); g_signal_connect(G_OBJECT(widget),"toggled",G_CALLBACK(option_toggled),dialog); - gtk_widget_set_tooltip_markup(widget,gettext(ft_option[ix].tooltip)); + gtk_widget_set_tooltip_markup(widget,g_dgettext(PACKAGE_NAME,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(gettext(ft_value[f].label)); + GtkWidget * label = gtk_label_new_with_mnemonic(g_dgettext(PACKAGE_NAME,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,gettext(ft_value[f].tooltip)); - gtk_widget_set_tooltip_markup(label,gettext(ft_value[f].tooltip)); + 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_label_set_mnemonic_widget(GTK_LABEL(label),widget); diff --git a/src/filetransfer/v3270ftprogress.c b/src/filetransfer/v3270ftprogress.c index f4853c1..1db1bb5 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(gettext(v3270_ft_worker_fields[id].label)); + GtkWidget * widget = gtk_label_new(g_dgettext(PACKAGE_NAME,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); @@ -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, gettext(ftmsg[f].text)); + delay_signal(hSession, ftmsg[f].failed ? V3270FTPROGRESS_SIGNAL_FAILED : V3270FTPROGRESS_SIGNAL_SUCCESS, text, g_dgettext(PACKAGE_NAME,ftmsg[f].text)); return; diff --git a/src/filetransfer/worker.c b/src/filetransfer/worker.c index 146b6f4..c136925 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(gettext(v3270_ft_worker_fields[id].label)); + GtkWidget * label = gtk_label_new(g_dgettext(PACKAGE_NAME,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,gettext(v3270_ft_worker_fields[PROGRESS_FIELD_LOCAL].label),gtk_entry_new(),0,0,9)); - 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)); + 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)); // Create status elements GtkWidget * views = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6); @@ -591,12 +591,12 @@ static gboolean do_timer(V3270FTWorker *worker) { if(!message) message = N_("Can't start file transfer session"); - gtk_progress_bar_set_text(worker->pbar,gettext(message)); + gtk_progress_bar_set_text(worker->pbar,g_dgettext(PACKAGE_NAME,message)); pulse_stop(worker); // Emit "transfer failed" - g_signal_emit(GTK_WIDGET(widget),v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL], 0, gettext(message), NULL); + g_signal_emit(GTK_WIDGET(widget),v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL], 0, g_dgettext(PACKAGE_NAME,message), NULL); // Emit "no transfer" ft_state_changed(worker->hSession, LIB3270_FT_STATE_NONE, _("No transfer in progress"), widget); diff --git a/src/include/hostselect.h b/src/include/hostselect.h index 18901a3..3ec0371 100644 --- a/src/include/hostselect.h +++ b/src/include/hostselect.h @@ -39,7 +39,7 @@ #endif #include - #include + #include #include #include diff --git a/src/include/internals.h b/src/include/internals.h index 7f7e781..8adce74 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -37,7 +37,8 @@ #define GETTEXT_PACKAGE PACKAGE_NAME #include - #include + #include + #include #include #include diff --git a/src/include/v3270/filetransfer.h b/src/include/v3270/filetransfer.h index f4b6bc2..5e6e33b 100644 --- a/src/include/v3270/filetransfer.h +++ b/src/include/v3270/filetransfer.h @@ -32,7 +32,6 @@ #define V3270FT_H_INCLUDED 1 - #include #include #include #include diff --git a/src/include/v3270/ftprogress.h b/src/include/v3270/ftprogress.h index 01e4699..978b198 100644 --- a/src/include/v3270/ftprogress.h +++ b/src/include/v3270/ftprogress.h @@ -32,7 +32,6 @@ #define V3270FTPROGRESS_H_INCLUDED - #include #include G_BEGIN_DECLS diff --git a/src/terminal/accessible.c b/src/terminal/accessible.c index 9cb63da..da2ae12 100644 --- a/src/terminal/accessible.c +++ b/src/terminal/accessible.c @@ -34,7 +34,7 @@ #include #include - #include + #include #include #include diff --git a/src/terminal/actions/action.c b/src/terminal/actions/action.c index f99839d..be14d34 100644 --- a/src/terminal/actions/action.c +++ b/src/terminal/actions/action.c @@ -392,7 +392,7 @@ const gchar * domainname = ((V3270Action *) action)->translation_domain ? ((V3270Action *) action)->translation_domain : G_STRINGIFY(PRODUCT_NAME); if (msgid && *msgid) - return (const gchar*) g_dgettext (domainname, msgid); + return (const gchar*) g_dgettext(domainname, msgid); return msgid; diff --git a/src/terminal/callbacks.c b/src/terminal/callbacks.c index 210d049..087cb00 100644 --- a/src/terminal/callbacks.c +++ b/src/terminal/callbacks.c @@ -39,7 +39,6 @@ #include #include - #include #include #include diff --git a/src/terminal/drawing/oia.c b/src/terminal/drawing/oia.c index fd7674d..39938a4 100644 --- a/src/terminal/drawing/oia.c +++ b/src/terminal/drawing/oia.c @@ -39,7 +39,7 @@ #include #include - #include + #include #include #include @@ -489,7 +489,7 @@ static void draw_status_message(cairo_t *cr, LIB3270_MESSAGE id, v3270FontInfo * if(msg && *msg) { - msg = gettext(msg); + msg = g_dgettext(PACKAGE_NAME,msg); } if(msg && *msg) diff --git a/src/terminal/keyboard/accelerator.c b/src/terminal/keyboard/accelerator.c index 14f7dfb..44130cc 100644 --- a/src/terminal/keyboard/accelerator.c +++ b/src/terminal/keyboard/accelerator.c @@ -167,10 +167,10 @@ case V3270_ACCELERATOR_TYPE_INTERNAL: if( ((V3270_ACTION *) accel->arg)->summary ) - return gettext(((V3270_ACTION *) accel->arg)->summary); + return g_dgettext(PACKAGE_NAME,((V3270_ACTION *) accel->arg)->summary); if( ((V3270_ACTION *) accel->arg)->description ) - return gettext(((V3270_ACTION *) accel->arg)->description); + return g_dgettext(PACKAGE_NAME,((V3270_ACTION *) accel->arg)->description); break; @@ -187,7 +187,7 @@ case V3270_ACCELERATOR_TYPE_PFKEY: if( ((V3270PFKeyAccelerator *)accel)->description ) - return gettext(((V3270PFKeyAccelerator *)accel)->description); + return g_dgettext(PACKAGE_NAME,((V3270PFKeyAccelerator *)accel)->description); break; diff --git a/src/terminal/security.c b/src/terminal/security.c index 1045c37..12da4f1 100644 --- a/src/terminal/security.c +++ b/src/terminal/security.c @@ -34,7 +34,7 @@ #include #include - #include + #include #include /*--[ Implement ]------------------------------------------------------------------------------------*/ diff --git a/src/trace/private.h b/src/trace/private.h index ee97b99..15ee545 100644 --- a/src/trace/private.h +++ b/src/trace/private.h @@ -37,7 +37,7 @@ #define GETTEXT_PACKAGE PACKAGE_NAME #include - #include + #include #include #include diff --git a/src/trace/tracewindow.c b/src/trace/tracewindow.c index 54d1795..378a015 100644 --- a/src/trace/tracewindow.c +++ b/src/trace/tracewindow.c @@ -42,7 +42,7 @@ #define GETTEXT_PACKAGE PACKAGE_NAME #include - #include + #include #include #include -- libgit2 0.21.2