Mercurial > pidgin.yaz
changeset 350:fd3cc0a28d5d
[gaim-migrate @ 360]
Some locale stuff
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Wed, 07 Jun 2000 18:33:21 +0000 |
parents | b402a23f35df |
children | 22161278657c |
files | src/aim.c src/away.c src/buddy.c src/buddy_chat.c src/conversation.c src/dialogs.c src/gnome_applet_mgr.c src/html.c src/oscar.c src/plugins.c src/rvous.c |
diffstat | 11 files changed, 335 insertions(+), 342 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aim.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/aim.c Wed Jun 07 18:33:21 2000 +0000 @@ -298,12 +298,12 @@ } mainwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); - signon = gtk_button_new_with_label("Signon"); - cancel = gtk_button_new_with_label("Cancel"); - reg = gtk_button_new_with_label("Register"); - options = gtk_button_new_with_label("Options"); + signon = gtk_button_new_with_label(_("Signon")); + cancel = gtk_button_new_with_label(_("Cancel")); + reg = gtk_button_new_with_label(_("Register")); + options = gtk_button_new_with_label(_("Options")); #ifdef GAIM_PLUGINS - plugs = gtk_button_new_with_label("Plugins"); + plugs = gtk_button_new_with_label(_("Plugins")); #endif table = gtk_table_new(8, 2, FALSE); name = gtk_combo_new(); @@ -366,13 +366,13 @@ gtk_table_attach(GTK_TABLE(table), label, 0,1,1,2,0,0, 5, 5); gtk_widget_show(label); #endif - label = gtk_label_new("Screen Name: "); + label = gtk_label_new(_("Screen Name: ")); gtk_table_attach(GTK_TABLE(table), label, 0,1,2,3,0,0, 5, 5); gtk_widget_show(label); - label = gtk_label_new("Password: "); + label = gtk_label_new(_("Password: ")); gtk_table_attach(GTK_TABLE(table), label, 0,1,3,4,0,0, 5, 5); gtk_widget_show(label); - remember = gtk_check_button_new_with_label("Remember Password"); + remember = gtk_check_button_new_with_label(_("Remember Password")); gtk_table_attach(GTK_TABLE(table), remember, 0,2,4,5,0,0, 5, 5); gtk_widget_show(remember);
--- a/src/away.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/away.c Wed Jun 07 18:33:21 2000 +0000 @@ -108,7 +108,7 @@ imaway = gtk_window_new(GTK_WINDOW_DIALOG); gtk_widget_realize(imaway); aol_icon(imaway->window); - back = gtk_button_new_with_label("I'm Back!"); + back = gtk_button_new_with_label(_("I'm Back!")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); @@ -148,7 +148,7 @@ if (strlen(a->name)) gtk_window_set_title(GTK_WINDOW(imaway), a->name); else - gtk_window_set_title(GTK_WINDOW(imaway), "Gaim - Away!"); + gtk_window_set_title(GTK_WINDOW(imaway), _("Gaim - Away!")); gtk_window_set_focus(GTK_WINDOW(imaway), back); gtk_container_add(GTK_CONTAINER(imaway), vbox); awaymessage = a; @@ -261,7 +261,7 @@ - menuitem = gtk_menu_item_new_with_label("New Away Message"); + menuitem = gtk_menu_item_new_with_label(_("New Away Message")); gtk_menu_append(GTK_MENU(awaymenu), menuitem); gtk_widget_show(menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(create_away_mess), NULL); @@ -280,7 +280,7 @@ } - menuitem = gtk_menu_item_new_with_label("Remove Away Message"); + menuitem = gtk_menu_item_new_with_label(_("Remove Away Message")); gtk_menu_append(GTK_MENU(awaymenu), menuitem); gtk_widget_show(menuitem); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), remmenu);
--- a/src/buddy.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/buddy.c Wed Jun 07 18:33:21 2000 +0000 @@ -140,7 +140,7 @@ grp = grp->next; } #ifdef USE_APPLET - g_snprintf(buf, sizeof(buf), "%d/%d Buddies Online", onl, all); + g_snprintf(buf, sizeof(buf), _("%d/%d Buddies Online"), onl, all); applet_set_tooltips(buf); #endif } @@ -267,21 +267,21 @@ { if (display_options & OPT_DISP_DEVIL_PIXMAPS) { - adjust_pic(addbutton, "Add", (gchar **)daemon_buddyadd_xpm); - adjust_pic(rembutton, "Remove", (gchar **)daemon_buddydel_xpm); - adjust_pic(chatbutton, "Chat", (gchar **)daemon_buddychat_xpm); - adjust_pic(imbutton, "IM", (gchar **)daemon_im_xpm); - adjust_pic(infobutton, "Info", (gchar **)daemon_info_xpm); - adjust_pic(addpermbutton, "Add", (gchar **)daemon_permadd_xpm); - adjust_pic(rempermbutton, "Remove", (gchar **)daemon_permdel_xpm); + adjust_pic(addbutton, _("Add"), (gchar **)daemon_buddyadd_xpm); + adjust_pic(rembutton, _("Remove"), (gchar **)daemon_buddydel_xpm); + adjust_pic(chatbutton, _("Chat"), (gchar **)daemon_buddychat_xpm); + adjust_pic(imbutton, _("IM"), (gchar **)daemon_im_xpm); + adjust_pic(infobutton, _("Info"), (gchar **)daemon_info_xpm); + adjust_pic(addpermbutton, _("Add"), (gchar **)daemon_permadd_xpm); + adjust_pic(rempermbutton, _("Remove"), (gchar **)daemon_permdel_xpm); } else { - adjust_pic(addbutton, "Add", (gchar **)buddyadd_xpm); - adjust_pic(rembutton, "Remove", (gchar **)buddydel_xpm); - adjust_pic(chatbutton, "Chat", (gchar **)buddychat_xpm); - adjust_pic(imbutton, "IM", (gchar **)im_xpm); - adjust_pic(infobutton, "Info", (gchar **)info_xpm); - adjust_pic(addpermbutton, "Add", (gchar **)permadd_xpm); - adjust_pic(rempermbutton, "Remove", (gchar **)permdel_xpm); + adjust_pic(addbutton, _("Add"), (gchar **)buddyadd_xpm); + adjust_pic(rembutton, _("Remove"), (gchar **)buddydel_xpm); + adjust_pic(chatbutton, _("Chat"), (gchar **)buddychat_xpm); + adjust_pic(imbutton, _("IM"), (gchar **)im_xpm); + adjust_pic(infobutton, _("Info"), (gchar **)info_xpm); + adjust_pic(addpermbutton, _("Add"), (gchar **)permadd_xpm); + adjust_pic(rempermbutton, _("Remove"), (gchar **)permdel_xpm); } } @@ -431,39 +431,39 @@ menu = gtk_menu_new(); - button = gtk_menu_item_new_with_label("IM"); + button = gtk_menu_item_new_with_label(_("IM")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); - button = gtk_menu_item_new_with_label("Info"); + button = gtk_menu_item_new_with_label(_("Info")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_info), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); - button = gtk_menu_item_new_with_label("Dir Info"); + button = gtk_menu_item_new_with_label(_("Dir Info")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_dir_info), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); #ifdef USE_OSCAR /* FIXME : someday maybe TOC can do this too */ - button = gtk_menu_item_new_with_label("Away Msg"); + button = gtk_menu_item_new_with_label(_("Away Msg")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_away_msg), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); #endif - button = gtk_menu_item_new_with_label("Toggle Logging"); + button = gtk_menu_item_new_with_label(_("Toggle Logging")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(log_callback), b->name); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); - button = gtk_menu_item_new_with_label("Add Buddy Pounce"); + button = gtk_menu_item_new_with_label(_("Add Buddy Pounce")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(new_bp_callback), b->name); gtk_menu_append(GTK_MENU(menu), button); @@ -566,7 +566,7 @@ gtk_tree_clear_items(GTK_TREE(permtree), 0, -1); - ti = gtk_tree_item_new_with_label("Permit"); + ti = gtk_tree_item_new_with_label(_("Permit")); sub = gtk_tree_new(); gtk_widget_show(ti); gtk_widget_show(sub); @@ -582,7 +582,7 @@ } - ti = gtk_tree_item_new_with_label("Deny"); + ti = gtk_tree_item_new_with_label(_("Deny")); sub = gtk_tree_new(); gtk_widget_show(ti); gtk_widget_show(sub); @@ -1014,7 +1014,7 @@ pitem = GTK_WIDGET(GTK_TREE(item->parent)->tree_owner); plabel = GTK_LABEL(GTK_BIN(pitem)->child); gtk_label_get(plabel, &d); - if (!strcasecmp(d, "Permit")) { + if (!strcasecmp(d, _("Permit"))) { while(plist) { if (!strcasecmp((char *)(plist->data), c)) { permit = g_list_remove(permit, plist->data); @@ -1295,7 +1295,7 @@ remmenu = gtk_menu_new(); - menuitem = gtk_menu_item_new_with_label("New Buddy Pounce"); + menuitem = gtk_menu_item_new_with_label(_("New Buddy Pounce")); gtk_menu_append(GTK_MENU(bpmenu), menuitem); gtk_widget_show(menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(new_bp_callback), NULL); @@ -1313,7 +1313,7 @@ } - menuitem = gtk_menu_item_new_with_label("Remove Buddy Pounce"); + menuitem = gtk_menu_item_new_with_label(_("Remove Buddy Pounce")); gtk_menu_append(GTK_MENU(bpmenu), menuitem); gtk_widget_show(menuitem); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), remmenu); @@ -1422,12 +1422,12 @@ } if (b->evil) { - g_snprintf(warn, sizeof(warn), "Warnings: %d%%\n", b->evil); + g_snprintf(warn, sizeof(warn), _("Warnings: %d%%\n"), b->evil); } else warn[0] = '\0'; - i = g_snprintf(infotip, sizeof(infotip), "Name: %s \nLogged in: %s\n%s%s%s", b->name, sotime, warn, ((b->idle) ? "Idle: " : ""), itime); + i = g_snprintf(infotip, sizeof(infotip), _("Name: %s \nLogged in: %s\n%s%s%s"), b->name, sotime, warn, ((b->idle) ? _("Idle: ") : ""), itime); gtk_tooltips_set_tip(tips, GTK_WIDGET(b->item), infotip, ""); @@ -1475,7 +1475,7 @@ char tmp[1024]; - g_snprintf(tmp, sizeof(tmp), "<HR><B>%s logged in%s%s.</B><BR><HR>", b->name, + g_snprintf(tmp, sizeof(tmp), _("<HR><B>%s logged in%s%s.</B><BR><HR>"), b->name, ((display_options & OPT_DISP_SHOW_TIME) ? " @ " : ""), ((display_options & OPT_DISP_SHOW_TIME) ? date() : "")); @@ -1573,7 +1573,7 @@ char tmp[1024]; - g_snprintf(tmp, sizeof(tmp), "<HR><B>%s logged out%s%s.</B><BR><HR>", b->name, + g_snprintf(tmp, sizeof(tmp), _("<HR><B>%s logged out%s%s.</B><BR><HR>"), b->name, ((display_options & OPT_DISP_SHOW_TIME) ? " @ " : ""), ((display_options & OPT_DISP_SHOW_TIME) ? date() : "")); @@ -1706,41 +1706,41 @@ menu = gtk_menu_new(); - menuitem = gaim_new_item(NULL, "File", NULL); + menuitem = gaim_new_item(NULL, _("File"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); - gaim_new_item(menu, "Add A Buddy", GTK_SIGNAL_FUNC(add_buddy_callback)); + gaim_new_item(menu, _("Add A Buddy"), GTK_SIGNAL_FUNC(add_buddy_callback)); gaim_seperator(menu); - gaim_new_item(menu, "Import Buddy List", GTK_SIGNAL_FUNC(import_callback)); - gaim_new_item(menu, "Export Buddy List", GTK_SIGNAL_FUNC(export_callback)); + gaim_new_item(menu, _("Import Buddy List"), GTK_SIGNAL_FUNC(import_callback)); + gaim_new_item(menu, _("Export Buddy List"), GTK_SIGNAL_FUNC(export_callback)); if (!(general_options & OPT_GEN_REGISTERED)) { gaim_seperator(menu); - gaim_new_item(menu, "Register", GTK_SIGNAL_FUNC(gaimreg_callback)); + gaim_new_item(menu, _("Register"), GTK_SIGNAL_FUNC(gaimreg_callback)); } gaim_seperator(menu); - gaim_new_item(menu, "Signoff", GTK_SIGNAL_FUNC(signoff)); + gaim_new_item(menu, _("Signoff"), GTK_SIGNAL_FUNC(signoff)); #ifndef USE_APPLET - gaim_new_item(menu, "Quit", GTK_SIGNAL_FUNC(do_quit)); + gaim_new_item(menu, _("Quit"), GTK_SIGNAL_FUNC(do_quit)); #else - gaim_new_item(menu, "Close", GTK_SIGNAL_FUNC(applet_destroy_buddy)); + gaim_new_item(menu, _("Close"), GTK_SIGNAL_FUNC(applet_destroy_buddy)); #endif menu = gtk_menu_new(); - menuitem = gaim_new_item(NULL, "Tools", NULL); + menuitem = gaim_new_item(NULL, _("Tools"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); awaymenu = gtk_menu_new(); - menuitem = gaim_new_item(menu, "Away", NULL); + menuitem = gaim_new_item(menu, _("Away"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), awaymenu); do_away_menu(); bpmenu = gtk_menu_new(); - menuitem = gaim_new_item(menu, "Buddy Pounce", NULL); + menuitem = gaim_new_item(menu, _("Buddy Pounce"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), bpmenu); do_bp_menu(); @@ -1748,51 +1748,51 @@ findmenu = gtk_menu_new(); gtk_widget_show(findmenu); - menuitem = gaim_new_item(menu, "Search for Buddy", NULL); + menuitem = gaim_new_item(menu, _("Search for Buddy"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), findmenu); gtk_widget_show(menuitem); - menuitem = gtk_menu_item_new_with_label("by Email"); + menuitem = gtk_menu_item_new_with_label(_("by Email")); gtk_menu_append(GTK_MENU(findmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_find_email), NULL); gtk_widget_show(menuitem); - menuitem = gtk_menu_item_new_with_label("by Dir Info"); + menuitem = gtk_menu_item_new_with_label(_("by Dir Info")); gtk_menu_append(GTK_MENU(findmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_find_info), NULL); gtk_widget_show(menuitem); setmenu = gtk_menu_new(); gtk_widget_show(setmenu); - menuitem = gaim_new_item(menu, "Settings", NULL); + menuitem = gaim_new_item(menu, _("Settings"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), setmenu); gtk_widget_show(menuitem); - menuitem = gtk_menu_item_new_with_label("User Info"); + menuitem = gtk_menu_item_new_with_label(_("User Info")); gtk_menu_append(GTK_MENU(setmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_set_info), NULL); gtk_widget_show(menuitem); - menuitem = gtk_menu_item_new_with_label("Directory Info"); + menuitem = gtk_menu_item_new_with_label(_("Directory Info")); gtk_menu_append(GTK_MENU(setmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_set_dir), NULL); gtk_widget_show(menuitem); - menuitem = gtk_menu_item_new_with_label("Change Password"); + menuitem = gtk_menu_item_new_with_label(_("Change Password")); gtk_menu_append(GTK_MENU(setmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_change_passwd), NULL); gtk_widget_show(menuitem); gaim_seperator(menu); - gaim_new_item(menu, "Preferences", GTK_SIGNAL_FUNC(show_prefs)); + gaim_new_item(menu, _("Preferences"), GTK_SIGNAL_FUNC(show_prefs)); #ifdef GAIM_PLUGINS - gaim_new_item(menu, "Plugins", GTK_SIGNAL_FUNC(show_plugins)); + gaim_new_item(menu, _("Plugins"), GTK_SIGNAL_FUNC(show_plugins)); #endif menu = gtk_menu_new(); - menuitem = gaim_new_item(NULL, "Help", NULL); + menuitem = gaim_new_item(NULL, _("Help"), NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_item_right_justify(GTK_MENU_ITEM(menuitem)); gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); - gaim_new_item(menu, "About", show_about); + gaim_new_item(menu, _("About"), show_about); gtk_widget_show(menubar); @@ -1826,9 +1826,9 @@ buddypane = gtk_vbox_new(FALSE, 0); - imbutton = gtk_button_new_with_label("IM"); - infobutton = gtk_button_new_with_label("Info"); - chatbutton = gtk_button_new_with_label("Chat"); + imbutton = gtk_button_new_with_label(_("IM")); + infobutton = gtk_button_new_with_label(_("Info")); + chatbutton = gtk_button_new_with_label(_("Chat")); hbox = gtk_hbox_new(TRUE, 10); @@ -1840,7 +1840,7 @@ tips = gtk_tooltips_new(); - gtk_object_set_data(GTK_OBJECT(blist), "Buddy List", tips); + gtk_object_set_data(GTK_OBJECT(blist), _("Buddy List"), tips); @@ -1863,9 +1863,9 @@ gtk_container_border_width(GTK_CONTAINER(hbox), 10); - gtk_tooltips_set_tip(tips,infobutton, "Information on selected Buddy", "Penguin"); - gtk_tooltips_set_tip(tips,imbutton, "Send Instant Message", "Penguin"); - gtk_tooltips_set_tip(tips,chatbutton, "Start/join a Buddy Chat", "Penguin"); + gtk_tooltips_set_tip(tips,infobutton, _("Information on selected Buddy"), "Penguin"); + gtk_tooltips_set_tip(tips,imbutton, _("Send Instant Message"), "Penguin"); + gtk_tooltips_set_tip(tips,chatbutton, _("Start/join a Buddy Chat"), "Penguin"); gtk_box_pack_start(GTK_BOX(buddypane), sw, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(buddypane), hbox, FALSE, FALSE, 0); @@ -1879,8 +1879,8 @@ editpane = gtk_vbox_new(FALSE, 0); - addbutton = gtk_button_new_with_label("Add"); - rembutton = gtk_button_new_with_label("Remove"); + addbutton = gtk_button_new_with_label(_("Add")); + rembutton = gtk_button_new_with_label(_("Remove")); edittree = gtk_ctree_new(1, 0); gtk_ctree_set_line_style (GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID); gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE); @@ -1900,8 +1900,8 @@ gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), rembutton, TRUE, TRUE, 10); - gtk_tooltips_set_tip(tips, addbutton, "Add a new Buddy", "Penguin"); - gtk_tooltips_set_tip(tips, rembutton, "Remove selected Buddy", "Penguin"); + gtk_tooltips_set_tip(tips, addbutton, _("Add a new Buddy"), "Penguin"); + gtk_tooltips_set_tip(tips, rembutton, _("Remove selected Buddy"), "Penguin"); /* And the boxes in the box */ gtk_box_pack_start(GTK_BOX(editpane), tbox, TRUE, TRUE, 5); @@ -1924,14 +1924,14 @@ permitpane = gtk_vbox_new(FALSE, 0); - permopt = gtk_radio_button_new_with_label(NULL, "Allow anyone"); + permopt = gtk_radio_button_new_with_label(NULL, _("Allow anyone")); gtk_box_pack_start(GTK_BOX(permitpane), permopt, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(permopt), "clicked", GTK_SIGNAL_FUNC(set_permit), (void *)1); gtk_widget_show(permopt); if (permdeny == 1) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(permopt), TRUE); - permopt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(permopt)), "Permit some"); + permopt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(permopt)), _("Permit some")); gtk_box_pack_start(GTK_BOX(permitpane), permopt, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(permopt), "clicked", GTK_SIGNAL_FUNC(set_permit), (void *)3); gtk_widget_show(permopt); @@ -1939,7 +1939,7 @@ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(permopt), TRUE); - permopt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(permopt)), "Deny some"); + permopt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(permopt)), _("Deny some")); gtk_box_pack_start(GTK_BOX(permitpane), permopt, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(permopt), "clicked", GTK_SIGNAL_FUNC(set_permit), (void *)4); gtk_widget_show(permopt); @@ -1948,8 +1948,8 @@ - addpermbutton = gtk_button_new_with_label("Add"); - rempermbutton = gtk_button_new_with_label("Remove"); + addpermbutton = gtk_button_new_with_label(_("Add")); + rempermbutton = gtk_button_new_with_label(_("Remove")); permtree = gtk_tree_new(); build_permit_tree(); @@ -1960,8 +1960,8 @@ gtk_box_pack_start(GTK_BOX(pbox), rempermbutton, TRUE, TRUE, 10); - gtk_tooltips_set_tip(tips, addpermbutton, "Add buddy to permit/deny", "Penguin"); - gtk_tooltips_set_tip(tips, rempermbutton, "Remove buddy from permit/deny", "Penguin"); + gtk_tooltips_set_tip(tips, addpermbutton, _("Add buddy to permit/deny"), "Penguin"); + gtk_tooltips_set_tip(tips, rempermbutton, _("Remove buddy from permit/deny"), "Penguin"); /* And the boxes in the box */ gtk_box_pack_start(GTK_BOX(permitpane), xbox, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(permitpane), pbox, FALSE, FALSE, 5); @@ -1980,11 +1980,11 @@ - label = gtk_label_new("Online"); + label = gtk_label_new(_("Online")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buddypane, label); - label = gtk_label_new("Edit Buddies"); + label = gtk_label_new(_("Edit Buddies")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), editpane, label); - label = gtk_label_new("Permit"); + label = gtk_label_new(_("Permit")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), permitpane, label); gtk_widget_show_all(notebook); @@ -2031,7 +2031,7 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(xbox), GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); - gtk_window_set_title(GTK_WINDOW(blist), "Gaim - Buddy List"); + gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List")); if (general_options & OPT_GEN_SAVED_WINDOWS) { if (blist_pos.width != 0) { /* Sanity check! */
--- a/src/buddy_chat.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/buddy_chat.c Wed Jun 07 18:33:21 2000 +0000 @@ -98,8 +98,8 @@ GtkWidget *topbox; if (!joinchat) { joinchat = gtk_window_new(GTK_WINDOW_TOPLEVEL); - cancel = gtk_button_new_with_label("Cancel"); - join = gtk_button_new_with_label("Join"); + cancel = gtk_button_new_with_label(_("Cancel")); + join = gtk_button_new_with_label(_("Join")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); @@ -109,7 +109,7 @@ gtk_box_pack_start(GTK_BOX(bbox), join, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("Join what group:"); + label = gtk_label_new(_("Join what group:")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), entry, FALSE, FALSE, 5); @@ -135,7 +135,7 @@ gtk_widget_show(topbox); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(joinchat), "Join Chat"); + gtk_window_set_title(GTK_WINDOW(joinchat), _("Join Chat")); gtk_window_set_focus(GTK_WINDOW(joinchat), entry); gtk_container_add(GTK_CONTAINER(joinchat), vbox); gtk_widget_realize(joinchat); @@ -173,8 +173,8 @@ GtkWidget *topbox; if (!invite) { invite = gtk_window_new(GTK_WINDOW_DIALOG); - cancel = gtk_button_new_with_label("Cancel"); - invite_btn = gtk_button_new_with_label("Invite"); + cancel = gtk_button_new_with_label(_("Cancel")); + invite_btn = gtk_button_new_with_label(_("Invite")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); @@ -185,11 +185,11 @@ gtk_box_pack_start(GTK_BOX(bbox), invite_btn, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("Invite who?"); + label = gtk_label_new(_("Invite who?")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), inviteentry, FALSE, FALSE, 5); - label = gtk_label_new("With message:"); + label = gtk_label_new(_("With message:")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), invitemess, FALSE, FALSE, 5); @@ -216,7 +216,7 @@ gtk_widget_show(topbox); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(invite), "Invite to Buddy Chat"); + gtk_window_set_title(GTK_WINDOW(invite), _("Invite to Buddy Chat")); gtk_window_set_focus(GTK_WINDOW(invite), inviteentry); gtk_container_add(GTK_CONTAINER(invite), vbox); gtk_widget_realize(invite); @@ -553,14 +553,14 @@ gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE); - close = gtk_button_new_with_label("Close"); - invite_btn = gtk_button_new_with_label("Invite"); - whisper = gtk_button_new_with_label("Whisper"); - send = gtk_button_new_with_label("Send"); + close = gtk_button_new_with_label(_("Close")); + invite_btn = gtk_button_new_with_label(_("Invite")); + whisper = gtk_button_new_with_label(_("Whisper")); + send = gtk_button_new_with_label(_("Send")); - im = gtk_button_new_with_label("IM"); - ignore = gtk_button_new_with_label("Ignore"); - info = gtk_button_new_with_label("Info"); + im = gtk_button_new_with_label(_("IM")); + ignore = gtk_button_new_with_label(_("Ignore")); + info = gtk_button_new_with_label(_("Info")); text = gtk_html_new(NULL, NULL); @@ -624,29 +624,29 @@ bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "Bold", "Bold Text", "Bold", bold_p, + _("Bold"), _("Bold Text"), _("Bold"), bold_p, GTK_SIGNAL_FUNC(do_bold), chatentry); italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Italics", "Italics Text", - "Italics", italic_p, GTK_SIGNAL_FUNC(do_italic), chatentry); + NULL, _("Italics"), _("Italics Text"), + _("Italics"), italic_p, GTK_SIGNAL_FUNC(do_italic), chatentry); underline = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Underline", "Underline Text", - "Underline", underline_p, GTK_SIGNAL_FUNC(do_underline), chatentry); + NULL, _("Underline"), _("Underline Text"), + _("Underline"), underline_p, GTK_SIGNAL_FUNC(do_underline), chatentry); strike = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Strike", "Strike through Text", - "Strike", strike_p, GTK_SIGNAL_FUNC(do_strike), chatentry); + NULL, _("Strike"), _("Strike through Text"), + _("Strike"), strike_p, GTK_SIGNAL_FUNC(do_strike), chatentry); gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); - small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "Small", "Decrease font size", "Small", small_p, GTK_SIGNAL_FUNC(do_small), chatentry); - normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "Normal", "Normal font size", "Normal", normal_p, GTK_SIGNAL_FUNC(do_normal), chatentry); - big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "Big", "Increase font size", "Big", big_p, GTK_SIGNAL_FUNC(do_big), chatentry); + small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Small"), _("Decrease font size"), _("Small"), small_p, GTK_SIGNAL_FUNC(do_small), chatentry); + normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Normal"), _("Normal font size"), _("Normal"), normal_p, GTK_SIGNAL_FUNC(do_normal), chatentry); + big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Big"), _("Increase font size"), _("Big"), big_p, GTK_SIGNAL_FUNC(do_big), chatentry); gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); link = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), - GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "Link", "Insert Link", - "Link", link_p, GTK_SIGNAL_FUNC(do_link), chatentry); + GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Link"), _("Insert Link"), + _("Link"), link_p, GTK_SIGNAL_FUNC(do_link), chatentry); gtk_widget_show(toolbar); @@ -789,7 +789,7 @@ while(list) { w = (GtkWidget *)list->data; - if (!strcmp(GTK_LABEL(GTK_BIN(w)->child)->label, "Buddy Chat")) { + if (!strcmp(GTK_LABEL(GTK_BIN(w)->child)->label, _("Buddy Chat"))) { gtk_tree_remove_items(GTK_TREE(buddies), list); list = GTK_TREE(buddies)->children; if (!list) @@ -801,7 +801,7 @@ if (crs == NULL) return; - item = gtk_tree_item_new_with_label("Buddy Chat"); + item = gtk_tree_item_new_with_label(_("Buddy Chat")); tree = gtk_tree_new(); gtk_widget_show(item); gtk_widget_show(tree);
--- a/src/conversation.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/conversation.c Wed Jun 07 18:33:21 2000 +0000 @@ -361,11 +361,11 @@ static void add_callback(GtkWidget *widget, struct conversation *c) { if (find_buddy(c->name) != NULL) { - sprintf(debug_buff,"Removing '%s' from buddylist.\n", c->name); + sprintf(debug_buff,_("Removing '%s' from buddylist.\n"), c->name); debug_print(debug_buff); remove_buddy(find_group_by_buddy(c->name), find_buddy(c->name)); build_edit_tree(); - gtk_label_set_text(GTK_LABEL(GTK_BIN(c->add_button)->child), "Add"); + gtk_label_set_text(GTK_LABEL(GTK_BIN(c->add_button)->child), _("Add")); } else { @@ -493,7 +493,7 @@ escape_text(buf); if (escape_message(buf) > MSG_LEN - hdrlen) { - do_error_dialog("Message too long, some data truncated.", "Error"); + do_error_dialog(_("Message too long, some data truncated."), _("Error")); } serv_send_im(c->name, buf, 0); @@ -667,14 +667,14 @@ return; s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1); pos = GTK_EDITABLE(entry)->current_pos; - sprintf(debug_buff,"Currently at %d\n",pos); + sprintf(debug_buff,_("Currently at %d\n"),pos); debug_print(debug_buff); s2= strstr(&s[pos], post); if (s2) pos = s2 - s + strlen(post); else pos=strlen(s); - sprintf(debug_buff,"Setting position to %d\n",pos); + sprintf(debug_buff,_("Setting position to %d\n"),pos); debug_print(debug_buff); gtk_editable_set_position(GTK_EDITABLE(entry), pos); gtk_widget_grab_focus(entry); @@ -1092,18 +1092,18 @@ c->window = win; - send = gtk_button_new_with_label("Send"); - info = gtk_button_new_with_label("Info"); - warn = gtk_button_new_with_label("Warn"); + send = gtk_button_new_with_label(_("Send")); + info = gtk_button_new_with_label(_("Info")); + warn = gtk_button_new_with_label(_("Warn")); /* color = gtk_button_new_with_label("Color"); */ - close = gtk_button_new_with_label("Close"); + close = gtk_button_new_with_label(_("Close")); if (find_buddy(c->name) != NULL) { - add = gtk_button_new_with_label("Remove"); + add = gtk_button_new_with_label(_("Remove")); } else { - add = gtk_button_new_with_label("Add"); + add = gtk_button_new_with_label(_("Add")); } - block = gtk_button_new_with_label("Block"); + block = gtk_button_new_with_label(_("Block")); bbox = gtk_hbox_new(TRUE, 0); @@ -1177,48 +1177,48 @@ bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "Bold", "Bold Text", "Bold", bold_p, + _("Bold"), _("Bold Text"), _("Bold"), bold_p, GTK_SIGNAL_FUNC(do_bold), entry); italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Italics", "Italics Text", - "Italics", italic_p, GTK_SIGNAL_FUNC(do_italic), entry); + NULL, _("Italics"), _("Italics Text"), + _("Italics"), italic_p, GTK_SIGNAL_FUNC(do_italic), entry); underline = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Underline", "Underline Text", - "Underline", underline_p, GTK_SIGNAL_FUNC(do_underline), entry); + NULL, _("Underline"), _("Underline Text"), + _("Underline"), underline_p, GTK_SIGNAL_FUNC(do_underline), entry); strike = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Strike", "Strike through Text", - "Strike", strike_p, GTK_SIGNAL_FUNC(do_strike), entry); + NULL, _("Strike"), _("Strike through Text"), + _("Strike"), strike_p, GTK_SIGNAL_FUNC(do_strike), entry); gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); - small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "Small", "Decrease font size", "Small", small_p, GTK_SIGNAL_FUNC(do_small), entry); - normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "Normal", "Normal font size", "Normal", normal_p, GTK_SIGNAL_FUNC(do_normal), entry); - big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "Big", "Increase font size", "Big", big_p, GTK_SIGNAL_FUNC(do_big), entry); + small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Small"), _("Decrease font size"), _("Small"), small_p, GTK_SIGNAL_FUNC(do_small), entry); + normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Normal"), _("Normal font size"), _("Normal"), normal_p, GTK_SIGNAL_FUNC(do_normal), entry); + big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Big"), _("Increase font size"), _("Big"), big_p, GTK_SIGNAL_FUNC(do_big), entry); font = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Font", "Select Font", - "Font", font_p, GTK_SIGNAL_FUNC(toggle_font), c); + NULL, _("Font"), _("Select Font"), + _("Font"), font_p, GTK_SIGNAL_FUNC(toggle_font), c); if (!(font_options & OPT_FONT_FACE)) gtk_widget_set_sensitive(GTK_WIDGET(font), FALSE); gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); link = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), - GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "Link", "Insert Link", - "Link", link_p, GTK_SIGNAL_FUNC(do_link), entry); + GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Link"), _("Insert Link"), + _("Link"), link_p, GTK_SIGNAL_FUNC(do_link), entry); palette = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Color", "Text Color", - "Color", palette_p, GTK_SIGNAL_FUNC(toggle_color), c); + NULL, _("Color"), _("Text Color"), + _("Color"), palette_p, GTK_SIGNAL_FUNC(toggle_color), c); wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Logging", "Enable logging", - "Logging", wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c); + NULL, _("Logging"), _("Enable logging"), + _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c); speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, - NULL, "Sound", "Enable sounds", - "Sound", speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound); + NULL, _("Sound"), _("Enable sounds"), + _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound); c->makesound=0; gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(speaker), TRUE);
--- a/src/dialogs.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/dialogs.c Wed Jun 07 18:33:21 2000 +0000 @@ -194,13 +194,13 @@ host = (struct in_addr *)get_address(REG_SRVR); if (!host) { - printf("Error Resolving Mail Server.\n"); + printf(_("Error Resolving Mail Server.\n")); return -1; } if ((sock = connect_address(host->s_addr, REG_PORT)) < 0) { - printf("Error Connecting to Socket.\n"); + printf(_("Error Connecting to Socket.\n")); return -1; } @@ -368,8 +368,8 @@ char *buf = g_malloc(128); w->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, w->window); - cancel = gtk_button_new_with_label("Cancel"); - warn = gtk_button_new_with_label("Warn"); + cancel = gtk_button_new_with_label(_("Cancel")); + warn = gtk_button_new_with_label(_("Warn")); bbox = gtk_hbox_new(TRUE, 10); vbox = gtk_vbox_new(FALSE, 5); @@ -377,14 +377,14 @@ gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - g_snprintf(buf, 127, "Do you really want to warn %s?", who); + g_snprintf(buf, 127, _("Do you really want to warn %s?"), who); label = gtk_label_new(buf); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); gtk_widget_show(label); - w->anon = gtk_check_button_new_with_label("Warn anonymously?"); + w->anon = gtk_check_button_new_with_label(_("Warn anonymously?")); gtk_box_pack_start(GTK_BOX(vbox), w->anon, TRUE, TRUE, 0); - label = gtk_label_new("Anonymous warnings are less harsh."); + label = gtk_label_new(_("Anonymous warnings are less harsh.")); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); gtk_widget_show(label); @@ -405,7 +405,7 @@ gtk_widget_show(w->anon); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(w->window), "Gaim - Warn user?"); + gtk_window_set_title(GTK_WINDOW(w->window), _("Gaim - Warn user?")); gtk_container_add(GTK_CONTAINER(w->window), vbox); gtk_widget_realize(w->window); aol_icon(w->window->window); @@ -432,7 +432,7 @@ label = gtk_label_new(message); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_widget_show(label); - close = gtk_button_new_with_label("Close"); + close = gtk_button_new_with_label(_("Close")); gtk_widget_show(close); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), label, FALSE, FALSE, 5); @@ -461,86 +461,86 @@ switch(no) { case 69: - g_snprintf(buf, sizeof(buf), "Unable to write file %s.", w); + g_snprintf(buf, sizeof(buf), _("Unable to write file %s."), w); break; case 169: - g_snprintf(buf, sizeof(buf), "Unable to read file %s.", w); + g_snprintf(buf, sizeof(buf), _("Unable to read file %s."), w); break; case 269: - g_snprintf(buf, sizeof(buf), "Message too long, last %s bytes truncated.", w); + g_snprintf(buf, sizeof(buf), _("Message too long, last %s bytes truncated."), w); break; case 901: - g_snprintf(buf, sizeof(buf), "%s not currently logged in.", w); + g_snprintf(buf, sizeof(buf), _("%s not currently logged in."), w); break; case 902: - g_snprintf(buf, sizeof(buf), "Warning of %s not allowed.", w); + g_snprintf(buf, sizeof(buf), _("Warning of %s not allowed."), w); break; case 903: - g_snprintf(buf, sizeof(buf), "A message has been dropped, you are exceeding the server speed limit."); + g_snprintf(buf, sizeof(buf), _("A message has been dropped, you are exceeding the server speed limit.")); break; case 950: - g_snprintf(buf, sizeof(buf), "Chat in %s is not available.", w); + g_snprintf(buf, sizeof(buf), _("Chat in %s is not available."), w); break; case 960: - g_snprintf(buf, sizeof(buf), "You are sending messages too fast to %s.", w); + g_snprintf(buf, sizeof(buf), _("You are sending messages too fast to %s."), w); break; case 961: - g_snprintf(buf, sizeof(buf), "You missed an IM from %s because it was too big.", w); + g_snprintf(buf, sizeof(buf), _("You missed an IM from %s because it was too big."), w); break; case 962: - g_snprintf(buf, sizeof(buf), "You missed an IM from %s because it was sent too fast.", w); + g_snprintf(buf, sizeof(buf), _("You missed an IM from %s because it was sent too fast."), w); break; case 970: - g_snprintf(buf, sizeof(buf), "Failure."); + g_snprintf(buf, sizeof(buf), _("Failure.")); break; case 971: - g_snprintf(buf, sizeof(buf), "Too many matches."); + g_snprintf(buf, sizeof(buf), _("Too many matches.")); break; case 972: - g_snprintf(buf, sizeof(buf), "Need more qualifiers."); + g_snprintf(buf, sizeof(buf), _("Need more qualifiers.")); break; case 973: - g_snprintf(buf, sizeof(buf), "Dir service temporarily unavailable."); + g_snprintf(buf, sizeof(buf), _("Dir service temporarily unavailable.")); break; case 974: - g_snprintf(buf, sizeof(buf), "Email lookup restricted."); + g_snprintf(buf, sizeof(buf), _("Email lookup restricted.")); break; case 975: - g_snprintf(buf, sizeof(buf), "Keyword ignored."); + g_snprintf(buf, sizeof(buf), _("Keyword ignored.")); break; case 976: - g_snprintf(buf, sizeof(buf), "No keywords."); + g_snprintf(buf, sizeof(buf), _("No keywords.")); break; case 977: - g_snprintf(buf, sizeof(buf), "User has no directory information."); + g_snprintf(buf, sizeof(buf), _("User has no directory information.")); /* g_snprintf(buf, sizeof(buf), "Language not supported."); */ break; case 978: - g_snprintf(buf, sizeof(buf), "Country not supported."); + g_snprintf(buf, sizeof(buf), _("Country not supported.")); break; case 979: - g_snprintf(buf, sizeof(buf), "Failure unknown: %s.", w); + g_snprintf(buf, sizeof(buf), _("Failure unknown: %s."), w); break; case 980: - g_snprintf(buf, sizeof(buf), "Incorrect nickname or password."); + g_snprintf(buf, sizeof(buf), _("Incorrect nickname or password.")); break; case 981: - g_snprintf(buf, sizeof(buf), "The service is temporarily unavailable."); + g_snprintf(buf, sizeof(buf), _("The service is temporarily unavailable.")); break; case 982: - g_snprintf(buf, sizeof(buf), "Your warning level is currently too high to log in."); + g_snprintf(buf, sizeof(buf), _("Your warning level is currently too high to log in.")); break; case 983: - g_snprintf(buf, sizeof(buf), "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."); + g_snprintf(buf, sizeof(buf), _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); break; case 989: - g_snprintf(buf, sizeof(buf), "An unknown signon error has occurred: %s.", w); + g_snprintf(buf, sizeof(buf), _("An unknown signon error has occurred: %s."), w); break; default: - g_snprintf(buf, sizeof(buf), "An unknown error, %d, has occured. Info: %s", no, w); + g_snprintf(buf, sizeof(buf), _("An unknown error, %d, has occured. Info: %s"), no, w); } - g_snprintf(buf2, sizeof(buf2), "Gaim - Error %d", no); + g_snprintf(buf2, sizeof(buf2), _("Gaim - Error %d"), no); do_error_dialog(buf, buf2); @@ -580,7 +580,7 @@ GtkWidget *eedialog; eedialog = gtk_window_new(GTK_WINDOW_DIALOG); - ok = gtk_button_new_with_label("OK"); + ok = gtk_button_new_with_label(_("OK")); box = gtk_vbox_new(FALSE, 10); if (ee == 0) @@ -624,8 +624,8 @@ if (!imdialog) { imdialog = gtk_window_new(GTK_WINDOW_DIALOG); - cancel = gtk_button_new_with_label("Cancel"); - ok = gtk_button_new_with_label("OK"); + cancel = gtk_button_new_with_label(_("Cancel")); + ok = gtk_button_new_with_label(_("OK")); bbox = gtk_hbox_new(TRUE, 10); vbox = gtk_vbox_new(FALSE, 5); ebox = gtk_hbox_new(FALSE, 2); @@ -634,7 +634,7 @@ gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("IM who: "); + label = gtk_label_new(_("IM who: ")); gtk_box_pack_start(GTK_BOX(ebox), label, TRUE, TRUE, 10); gtk_widget_show(label); @@ -660,7 +660,7 @@ gtk_widget_show(imentry); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(imdialog), "Gaim - IM user"); + gtk_window_set_title(GTK_WINDOW(imdialog), _("Gaim - IM user")); gtk_container_add(GTK_CONTAINER(imdialog), vbox); gtk_widget_grab_focus(imentry); gtk_widget_realize(imdialog); @@ -688,7 +688,7 @@ add_buddy(grp, who); if (c != NULL) - gtk_label_set_text(GTK_LABEL(GTK_BIN(c->add_button)->child), "Remove"); + gtk_label_set_text(GTK_LABEL(GTK_BIN(c->add_button)->child), _("Remove")); build_edit_tree(); @@ -712,7 +712,7 @@ GList *grp = groups; if (!grp) { - tmp2 = g_strdup("Buddies"); + tmp2 = g_strdup(_("Buddies")); tmp = g_list_append(tmp, tmp2); } else { while(grp) { @@ -740,8 +740,8 @@ a->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, a->window); - cancel = gtk_button_new_with_label("Cancel"); - add = gtk_button_new_with_label("Add"); + cancel = gtk_button_new_with_label(_("Cancel")); + add = gtk_button_new_with_label(_("Add")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); @@ -756,16 +756,16 @@ gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); frame = gtk_frame_new(NULL); - gtk_frame_set_label(GTK_FRAME(frame), "Add Buddy"); - - label = gtk_label_new("Buddy"); + gtk_frame_set_label(GTK_FRAME(frame), _("Add Buddy")); + + label = gtk_label_new(_("Buddy")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), a->entry, FALSE, FALSE, 5); if (buddy != NULL) gtk_entry_set_text(GTK_ENTRY(a->entry), buddy); - label = gtk_label_new("Group"); + label = gtk_label_new(_("Group")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), a->combo, FALSE, FALSE, 5); @@ -795,7 +795,7 @@ gtk_widget_show(bbox); gtk_widget_show(vbox); gtk_widget_show(frame); - gtk_window_set_title(GTK_WINDOW(a->window), "Gaim - Add Buddy"); + gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy")); gtk_window_set_focus(GTK_WINDOW(a->window), a->entry); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_add(GTK_CONTAINER(a->window), frame); @@ -850,8 +850,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - cancel = gtk_button_new_with_label("Cancel"); - ok = gtk_button_new_with_label("OK"); + cancel = gtk_button_new_with_label(_("Cancel")); + ok = gtk_button_new_with_label(_("OK")); bbox = gtk_hbox_new(TRUE, 10); vbox = gtk_vbox_new(FALSE, 5); b->nameentry = gtk_entry_new(); @@ -861,15 +861,15 @@ gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("Buddy To Pounce:"); + label = gtk_label_new(_("Buddy To Pounce:")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), b->nameentry, FALSE, FALSE, 0); - b->openwindow = gtk_check_button_new_with_label("Open IM Window on Buddy Logon"); + b->openwindow = gtk_check_button_new_with_label(_("Open IM Window on Buddy Logon")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->openwindow), FALSE); - b->sendim = gtk_check_button_new_with_label("Send IM on Buddy Logon"); + b->sendim = gtk_check_button_new_with_label(_("Send IM on Buddy Logon")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sendim), TRUE); gtk_widget_show(b->openwindow); @@ -877,7 +877,7 @@ gtk_box_pack_start(GTK_BOX(vbox), b->openwindow, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), b->sendim, FALSE, FALSE, 0); - label = gtk_label_new("Message to send:"); + label = gtk_label_new(_("Message to send:")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), b->messentry, FALSE, FALSE, 0); @@ -904,7 +904,7 @@ gtk_widget_show(b->messentry); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(b->window), "Gaim - New Buddy Pounce"); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce")); if (name != NULL) { gtk_entry_set_text(GTK_ENTRY(b->nameentry), name); gtk_window_set_focus(GTK_WINDOW(b->window), b->messentry); @@ -979,8 +979,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - b->cancel = gtk_button_new_with_label("Cancel"); - b->save = gtk_button_new_with_label("Save"); + b->cancel = gtk_button_new_with_label(_("Cancel")); + b->save = gtk_button_new_with_label(_("Save")); bot = gtk_hbox_new(TRUE, 10); top = gtk_vbox_new(FALSE, 10); @@ -1002,39 +1002,39 @@ b->city = gtk_entry_new(); b->state = gtk_entry_new(); b->country = gtk_entry_new(); - b->web = gtk_check_button_new_with_label("Allow Web Searches To Find Your Info"); + b->web = gtk_check_button_new_with_label(_("Allow Web Searches To Find Your Info")); - label = gtk_label_new("First Name"); + label = gtk_label_new(_("First Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_table_attach_defaults(GTK_TABLE(table), b->first, 1, 2, 0, 1); - label = gtk_label_new("Middle Name"); + label = gtk_label_new(_("Middle Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); gtk_table_attach_defaults(GTK_TABLE(table), b->middle, 1, 2, 1, 2); - label = gtk_label_new("Last Name"); + label = gtk_label_new(_("Last Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3); gtk_table_attach_defaults(GTK_TABLE(table), b->last, 1, 2, 2, 3); - label = gtk_label_new("Maiden Name"); + label = gtk_label_new(_("Maiden Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4); gtk_table_attach_defaults(GTK_TABLE(table), b->maiden, 1, 2, 3, 4); - label = gtk_label_new("City"); + label = gtk_label_new(_("City")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 4, 5); gtk_table_attach_defaults(GTK_TABLE(table), b->city, 1, 2, 4, 5); - label = gtk_label_new("State"); + label = gtk_label_new(_("State")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 5, 6); gtk_table_attach_defaults(GTK_TABLE(table), b->state, 1, 2, 5, 6); - label = gtk_label_new("Country"); + label = gtk_label_new(_("Country")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 6, 7); gtk_table_attach_defaults(GTK_TABLE(table), b->country, 1, 2, 6, 7); @@ -1065,7 +1065,7 @@ gtk_container_add(GTK_CONTAINER(b->window), top); gtk_container_border_width(GTK_CONTAINER(b->window), 10); gtk_widget_set_usize(b->window, 530, 280); - gtk_window_set_title(GTK_WINDOW(b->window), "Gaim - Set Dir Info"); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set Dir Info")); gtk_window_set_focus(GTK_WINDOW(b->window), b->first); gtk_widget_realize(b->window); aol_icon(b->window->window); @@ -1083,12 +1083,12 @@ new2 = gtk_entry_get_text(GTK_ENTRY(b->new2)); if (strcasecmp(new1, new2)) { - do_error_dialog("New Passwords Do Not Match", "Gaim - Change Password Error"); + do_error_dialog(_("New Passwords Do Not Match"), _("Gaim - Change Password Error")); return ; } if ((strlen(orig) < 1) || (strlen(new1) < 1) || (strlen(new2) < 1)) { - do_error_dialog("Fill out all fields completely", "Gaim - Change Password Error"); + do_error_dialog(_("Fill out all fields completely"), _("Gaim - Change Password Error")); return; } @@ -1109,8 +1109,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - b->ok = gtk_button_new_with_label("Ok"); - b->cancel = gtk_button_new_with_label("Cancel"); + b->ok = gtk_button_new_with_label(_("Ok")); + b->cancel = gtk_button_new_with_label(_("Cancel")); gtk_widget_show(b->ok); gtk_widget_show(b->cancel); @@ -1119,7 +1119,7 @@ - label = gtk_label_new("Original Password"); + label = gtk_label_new(_("Original Password")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); b->original = gtk_entry_new(); @@ -1127,7 +1127,7 @@ gtk_widget_show(b->original); gtk_table_attach_defaults(GTK_TABLE(table), b->original, 1, 2, 0, 1); - label = gtk_label_new("New Password"); + label = gtk_label_new(_("New Password")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); b->new1 = gtk_entry_new(); @@ -1135,7 +1135,7 @@ gtk_widget_show(b->new1); gtk_table_attach_defaults(GTK_TABLE(table), b->new1, 1, 2, 1, 2); - label = gtk_label_new("New Password (again)"); + label = gtk_label_new(_("New Password (again)")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3); b->new2 = gtk_entry_new(); @@ -1158,7 +1158,7 @@ gtk_widget_show(vbox); gtk_container_border_width(GTK_CONTAINER(b->window), 10); - gtk_window_set_title(GTK_WINDOW(b->window), "Gaim - Password Change"); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change")); gtk_widget_show(b->window); gtk_signal_connect(GTK_OBJECT(b->window), "destroy", @@ -1181,8 +1181,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - b->cancel = gtk_button_new_with_label("Cancel"); - b->save = gtk_button_new_with_label("Save"); + b->cancel = gtk_button_new_with_label(_("Cancel")); + b->save = gtk_button_new_with_label(_("Save")); bot = gtk_hbox_new(TRUE, 10); top = gtk_vbox_new(FALSE, 10); @@ -1221,7 +1221,7 @@ gtk_widget_realize(b->window); aol_icon(b->window->window); - gtk_window_set_title(GTK_WINDOW(b->window), "Gaim - Set User Info"); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info")); gtk_widget_show(b->window); } @@ -1269,8 +1269,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - cancel = gtk_button_new_with_label("Cancel"); - ok = gtk_button_new_with_label("Send"); + cancel = gtk_button_new_with_label(_("Cancel")); + ok = gtk_button_new_with_label(_("Send")); bbox = gtk_hbox_new(TRUE, 10); table = gtk_table_new(6, 2, TRUE); @@ -1362,13 +1362,13 @@ bbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(b->window), bbox); - ok = gtk_button_new_with_label("OK"); + ok = gtk_button_new_with_label(_("OK")); gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); - label = gtk_label_new("Below are the results of your search: "); + label = gtk_label_new(_("Below are the results of your search: ")); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), @@ -1461,8 +1461,8 @@ p->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, p->window); - cancel = gtk_button_new_with_label("Cancel"); - add = gtk_button_new_with_label("Add"); + cancel = gtk_button_new_with_label(_("Cancel")); + add = gtk_button_new_with_label(_("Add")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); @@ -1472,12 +1472,12 @@ if (who != NULL) gtk_entry_set_text(GTK_ENTRY(p->entry), who); - which = gtk_radio_button_new_with_label(NULL, "Deny"); + which = gtk_radio_button_new_with_label(NULL, _("Deny")); gtk_box_pack_start(GTK_BOX(rbox), which, FALSE, FALSE, 0); gtk_object_set_user_data(GTK_OBJECT(which), (int *)1); gtk_widget_show(which); - which = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(which)), "Permit"); + which = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(which)), _("Permit")); gtk_box_pack_start(GTK_BOX(rbox), which, FALSE, FALSE, 0); gtk_object_set_user_data(GTK_OBJECT(which), (int *)2); gtk_widget_show(which); @@ -1486,7 +1486,7 @@ gtk_box_pack_start(GTK_BOX(bbox), add, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("Add"); + label = gtk_label_new(_("Add")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), p->entry, FALSE, FALSE, 5); @@ -1515,7 +1515,7 @@ gtk_widget_show(bbox); gtk_widget_show(vbox); gtk_widget_show(rbox); - gtk_window_set_title(GTK_WINDOW(p->window), "Gaim - Add Permit/Deny"); + gtk_window_set_title(GTK_WINDOW(p->window), _("Gaim - Add Permit/Deny")); gtk_window_set_focus(GTK_WINDOW(p->window), p->entry); gtk_container_add(GTK_CONTAINER(p->window), vbox); gtk_widget_realize(p->window); @@ -1576,7 +1576,7 @@ if (!logdialog) { - logdialog = gtk_file_selection_new("Gaim - Log Conversation"); + logdialog = gtk_file_selection_new(_("Gaim - Log Conversation")); gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(logdialog)); @@ -1646,8 +1646,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - cancel = gtk_button_new_with_label("Cancel"); - ok = gtk_button_new_with_label("OK"); + cancel = gtk_button_new_with_label(_("Cancel")); + ok = gtk_button_new_with_label(_("OK")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_table_new(7, 2, TRUE); @@ -1664,37 +1664,37 @@ gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("First Name"); + label = gtk_label_new(_("First Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 0, 1); gtk_table_attach_defaults(GTK_TABLE(topbox), b->firstentry, 1, 2, 0, 1); - label = gtk_label_new("Middle Name"); + label = gtk_label_new(_("Middle Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 1, 2); gtk_table_attach_defaults(GTK_TABLE(topbox), b->middleentry, 1, 2, 1, 2); - label = gtk_label_new("Last Name"); + label = gtk_label_new(_("Last Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 2, 3); gtk_table_attach_defaults(GTK_TABLE(topbox), b->lastentry, 1, 2, 2, 3); - label = gtk_label_new("Maiden Name"); + label = gtk_label_new(_("Maiden Name")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 3, 4); gtk_table_attach_defaults(GTK_TABLE(topbox), b->maidenentry, 1, 2, 3, 4); - label = gtk_label_new("City"); + label = gtk_label_new(_("City")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 4, 5); gtk_table_attach_defaults(GTK_TABLE(topbox), b->cityentry, 1, 2, 4, 5); - label = gtk_label_new("State"); + label = gtk_label_new(_("State")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 5, 6); gtk_table_attach_defaults(GTK_TABLE(topbox), b->stateentry, 1, 2, 5, 6); - label = gtk_label_new("Country"); + label = gtk_label_new(_("Country")); gtk_widget_show(label); gtk_table_attach_defaults(GTK_TABLE(topbox), label, 0, 1, 6, 7); gtk_table_attach_defaults(GTK_TABLE(topbox), b->countryentry, 1, 2, 6, 7); @@ -1721,7 +1721,7 @@ gtk_widget_show(topbox); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(b->window), "Gaim - Find Buddy By Info"); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Info")); gtk_window_set_focus(GTK_WINDOW(b->window), b->firstentry); gtk_container_add(GTK_CONTAINER(b->window), vbox); gtk_container_border_width(GTK_CONTAINER(b->window), 10); @@ -1744,8 +1744,8 @@ b->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, b->window); - cancel = gtk_button_new_with_label("Cancel"); - ok = gtk_button_new_with_label("OK"); + cancel = gtk_button_new_with_label(_("Cancel")); + ok = gtk_button_new_with_label(_("OK")); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); @@ -1756,7 +1756,7 @@ gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 10); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - label = gtk_label_new("Email"); + label = gtk_label_new(_("Email")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, FALSE, FALSE, 5); @@ -1779,7 +1779,7 @@ gtk_widget_show(topbox); gtk_widget_show(bbox); gtk_widget_show(vbox); - gtk_window_set_title(GTK_WINDOW(b->window), "Gaim - Find Buddy By Email"); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Email")); gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry); gtk_container_add(GTK_CONTAINER(b->window), vbox); gtk_container_border_width(GTK_CONTAINER(b->window), 10); @@ -1833,8 +1833,8 @@ linkdialog = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, linkdialog); - b->cancel = gtk_button_new_with_label("Cancel"); - b->ok = gtk_button_new_with_label("Ok"); + b->cancel = gtk_button_new_with_label(_("Cancel")); + b->ok = gtk_button_new_with_label(_("Ok")); vbox = gtk_vbox_new(FALSE, 10); bbox = gtk_hbox_new(TRUE, 10); @@ -1850,12 +1850,12 @@ b->url = gtk_entry_new(); b->text = gtk_entry_new(); - label = gtk_label_new("URL"); + label = gtk_label_new(_("URL")); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_table_attach_defaults(GTK_TABLE(table), b->url, 1, 2, 0, 1); gtk_widget_show(label); - label = gtk_label_new("Description"); + label = gtk_label_new(_("Description")); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); gtk_table_attach_defaults(GTK_TABLE(table), b->text, 1, 2, 1, 2); gtk_widget_show(label); @@ -1877,7 +1877,7 @@ gtk_container_add(GTK_CONTAINER(linkdialog ), vbox); gtk_container_border_width(GTK_CONTAINER(linkdialog ), 10); - gtk_window_set_title(GTK_WINDOW(linkdialog ), "GAIM - Add URL"); + gtk_window_set_title(GTK_WINDOW(linkdialog ), _("GAIM - Add URL")); gtk_window_set_focus(GTK_WINDOW(linkdialog ), b->url); b->window = linkdialog; b->toggle = link; @@ -1942,7 +1942,7 @@ if (!c->color_dialog) { - c->color_dialog = gtk_color_selection_dialog_new("Select Text Color"); + c->color_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); colorsel = GTK_COLOR_SELECTION_DIALOG(c->color_dialog)->colorsel; gtk_object_set_user_data(GTK_OBJECT(colorsel), c); @@ -2058,7 +2058,7 @@ if (!font) { /* we came from the prefs dialog */ if (fontseld) return; - fontseld = gtk_font_selection_dialog_new("Select Font"); + fontseld = gtk_font_selection_dialog_new(_("Select Font")); if (fontname) gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld), fontname); else @@ -2077,7 +2077,7 @@ if (!c->font_dialog) { - c->font_dialog = gtk_font_selection_dialog_new("Select Font"); + c->font_dialog = gtk_font_selection_dialog_new(_("Select Font")); if (font) gtk_object_set_user_data(GTK_OBJECT(c->font_dialog), c); @@ -2164,8 +2164,8 @@ fclose(f); chmod(buf, S_IRUSR | S_IWUSR); } else if ( show_dialog == 1 ) { - g_snprintf(buf, BUF_LONG / 2, "Error writing file %s", file); - do_error_dialog(buf, "Error"); + g_snprintf(buf, BUF_LONG / 2, _("Error writing file %s"), file); + do_error_dialog(buf, _("Error")); } if ( show_dialog == 1 ) { destroy_dialog(NULL, exportdialog); @@ -2181,7 +2181,7 @@ { char *buf = g_malloc(BUF_LEN); if (!exportdialog) { - exportdialog = gtk_file_selection_new("Gaim - Export Buddy List"); + exportdialog = gtk_file_selection_new(_("Gaim - Export Buddy List")); gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(exportdialog)); @@ -2235,8 +2235,8 @@ if (!(f = fopen(path,"r"))) { if ( show_dialog == 1 ) { - g_snprintf(buf, BUF_LONG / 2, "Error reading file %s", file); - do_error_dialog(buf, "Error"); + g_snprintf(buf, BUF_LONG / 2, _("Error reading file %s"), file); + do_error_dialog(buf, _("Error")); destroy_dialog(NULL, importdialog); importdialog = NULL; } @@ -2301,7 +2301,7 @@ { char *buf = g_malloc(BUF_LEN); if (!importdialog) { - importdialog = gtk_file_selection_new("Gaim - Import Buddy List"); + importdialog = gtk_file_selection_new(_("Gaim - Import Buddy List")); gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(importdialog)); @@ -2376,7 +2376,7 @@ /* Set up window */ ca->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_container_border_width(GTK_CONTAINER(ca->window), 10); - gtk_window_set_title(GTK_WINDOW(ca->window), "Gaim - New away message"); + gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message")); gtk_signal_connect(GTK_OBJECT(ca->window),"delete_event", GTK_SIGNAL_FUNC(destroy_dialog), ca->window); @@ -2386,7 +2386,7 @@ tbox = gtk_vbox_new(FALSE, 0); /* Make a label for away entry */ - label = gtk_label_new("Away title: "); + label = gtk_label_new(_("Away title: ")); gtk_box_pack_start(GTK_BOX(titlebox), label, TRUE, TRUE, 0); /* make away title entry */ @@ -2408,12 +2408,12 @@ gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 10); /* make create button */ - create = gtk_button_new_with_label ("Create new message"); + create = gtk_button_new_with_label (_("Create new message")); gtk_box_pack_start(GTK_BOX(bbox), create, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(create), "clicked", GTK_SIGNAL_FUNC(create_mess), ca); /* Checkbox for showing away msg */ - ca->checkbx = gtk_check_button_new_with_label("Make away now"); + ca->checkbx = gtk_check_button_new_with_label(_("Make away now")); /* pack boxes where they belong */ gtk_box_pack_start(GTK_BOX(tbox), titlebox, FALSE, FALSE, 0);
--- a/src/gnome_applet_mgr.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/gnome_applet_mgr.c Wed Jun 07 18:33:21 2000 +0000 @@ -112,7 +112,7 @@ } else { result = FALSE; - sprintf(debug_buff,"file not found: %s\n",path); + sprintf(debug_buff,_("file not found: %s\n"),path); debug_print(debug_buff); } @@ -145,14 +145,14 @@ icon_offline_pm, icon_offline_bm ); gtk_label_set( GTK_LABEL(status_label), _MSG_OFFLINE_ ); - applet_set_tooltips("Offilne. Click to bring up login box."); + applet_set_tooltips(_("Offilne. Click to bring up login box.")); break; case signing_on: gtk_pixmap_set( GTK_PIXMAP(icon), icon_connect_pm, icon_connect_bm ); gtk_label_set( GTK_LABEL(status_label), _MSG_CONNECT_ ); - applet_set_tooltips("Attempting to sign on...."); + applet_set_tooltips(_("Attempting to sign on....")); break; case online: gtk_pixmap_set( GTK_PIXMAP(icon), @@ -172,7 +172,7 @@ gtk_pixmap_set( GTK_PIXMAP(icon), icon_online_pm, icon_online_bm ); - gtk_label_set( GTK_LABEL(status_label), "Away" ); + gtk_label_set( GTK_LABEL(status_label), _("Away") ); break; } old_user_status = MRI_user_status; @@ -557,7 +557,7 @@ gtk_box_pack_start(GTK_BOX(vbox), icon, FALSE, TRUE, 0); - status_label = gtk_label_new("Offline"); + status_label = gtk_label_new(_("Offline")); /*set this label's font*/ label_style = gtk_widget_get_style( status_label ); @@ -568,7 +568,7 @@ label_style->font = label_font; gtk_widget_set_style( status_label, label_style ); } else { - sprintf(debug_buff, "Font does not exist" ); + sprintf(debug_buff, _("Font does not exist") ); debug_print(debug_buff); }
--- a/src/html.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/html.c Wed Jun 07 18:33:21 2000 +0000 @@ -116,17 +116,10 @@ website = parse_url(url); - /* - host = gethostbyname(website.address); - if (!host) { return g_strdup("g001: Error resolving host\n"); } - - if ((sock = connect_address(inet_addr(host->h_addr), website.port)) <= -1) - return g_strdup("g003: Error opening connection.\n"); - */ host = (struct in_addr *)get_address(website.address); - if (!host) { return g_strdup("g001: Error resolving host\n"); } + if (!host) { return g_strdup(_("g001: Error resolving host\n")); } if ((sock = connect_address(host->s_addr, website.port)) < 0) - return g_strdup("g003: Error opening connection.\n"); + return g_strdup(_("g003: Error opening connection.\n")); g_snprintf(buf, sizeof(buf), "GET /%s HTTP/1.0\n\n", website.page); g_snprintf(debug_buff, sizeof(debug_buff), "Request: %s\n", buf); @@ -158,7 +151,7 @@ char tmpbuf[1024]; sscanf(cs, "Content-Length: %d", &datalen); - g_snprintf(tmpbuf, 1024, "Getting %d bytes from %s", datalen, url); + g_snprintf(tmpbuf, 1024, _("Getting %d bytes from %s"), datalen, url); pw = gtk_dialog_new(); label = gtk_label_new(tmpbuf); @@ -171,7 +164,7 @@ pbar, FALSE, FALSE, 5); gtk_widget_show(pbar); - gtk_window_set_title(GTK_WINDOW(pw), "Getting Data"); + gtk_window_set_title(GTK_WINDOW(pw), _("Getting Data")); gtk_widget_realize(pw); aol_icon(pw->window); @@ -204,7 +197,7 @@ webdata[len] = 0; - g_snprintf(debug_buff, sizeof(debug_buff), "Receieved: '%s'\n", webdata); + g_snprintf(debug_buff, sizeof(debug_buff), _("Receieved: '%s'\n"), webdata); debug_print(debug_buff); if (pw)
--- a/src/oscar.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/oscar.c Wed Jun 07 18:33:21 2000 +0000 @@ -90,7 +90,7 @@ if (condition & GDK_INPUT_EXCEPTION) { signoff(); - hide_login_progress("Disconnected."); + hide_login_progress(_("Disconnected.")); aim_logoff(gaim_sess); gdk_input_remove(inpa); auth_failed(); @@ -98,9 +98,9 @@ } if (condition & GDK_INPUT_READ) { if (aim_get_command(gaim_sess, conn) < 0) { - debug_print("connection error!\n"); + debug_print(_("connection error!\n")); signoff(); - hide_login_progress("Disconnected."); + hide_login_progress(_("Disconnected.")); aim_logoff(gaim_sess); auth_failed(); gdk_input_remove(inpa); @@ -117,7 +117,7 @@ struct aim_user *u; char buf[256]; - sprintf(debug_buff, "Logging in %s\n", username); + sprintf(debug_buff, _("Logging in %s\n"), username); debug_print(debug_buff); sess = g_new0(struct aim_session_t, 1); @@ -127,17 +127,17 @@ sess->tx_enqueue = &aim_tx_enqueue__immediate; gaim_sess = sess; - sprintf(buf, "Looking up %s", FAIM_LOGIN_SERVER); + sprintf(buf, _("Looking up %s"), FAIM_LOGIN_SERVER); set_login_progress(1, buf); conn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, FAIM_LOGIN_SERVER); if (conn == NULL) { - debug_print("internal connection error\n"); + debug_print(_("internal connection error\n")); #ifdef USE_APPLET setUserState(offline); #endif set_state(STATE_OFFLINE); - hide_login_progress("Unable to login to AIM"); + hide_login_progress(_("Unable to login to AIM")); return -1; } else if (conn->fd == -1) { #ifdef USE_APPLET @@ -145,17 +145,17 @@ #endif set_state(STATE_OFFLINE); if (conn->status & AIM_CONN_STATUS_RESOLVERR) { - sprintf(debug_buff, "couldn't resolve host\n"); + sprintf(debug_buff, _("couldn't resolve host\n")); debug_print(debug_buff); hide_login_progress(debug_buff); } else if (conn->status & AIM_CONN_STATUS_CONNERR) { - sprintf(debug_buff, "couldn't connect to host\n"); + sprintf(debug_buff, _("couldn't connect to host\n")); debug_print(debug_buff); hide_login_progress(debug_buff); } return -1; } - g_snprintf(buf, sizeof(buf), "Signon: %s", username); + g_snprintf(buf, sizeof(buf), _("Signon: %s"), username); set_login_progress(2, buf); aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, @@ -183,7 +183,7 @@ "%s", password); save_prefs(); - debug_print("Password sent, waiting for response\n"); + debug_print(_("Password sent, waiting for response\n")); return 0; } @@ -197,7 +197,7 @@ gdk_input_remove(inpa); inpa = -1; aim_logoff(gaim_sess); - debug_print("Signed off.\n"); + debug_print(_("Signed off.\n")); } int gaim_parse_auth_resp(struct aim_session_t *sess, @@ -210,13 +210,13 @@ if (sess->logininfo.errorcode) { switch (sess->logininfo.errorcode) { case 0x18: - do_error_dialog("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.", "Gaim - Error"); + do_error_dialog(_("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."), _("Gaim - Error")); break; case 0x05: - do_error_dialog("Incorrect nickname or password.", "Gaim - Error"); + do_error_dialog(_("Incorrect nickname or password."), _("Gaim - Error")); break; case 0x1c: - do_error_dialog("AOL has decided your client is too old. Please download a newer version from http://www.marko.net/gaim/", "Gaim - Error"); + do_error_dialog(_("AOL has decided your client is too old. Please download a newer version from http://www.marko.net/gaim/"), _("Gaim - Error")); break; } sprintf(debug_buff, "Login Error Code 0x%04x\n", @@ -229,7 +229,7 @@ setUserState(offline); #endif set_state(STATE_OFFLINE); - hide_login_progress("Authentication Failed"); + hide_login_progress(_("Authentication Failed")); gdk_input_remove(inpa); aim_conn_kill(sess, &command->conn); auth_failed(); @@ -250,7 +250,7 @@ setUserState(offline); #endif set_state(STATE_OFFLINE); - hide_login_progress("Internal Error"); + hide_login_progress(_("Internal Error")); auth_failed(); return -1; } else if (bosconn->status != 0) { @@ -258,7 +258,7 @@ setUserState(offline); #endif set_state(STATE_OFFLINE); - hide_login_progress("Could Not Connect"); + hide_login_progress(_("Could Not Connect")); auth_failed(); return -1; } @@ -284,7 +284,7 @@ gaim_conn = bosconn; inpa = gdk_input_add(bosconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, oscar_callback, bosconn); - set_login_progress(4, "Connection established, cookie sent"); + set_login_progress(4, _("Connection established, cookie sent")); return 1; } @@ -577,7 +577,7 @@ u_short subtype; char buf[2048], buf2[256]; - sprintf(buf2, "Gaim - Error"); + sprintf(buf2, _("Gaim - Error")); buf[0] = 0; family = aimutil_get16(command->data+0); @@ -586,17 +586,17 @@ switch (family) { case 0x0001: if (subtype == 0x000a) - sprintf(buf, "You are sending messages too fast."); + sprintf(buf, _("You are sending messages too fast.")); break; case 0x0002: if (subtype == 0x0001) - sprintf(buf, "Unknown SNAC error (I'm hungry)"); + sprintf(buf, _("Unknown SNAC error (I'm hungry)")); break; case 0x0004: if (subtype == 0x0001) - sprintf(buf, "User is not online."); + sprintf(buf, _("User is not online.")); else if (subtype == 0x000a) - sprintf(buf, "A message has been dropped."); + sprintf(buf, _("A message has been dropped.")); break; } @@ -622,16 +622,16 @@ va_end(ap); if (prof == NULL || !strlen(prof)) { - do_error_dialog("User has no info/away message.", - "Gaim - User Info"); + do_error_dialog(_("User has no info/away message."), + _("Gaim - User Info")); return 1; } - snprintf(buf, sizeof buf, "Username : <B>%s</B>\n<BR>" + snprintf(buf, sizeof buf, _("Username : <B>%s</B>\n<BR>" "Warning Level : <B>%d %%</B>\n<BR>" "Online Since : <B>%s</B><BR>" "Idle Minutes : <B>%d</B>\n<BR><HR><BR>" - "%s\n", + "%s\n"), info->sn, info->warnlevel, asctime(localtime(&info->onlinesince)),
--- a/src/plugins.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/plugins.c Wed Jun 07 18:33:21 2000 +0000 @@ -99,7 +99,7 @@ return; } - plugin_dialog = gtk_file_selection_new("Gaim - Plugin List"); + plugin_dialog = gtk_file_selection_new(_("Gaim - Plugin List")); gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(plugin_dialog)); @@ -159,14 +159,14 @@ plug->handle = dlopen(plug->filename, RTLD_LAZY); if (!plug->handle) { error = (char *)dlerror(); - do_error_dialog(error, "Plugin Error"); + do_error_dialog(error, _("Plugin Error")); g_free(plug); return; } gaim_plugin_init = dlsym(plug->handle, "gaim_plugin_init"); if ((error = (char *)dlerror()) != NULL) { - do_error_dialog(error, "Plugin Error"); + do_error_dialog(error, _("Plugin Error")); dlclose(plug->handle); g_free(plug); return; @@ -213,7 +213,7 @@ gtk_widget_realize(plugwindow); aol_icon(plugwindow->window); gtk_container_border_width(GTK_CONTAINER(plugwindow), 10); - gtk_window_set_title(GTK_WINDOW(plugwindow), "Gaim - Plugins"); + gtk_window_set_title(GTK_WINDOW(plugwindow), _("Gaim - Plugins")); gtk_widget_set_usize(plugwindow, 400, 250); gtk_signal_connect(GTK_OBJECT(plugwindow), "destroy", GTK_SIGNAL_FUNC(hide_plugins), NULL); @@ -242,21 +242,21 @@ gtk_text_set_word_wrap(GTK_TEXT(plugtext), TRUE); gtk_text_set_editable(GTK_TEXT(plugtext), FALSE); - add = gtk_button_new_with_label("Load Plugin"); + add = gtk_button_new_with_label(_("Load Plugin")); gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(load_file), NULL); gtk_box_pack_start(GTK_BOX(botbox), add, TRUE, FALSE, 5); - config = gtk_button_new_with_label("Configure Plugin"); + config = gtk_button_new_with_label(_("Configure Plugin")); gtk_widget_set_sensitive(config, 0); gtk_box_pack_start(GTK_BOX(botbox), config, TRUE, FALSE, 5); - remove = gtk_button_new_with_label("Unload Plugin"); + remove = gtk_button_new_with_label(_("Unload Plugin")); gtk_signal_connect(GTK_OBJECT(remove), "clicked", GTK_SIGNAL_FUNC(unload), pluglist); gtk_box_pack_start(GTK_BOX(botbox), remove, TRUE, FALSE, 5); - close = gtk_button_new_with_label("Close"); + close = gtk_button_new_with_label(_("Close")); gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(hide_plugins), NULL); gtk_box_pack_start(GTK_BOX(botbox), close, TRUE, FALSE, 5);
--- a/src/rvous.c Wed Jun 07 17:14:32 2000 +0000 +++ b/src/rvous.c Wed Jun 07 18:33:21 2000 +0000 @@ -105,7 +105,7 @@ gtk_widget_destroy(ft->window); ft->window = NULL; - ft->window = gtk_file_selection_new("Gaim - Save As..."); + ft->window = gtk_file_selection_new(_("Gaim - Save As...")); gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(ft->window)); @@ -218,8 +218,8 @@ GtkWidget *button = NULL, *pct = NULL; if (!(ft->f = fopen(file,"w"))) { - g_snprintf(buf, BUF_LONG / 2, "Error writing file %s", file); - do_error_dialog(buf, "Error"); + g_snprintf(buf, BUF_LONG / 2, _("Error writing file %s"), file); + do_error_dialog(buf, _("Error")); ft->accepted = 0; accept_callback(NULL, ft); return; @@ -267,7 +267,7 @@ rcv = 0; fw = gtk_dialog_new(); - snprintf(buf, 2048, "Receiving %s from %s", ft->filename, ft->user); + snprintf(buf, 2048, _("Receiving %s from %s"), ft->filename, ft->user); label = gtk_label_new(buf); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->vbox), label, 0, 0, 5); gtk_widget_show(label); @@ -277,11 +277,11 @@ pct = gtk_label_new("0 %"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), pct, 0, 0, 5); gtk_widget_show(pct); - button = gtk_button_new_with_label("Cancel"); + button = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), button, 0, 0, 5); gtk_widget_show(button); gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)toggle, &cont); - gtk_window_set_title(GTK_WINDOW(fw), "Gaim - File Transfer"); + gtk_window_set_title(GTK_WINDOW(fw), _("Gaim - File Transfer")); gtk_widget_realize(fw); aol_icon(fw->window); gtk_widget_show(fw); @@ -402,7 +402,7 @@ read_file_header(ft->fd, &fhdr); fw = gtk_dialog_new(); - snprintf(buf, 2048, "Sending %s to %s", fhdr.name, ft->user); + snprintf(buf, 2048, _("Sending %s to %s"), fhdr.name, ft->user); label = gtk_label_new(buf); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->vbox), label, 0, 0, 5); gtk_widget_show(label); @@ -412,11 +412,11 @@ pct = gtk_label_new("0 %"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), pct, 0, 0, 5); gtk_widget_show(pct); - button = gtk_button_new_with_label("Cancel"); + button = gtk_button_new_with_label(_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), button, 0, 0, 5); gtk_widget_show(button); gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)toggle, &cont); - gtk_window_set_title(GTK_WINDOW(fw), "Gaim - File Transfer"); + gtk_window_set_title(GTK_WINDOW(fw), _("Gaim - File Transfer")); gtk_widget_realize(fw); aol_icon(fw->window); gtk_widget_show(fw); @@ -487,8 +487,8 @@ stat(file, &st); if (!(ft->f = fopen(file, "r"))) { - g_snprintf(buf, BUF_LONG / 2, "Error reading file %s", file); - do_error_dialog(buf, "Error"); + g_snprintf(buf, BUF_LONG / 2, _("Error reading file %s"), file); + do_error_dialog(buf, _("Error")); ft->accepted = 0; accept_callback(NULL, ft); free_ft(ft); @@ -630,10 +630,10 @@ ft->window = gtk_window_new(GTK_WINDOW_DIALOG); - accept = gtk_button_new_with_label("Accept"); - info = gtk_button_new_with_label("Info"); - warn = gtk_button_new_with_label("Warn"); - cancel = gtk_button_new_with_label("Cancel"); + accept = gtk_button_new_with_label(_("Accept")); + info = gtk_button_new_with_label(_("Info")); + warn = gtk_button_new_with_label(_("Warn")); + cancel = gtk_button_new_with_label(_("Cancel")); bbox = gtk_hbox_new(TRUE, 10); vbox = gtk_vbox_new(FALSE, 5); @@ -649,10 +649,10 @@ gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); if (!strcmp(ft->UID, FILE_SEND_UID)) { - g_snprintf(buf, sizeof(buf), "%s requests you to accept the file: %s (%d bytes)", + g_snprintf(buf, sizeof(buf), _("%s requests you to accept the file: %s (%d bytes)"), ft->user, ft->filename, ft->size); } else { - g_snprintf(buf, sizeof(buf), "%s requests you to send them a file", + g_snprintf(buf, sizeof(buf), _("%s requests you to send them a file"), ft->user); } if (ft->message) @@ -662,7 +662,7 @@ gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5); - gtk_window_set_title(GTK_WINDOW(ft->window), "Gaim - File Transfer?"); + gtk_window_set_title(GTK_WINDOW(ft->window), _("Gaim - File Transfer?")); gtk_window_set_focus(GTK_WINDOW(ft->window), accept); gtk_container_add(GTK_CONTAINER(ft->window), vbox); gtk_container_border_width(GTK_CONTAINER(ft->window), 10);