diff -Nur skipstone-bak/src/SkipStonePrompter.cpp skipstone/src/SkipStonePrompter.cpp --- skipstone-bak/src/SkipStonePrompter.cpp Wed Jun 27 03:21:38 2001 +++ skipstone/src/SkipStonePrompter.cpp Fri Jul 13 19:11:13 2001 @@ -7,6 +7,7 @@ /* lousy implementation based on the old EmbedPrompter code by Blizzard*/ #include "SkipStonePrompter.h" +#include "intl.h" static gboolean toplevel_delete_cb(GtkWidget *aWidget, GdkEventAny *aEvent, SkipStonePrompter *aPrompter); @@ -237,7 +238,7 @@ mWindow = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_position(GTK_WINDOW(mWindow), GTK_WIN_POS_MOUSE); - gtk_window_set_title(GTK_WINDOW(mWindow), "SkipStone Prompt"); + gtk_window_set_title(GTK_WINDOW(mWindow), _("SkipStone Prompt")); GtkBox *topLevelVBox = GTK_BOX(gtk_vbox_new(FALSE, 3)); gtk_container_add(GTK_CONTAINER(mWindow), GTK_WIDGET(topLevelVBox)); @@ -249,7 +250,7 @@ PRInt32 startPos; if (aFlags & SkipStonePrompter::INCLUDE_USERNAME) { - GtkWidget *userLabel = gtk_label_new("User Name"); + GtkWidget *userLabel = gtk_label_new(_("User Name")); gtk_box_pack_start(topLevelVBox, userLabel,FALSE,FALSE,0); // the username text area mUserField = gtk_entry_new(); @@ -265,7 +266,7 @@ } // password label - GtkWidget *passLabel = gtk_label_new("Password"); + GtkWidget *passLabel = gtk_label_new(_("Password")); gtk_box_pack_start(topLevelVBox, passLabel, FALSE, FALSE, 0); // password text field mPassField = gtk_entry_new(); @@ -298,11 +299,11 @@ // OK - GtkWidget *okButton = gtk_button_new_with_label("OK"); + GtkWidget *okButton = gtk_button_new_with_label(_("OK")); ok = okButton; gtk_box_pack_start(GTK_BOX(buttonBox),okButton,FALSE,TRUE,0); // cancel - GtkWidget *cancelButton = gtk_button_new_with_label("Cancel"); + GtkWidget *cancelButton = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(buttonBox),cancelButton,FALSE,TRUE,0); // hook up signals @@ -322,7 +323,7 @@ mWindow = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_position(GTK_WINDOW(mWindow), GTK_WIN_POS_MOUSE); - gtk_window_set_title(GTK_WINDOW(mWindow), "SkipStone Prompt"); + gtk_window_set_title(GTK_WINDOW(mWindow), _("SkipStone Prompt")); GtkBox *topLevelVBox = GTK_BOX(gtk_vbox_new(FALSE, 3)); gtk_container_add(GTK_CONTAINER(mWindow), GTK_WIDGET(topLevelVBox)); gtk_container_set_border_width(GTK_CONTAINER(mWindow),4); @@ -358,13 +359,13 @@ gtk_box_pack_start(topLevelVBox,GTK_WIDGET(buttonBox),FALSE,FALSE,0); // OK - GtkWidget *okButton = gtk_button_new_with_label("OK"); + GtkWidget *okButton = gtk_button_new_with_label(_("OK")); ok = okButton; gtk_box_pack_start(GTK_BOX(buttonBox),okButton,FALSE,TRUE,0); if (aFlags & SkipStonePrompter::INCLUDE_CANCEL) { // cancel - GtkWidget *cancelButton = gtk_button_new_with_label("Cancel"); + GtkWidget *cancelButton = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(buttonBox),cancelButton,FALSE,TRUE,0); gtk_signal_connect(GTK_OBJECT(cancelButton), "clicked", GTK_SIGNAL_FUNC(cancel_clicked_cb), this); diff -Nur skipstone-bak/src/crash.c skipstone/src/crash.c --- skipstone-bak/src/crash.c Wed Jun 6 11:44:25 2001 +++ skipstone/src/crash.c Fri Jul 13 19:11:13 2001 @@ -24,7 +24,7 @@ gchar *url; FILE *url_file; - g_print("Creating a crash recovery file\n"); + g_print(_("Creating a crash recovery file\n")); path = g_strconcat(home,"/.skipstone/crash_data",NULL); url_file = fopen(path,"w"); @@ -45,7 +45,7 @@ gchar *duped; gtk_clist_get_text(GTK_CLIST(clist), row, column, &text); - g_print("recovering %s\n",text); + g_print(_("recovering %s\n"),text); duped = g_strdup(text); gtk_clist_remove(GTK_CLIST(clist),row); make_window(duped); diff -Nur skipstone-bak/src/encoding.c skipstone/src/encoding.c --- skipstone-bak/src/encoding.c Fri Jul 13 18:05:49 2001 +++ skipstone/src/encoding.c Fri Jul 13 19:11:13 2001 @@ -16,7 +16,7 @@ retmenu = gtk_menu_new(); real_return = retmenu; for (i = 0; default_charset_settings[i] != NULL; ++i) { - item = gtk_menu_item_new_with_label(default_charset_settings[i]); + item = gtk_menu_item_new_with_label(_(default_charset_settings[i])); gtk_object_set_data(GTK_OBJECT(item), "charset", default_charset_names[i]); gtk_signal_connect(GTK_OBJECT(item), "activate", GTK_SIGNAL_FUNC(skipstone_force_charset), skipstone); diff -Nur skipstone-bak/src/moz_callbacks.c skipstone/src/moz_callbacks.c --- skipstone-bak/src/moz_callbacks.c Fri Jul 6 03:34:23 2001 +++ skipstone/src/moz_callbacks.c Fri Jul 13 19:11:20 2001 @@ -54,7 +54,7 @@ if (title) skipstone->notebook_label = gtk_label_new(title); else - skipstone->notebook_label = gtk_label_new("SkipStone -"); + skipstone->notebook_label = gtk_label_new(_("SkipStone -")); skipstone->is_notebook = 1; @@ -131,11 +131,11 @@ if (!title || !strcmp(title,"")) title = _("Untitled Document"); if (!config.show_tabs && g_slist_length(window_count) == 1) { - gchar *t = g_strdup_printf("SkipStone - %s", title); + gchar *t = g_strdup_printf(_("SkipStone - %s"), title); gtk_window_set_title(GTK_WINDOW(main_window), t); g_free(t); } else { - gchar *tt = g_strdup_printf("SkipStone %d.%d.%d", SKIPSTONE_MAJOR, SKIPSTONE_MINOR, SKIPSTONE_MICRO); + gchar *tt = g_strdup_printf(_("SkipStone %d.%d.%d"), SKIPSTONE_MAJOR, SKIPSTONE_MINOR, SKIPSTONE_MICRO); gtk_window_set_title(GTK_WINDOW(main_window), tt); g_free(tt); } @@ -340,7 +340,7 @@ } else if (type & CONTEXT_DOCUMENT) { gtk_menu_popup(GTK_MENU(get_doc_popup_menu(skipstone,href)), NULL, NULL, NULL, NULL, GDK_BUTTON3_MASK, -1); } else if (type & CONTEXT_OTHER) { - g_print("clicked on some other components\n"); + g_print(_("clicked on some other components\n")); } return TRUE; break; diff -Nur skipstone-bak/src/skipdownload.c skipstone/src/skipdownload.c --- skipstone-bak/src/skipdownload.c Wed Jun 27 03:21:38 2001 +++ skipstone/src/skipdownload.c Fri Jul 13 19:11:20 2001 @@ -5,6 +5,7 @@ #include "skipdownload.h" +#include "intl.h" GtkWidget *clist = NULL; GSList *file_list = NULL; @@ -17,7 +18,7 @@ data->type = type; data->url = g_strdup(url); - data->fs = gtk_file_selection_new("Select Directory or File"); + data->fs = gtk_file_selection_new(_("Select Directory or File")); gtk_signal_connect(GTK_OBJECT(data->fs), "destroy", GTK_SIGNAL_FUNC(destroy_fs), data); gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(data->fs)->cancel_button), "clicked", GTK_SIGNAL_FUNC(cancel_fs), data); @@ -77,7 +78,7 @@ if (stat (locdir, &buf) == -1) { /* It doesn't !?!?!? Shame. */ - g_print ("Sorry, you need to specify a path that does not contain nonexistant directories."); + g_print (_("Sorry, you need to specify a path that does not contain nonexistant directories.")); return; } } @@ -382,11 +383,11 @@ GtkWidget *remove; GtkWidget *main_win; - gchar *titles[2] = {"Url","Location"}; + gchar *titles[2] = {_("Url"),_("Location")}; main_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_signal_connect(GTK_OBJECT(main_win), "destroy", GTK_SIGNAL_FUNC(on_clist_window_destroy), NULL); - gtk_window_set_title(GTK_WINDOW(main_win), "Skipdownload Queue"); + gtk_window_set_title(GTK_WINDOW(main_win), _("Skipdownload Queue")); gtk_window_set_default_size(GTK_WINDOW(main_win), 600, 0); sw = gtk_scrolled_window_new(NULL,NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -399,8 +400,8 @@ gtk_container_add(GTK_CONTAINER(main_win), vbox); gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, FALSE); - insert = gtk_button_new_with_label("Insert"); - remove = gtk_button_new_with_label("Remove"); + insert = gtk_button_new_with_label(_("Insert")); + remove = gtk_button_new_with_label(_("Remove")); gtk_signal_connect(GTK_OBJECT(remove), "clicked", GTK_SIGNAL_FUNC(remove_item_from_clist), NULL); gtk_signal_connect(GTK_OBJECT(insert), "clicked", GTK_SIGNAL_FUNC(insert_in_clist), NULL); btnbox = gtk_hbox_new(0,0); @@ -429,16 +430,16 @@ idata = g_new0(InsertData,1); idata->dialog = gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(idata->dialog), "Insert a new url"); - lbl = gtk_label_new("Url"); - lbl2 = gtk_label_new("Location"); - select = gtk_button_new_with_label("Select"); + gtk_window_set_title(GTK_WINDOW(idata->dialog), _("Insert a new url")); + lbl = gtk_label_new(_("Url")); + lbl2 = gtk_label_new(_("Location")); + select = gtk_button_new_with_label(_("Select")); idata->entry = gtk_entry_new(); idata->location = gtk_entry_new(); hbox = gtk_hbox_new(0,0); hbox2 = gtk_hbox_new(0,0); - ok = gtk_button_new_with_label("Ok"); - cancel = gtk_button_new_with_label("Cancel"); + ok = gtk_button_new_with_label(_("Ok")); + cancel = gtk_button_new_with_label(_("Cancel")); gtk_entry_set_text(GTK_ENTRY(idata->location), home_dir); @@ -467,7 +468,7 @@ static void on_select_clicked(GtkWidget *button, InsertData *idata) { - idata->fs = gtk_file_selection_new("Select Directory"); + idata->fs = gtk_file_selection_new(_("Select Directory")); gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(idata->fs)->cancel_button), "clicked", GTK_SIGNAL_FUNC(close_fs_from_insert), idata); gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(idata->fs)->ok_button), "clicked", GTK_SIGNAL_FUNC(ok_from_insert_fs), idata); gtk_widget_show_all(idata->fs); @@ -554,7 +555,7 @@ win = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width(GTK_CONTAINER(win), 15); - gtk_window_set_title(GTK_WINDOW(win), "SkipDownload"); + gtk_window_set_title(GTK_WINDOW(win), _("SkipDownload")); adj = gtk_adjustment_new(0,1,100,0,0,0); bar = gtk_progress_bar_new_with_adjustment(GTK_ADJUSTMENT(adj)); size_lbl = gtk_label_new(""); @@ -562,7 +563,7 @@ bps_lbl = gtk_label_new(""); gtk_entry_set_editable(GTK_ENTRY(entry),FALSE); gtk_widget_set_usize(entry,300,0); - gtk_entry_set_text(GTK_ENTRY(entry),"Preparing ..."); + gtk_entry_set_text(GTK_ENTRY(entry),_("Preparing ...")); vbox = gtk_vbox_new(0,0); gtk_progress_set_show_text(GTK_PROGRESS(bar), TRUE); @@ -602,7 +603,7 @@ gint main(gint argc, gchar *argv[]) { if (argc < 2) { - g_print("Usage: skipdownload url\n"); + g_print(_("Usage: skipdownload url\n")); exit(0); } home = getenv("HOME"); diff -Nur skipstone-bak/src/skipstone-config.c skipstone/src/skipstone-config.c --- skipstone-bak/src/skipstone-config.c Fri Jul 13 18:05:50 2001 +++ skipstone/src/skipstone-config.c Fri Jul 13 19:11:20 2001 @@ -114,7 +114,7 @@ /* insert nodes */ for (i = 0; i < 9; i++) { GtkCTreeNode *node; - gchar *name[1] = {nodes[i].node}; + gchar *name[1] = {_(nodes[i].node)}; if (i < 5) node = gtk_ctree_insert_node(GTK_CTREE(config_window->ctree), NULL, NULL, name, 5, NULL, NULL, NULL, NULL, FALSE, TRUE); else @@ -703,7 +703,7 @@ for (i = 0; i < 9; i++) { GtkWidget *menu_item; - menu_item = gtk_menu_item_new_with_label(language_settings[i]); + menu_item = gtk_menu_item_new_with_label(_(language_settings[i])); gtk_object_set_data(GTK_OBJECT(menu_item),"language_setting",GINT_TO_POINTER(i)); gtk_menu_append(GTK_MENU(config_window->language_menu), menu_item); } @@ -724,7 +724,7 @@ if (!charset_list_done) { for (i = 0; default_charset_settings[i] != NULL ; i++) { - charset_items = g_list_append (charset_items, default_charset_settings[i]); + charset_items = g_list_append (charset_items, _(default_charset_settings[i])); } charset_list_done = 1; } @@ -1000,10 +1000,10 @@ - +#define ACCEPT_LANG_NUM 66 gchar *accept_languages_setup_or_lookup(GtkWidget *clist, gint lookup_only) { - gchar *accept_languages_settings[] = { + gchar *accept_languages_settings[ACCEPT_LANG_NUM] = { _("Afrikaans (af)"), _("Albanian (sq)"), _("Arabic (ar)"), @@ -1077,7 +1077,7 @@ if (lookup_only) { strcpy(buffer, ""); - for(i=0;i<66; i++) + for(i=0;i