diff -Nur skipstone-0.7.3-bak/src/SkipStonePrompter.cpp skipstone-0.7.3/src/SkipStonePrompter.cpp --- skipstone-0.7.3-bak/src/SkipStonePrompter.cpp Tue Jun 12 03:23:13 2001 +++ skipstone-0.7.3/src/SkipStonePrompter.cpp Wed Jul 11 21:23:37 2001 @@ -1,6 +1,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); @@ -220,7 +221,7 @@ { mWindow = gtk_window_new(GTK_WINDOW_DIALOG); - 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)); @@ -232,7 +233,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(); @@ -248,7 +249,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(); @@ -280,10 +281,10 @@ // OK - GtkWidget *okButton = gtk_button_new_with_label("OK"); + GtkWidget *okButton = gtk_button_new_with_label(_("OK")); 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 @@ -302,7 +303,7 @@ { mWindow = gtk_window_new(GTK_WINDOW_DIALOG); - 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); @@ -338,12 +339,12 @@ 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")); 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-0.7.3-bak/src/crash.c skipstone-0.7.3/src/crash.c --- skipstone-0.7.3-bak/src/crash.c Tue Jun 12 03:23:13 2001 +++ skipstone-0.7.3/src/crash.c Wed Jul 11 21:23:37 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-0.7.3-bak/src/moz_callbacks.c skipstone-0.7.3/src/moz_callbacks.c --- skipstone-0.7.3-bak/src/moz_callbacks.c Tue Jun 12 03:23:13 2001 +++ skipstone-0.7.3/src/moz_callbacks.c Wed Jul 11 21:24:46 2001 @@ -51,7 +51,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; @@ -127,7 +127,7 @@ title = gtk_moz_embed_get_title(skipstone->embed); if (!title || !strcmp("",title)) { - gtk_label_set_text(GTK_LABEL(skipstone->notebook_label), "No title"); + gtk_label_set_text(GTK_LABEL(skipstone->notebook_label), _("No title")); } else { gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(main_notebook), skipstone->vbox, title); @@ -137,11 +137,11 @@ } 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); } @@ -271,7 +271,7 @@ { SkipStone *skipstone; skipstone = new_skipstone_window (FALSE); - g_print("Created orphan window\n"); + g_print(_("Created orphan window\n")); if (!(chromemask & GTK_MOZ_EMBED_FLAG_MENUBARON)) gtk_widget_hide(skipstone->menubar); if (!(chromemask & GTK_MOZ_EMBED_FLAG_TOOLBARON)) { @@ -342,7 +342,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-0.7.3-bak/src/skipdownload.c skipstone-0.7.3/src/skipdownload.c --- skipstone-0.7.3-bak/src/skipdownload.c Tue Jun 12 03:23:13 2001 +++ skipstone-0.7.3/src/skipdownload.c Wed Jul 11 21:23:37 2001 @@ -1,6 +1,7 @@ /* Skipdownload, a front end to wget, */ #include "skipdownload.h" +#include "intl.h" GtkWidget *clist = NULL; GSList *file_list = NULL; @@ -13,7 +14,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); @@ -73,7 +74,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; } } @@ -378,11 +379,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); @@ -395,8 +396,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); @@ -425,16 +426,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); @@ -463,7 +464,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); @@ -550,7 +551,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(""); @@ -558,7 +559,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); @@ -598,7 +599,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-0.7.3-bak/src/skipstone-config.c skipstone-0.7.3/src/skipstone-config.c --- skipstone-0.7.3-bak/src/skipstone-config.c Tue Jun 12 03:23:13 2001 +++ skipstone-0.7.3/src/skipstone-config.c Wed Jul 11 21:23:37 2001 @@ -110,7 +110,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 @@ -677,7 +677,7 @@ _("Central European (Windows-1250)"), _("Chinese Simplified (GB2312)"), _("Chinese Simplified (GBK)"), - _("Central European (HZ)"), + _("Chinese Simplified (HZ)"), _("Chinese Traditional (Big5)"), _("Chinese Traditional (EUC-TW)"), _("Croatian (MacCroatian)"), @@ -1034,10 +1034,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)"), @@ -1046,36 +1046,64 @@ _("Byelorussian (be)"), _("Catalan (ca)"), _("Chinese (zh)"), + _("Chinese/China (zh-cn)"), + _("Chinese/Taiwan (zh-tw)"), _("Croatian (hr)"), _("Czech (cs)"), _("Danish (da)"), _("Dutch (nl)"), + _("Dutch/Belgium (nl-be)"), _("English (en)"), + _("English/Australia (en-au)"), + _("English/United Kingdom (en-gb)"), + _("English/United States (en-us)"), + _("Esperanto (eo)"), _("Estonian (et)"), _("Faeroese (fo)"), _("Finnish (fi)"), _("French (fr)"), + _("French/Belgium (fr-be)"), + _("French/Canada (fr-ca)"), + _("French/France (fr-fr)"), + _("French/Switzerland (fr-ch)"), _("Galician (gl)"), _("German (de)"), + _("German/Austria (de-at)"), + _("German/Germany (de-de)"), + _("German/Switzerland (de-ch)"), _("Greek (el)"), + _("Hebrew (he)"), _("Hungarian (hu)"), _("Icelandic (is)"), _("Indonesian (id)"), + _("Indonesian (in)"), _("Irish (ga)"), + _("Italian (it)"), + _("Japanese (ja)"), _("Korean (ko)"), - _("Macedonian (mk)"), + _("Latvian (lv)"), + _("Lithuanian (lt)"), + _("Macedonian(mk)"), _("Norwegian (no)"), + _("Norwegian Bokmal (nb)"), + _("Norwegian Nynorsk (nn)"), _("Polish (pl)"), _("Portoguese (pt)"), + _("Portoguese/Brazil (pt-br)"), _("Romanian (ro)"), _("Russian (ru)"), - _("Serbian (gd)"), + _("Scots Gaelic (gd)"), + _("Serbian (sr)"), _("Slovak (sk)"), _("Slovenian (sl)"), _("Spanish (es)"), - _("Swedish (sv)"), + _("Spanish/Argentina (es-ar)"), + _("Spanish/Colombia (es-co)"), + _("Spanish/Mexico (es-mx)"), + _("Spanish/Spain (es-es)"), + _("Swedish/ (sv)"), _("Turkish (tr)"), - _("Ukrainian (uk)") + _("Ukrainian (uk)"), }; gint i, j, count=0, length, languages_count, lbound; gchar buffer[128], lang[5], *ptr, *language, *languages_return; @@ -1083,7 +1111,7 @@ if (lookup_only) { strcpy(buffer, ""); - for(i=0; i< 38; i++) + for(i=0; i < ACCEPT_LANG_NUM; i++) { if (config.accept_languages_temp[i] == '1') { @@ -1113,8 +1141,8 @@ else { g_free(config.accept_languages_temp); - config.accept_languages_temp = (gchar *) malloc(38); - for (i = 0; i < 38; i++) { + config.accept_languages_temp = g_malloc(sizeof (gchar) * ACCEPT_LANG_NUM); + for (i = 0; i < ACCEPT_LANG_NUM; i++) { gchar *clist_entry[1]; clist_entry[0] = (gchar *)g_strdup(accept_languages_settings[i]); gtk_clist_append(GTK_CLIST(clist), @@ -1131,7 +1159,7 @@ strncat(lang, ptr, 2); strcat(lang, ")"); lang[4] = '\0'; - for (j = lbound; j < 38; j++) { + for (j = lbound; j < ACCEPT_LANG_NUM; j++) { if (strstr(accept_languages_settings[j], lang)) { config.accept_languages_temp[j] = '1'; @@ -1140,7 +1168,7 @@ break; } } - if (j == 38) + if (j == ACCEPT_LANG_NUM) lbound = 0; /* Search from beginning */ ptr += 3; }