diff -Nur jpilot-0.99.3-bak/jpilot.c jpilot-0.99.3/jpilot.c --- jpilot-0.99.3-bak/jpilot.c Wed Oct 2 05:34:59 2002 +++ jpilot-0.99.3/jpilot.c Tue Oct 15 00:11:31 2002 @@ -1020,28 +1020,28 @@ } i=0; - menu_items1[i++].path=strdup(_("/File")); - menu_items1[i++].path=strdup(_("/File/tear")); - menu_items1[i++].path=strdup(_("/File/_Find")); - menu_items1[i++].path=strdup(_("/File/sep1")); - menu_items1[i++].path=strdup(_("/File/_Install")); - menu_items1[i++].path=strdup(_("/File/Import")); - menu_items1[i++].path=strdup(_("/File/Export")); - menu_items1[i++].path=strdup(_("/File/Preferences")); - menu_items1[i++].path=strdup(_("/File/_Print")); - menu_items1[i++].path=strdup(_("/File/sep1")); - menu_items1[i++].path=strdup(_("/File/Restore Handheld")); - menu_items1[i++].path=strdup(_("/File/sep1")); - menu_items1[i++].path=strdup(_("/File/Quit")); - menu_items1[i++].path=strdup(_("/_View")); - menu_items1[i++].path=strdup(_("/View/Hide-Show Private Records")); - menu_items1[i++].path=strdup(_("/View/Datebook")); - menu_items1[i++].path=strdup(_("/View/Addresses")); - menu_items1[i++].path=strdup(_("/View/Todos")); - menu_items1[i++].path=strdup(_("/View/Memos")); - menu_items1[i++].path=strdup(_("/Plugins")); - menu_items1[i++].path=strdup(_("/_Help")); - g_snprintf(temp_str, 100, _("/_Help/%s"), PN); + menu_items1[i++].path=strdup(N_("/File")); + menu_items1[i++].path=strdup(N_("/File/tear")); + menu_items1[i++].path=strdup(N_("/File/_Find")); + menu_items1[i++].path=strdup(N_("/File/sep1")); + menu_items1[i++].path=strdup(N_("/File/_Install")); + menu_items1[i++].path=strdup(N_("/File/Import")); + menu_items1[i++].path=strdup(N_("/File/Export")); + menu_items1[i++].path=strdup(N_("/File/Preferences")); + menu_items1[i++].path=strdup(N_("/File/_Print")); + menu_items1[i++].path=strdup(N_("/File/sep1")); + menu_items1[i++].path=strdup(N_("/File/Restore Handheld")); + menu_items1[i++].path=strdup(N_("/File/sep1")); + menu_items1[i++].path=strdup(N_("/File/Quit")); + menu_items1[i++].path=strdup(N_("/_View")); + menu_items1[i++].path=strdup(N_("/View/Hide-Show Private Records")); + menu_items1[i++].path=strdup(N_("/View/Datebook")); + menu_items1[i++].path=strdup(N_("/View/Addresses")); + menu_items1[i++].path=strdup(N_("/View/Todos")); + menu_items1[i++].path=strdup(N_("/View/Memos")); + menu_items1[i++].path=strdup(N_("/Plugins")); + menu_items1[i++].path=strdup(N_("/_Help")); + g_snprintf(temp_str, 100, N_(N_("/_Help/%s")), PN); temp_str[100]='\0'; menu_items1[i++].path=strdup(temp_str); @@ -1081,7 +1081,7 @@ for (temp_list = plugin_list; temp_list; temp_list = temp_list->next) { p = (struct plugin_s *)temp_list->data; if (p->menu_name) { - g_snprintf(temp_str, 60, _("/Plugins/%s"), p->menu_name); + g_snprintf(temp_str, 60, N_("/Plugins/%s"), p->menu_name); plugin_menu_strings[str_i++]=strdup(temp_str); } } @@ -1092,7 +1092,7 @@ for (temp_list = plugin_list; temp_list; temp_list = temp_list->next) { p = (struct plugin_s *)temp_list->data; if (p->help_name) { - g_snprintf(temp_str, 60, _("/_Help/%s"), p->help_name); + g_snprintf(temp_str, 60, N_("/_Help/%s"), p->help_name); plugin_help_strings[str_i++]=strdup(temp_str); } } @@ -1115,7 +1115,7 @@ } /* Copy the first part of the array until Plugins */ for (i1=i2=0; ; i1++, i2++) { - if (!strcmp(menu_items1[i1].path, _("/Plugins"))) { + if (!strcmp(menu_items1[i1].path, N_("/Plugins"))) { break; } menu_items2[i2]=menu_items1[i1]; @@ -1196,6 +1196,12 @@ */ item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", accel_group); + +#ifdef ENABLE_NLS + gtk_item_factory_set_translate_func (item_factory, + (GtkTranslateFunc) gettext, + NULL, NULL); +#endif /* ENABLE_NLS */ /* This function generates the menu items. Pass the item factory, the number of items in the array, the array itself, and any