Mercurial > pidgin.yaz

changeset 4114:fa5075168c23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4330] "Internationalized some dropdowns." and "More boring updates!! but this time to multi.c" both from Nicola's Lichtmaier committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 22 Dec 2002 18:39:20 +0000
parents 74d27aa5b686
children 474265997752
files src/multi.c src/prefs.c
diffstat 2 files changed, 35 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/src/multi.c	Sun Dec 22 18:35:18 2002 +0000
+++ b/src/multi.c	Sun Dec 22 18:39:20 2002 +0000
@@ -1254,7 +1254,7 @@
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(del_acct), NULL);
 
-	button = gaim_pixbuf_button_from_stock("_Modify", GTK_STOCK_PREFERENCES,
+	button = gaim_pixbuf_button_from_stock(_("_Modify"), GTK_STOCK_PREFERENCES,
 										   GAIM_BUTTON_HORIZONTAL);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1454,7 +1454,7 @@
 	
 	meter->progress = gtk_progress_bar_new ();
 	
-	meter->button = gtk_button_new_with_label ("Cancel");
+	meter->button = gtk_button_new_with_label (_("Cancel"));
 	gtk_signal_connect (GTK_OBJECT (meter->button), "clicked", GTK_SIGNAL_FUNC (cancel_signon), meter);
 		
 	gtk_table_attach (GTK_TABLE (table), graphic, 0, 1, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
@@ -1514,8 +1514,8 @@
 		gtk_table_set_row_spacings (GTK_TABLE (meter_win->table), 5);
 		gtk_table_set_col_spacings (GTK_TABLE (meter_win->table), 10);
 	
-		cancel_button = gtk_button_new_with_label ("Cancel All");
-    	gtk_signal_connect_object (GTK_OBJECT (cancel_button), "clicked", GTK_SIGNAL_FUNC (loop_cancel), NULL);
+		cancel_button = gtk_button_new_with_label (_("Cancel All"));
+		gtk_signal_connect_object (GTK_OBJECT (cancel_button), "clicked", GTK_SIGNAL_FUNC (loop_cancel), NULL);
 		gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (cancel_button), FALSE, FALSE, 0);
 	
 		gtk_signal_connect (GTK_OBJECT (meter_win->window), "delete_event", GTK_SIGNAL_FUNC (meter_destroy), NULL);
--- a/src/prefs.c	Sun Dec 22 18:35:18 2002 +0000
+++ b/src/prefs.c	Sun Dec 22 18:39:20 2002 +0000
@@ -347,10 +347,10 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	vbox = make_frame (ret, _("Window"));
-	widge = gaim_dropdown(vbox, "Show _buttons as:", &im_options, OPT_IM_BUTTON_TEXT | OPT_IM_BUTTON_XPM,
-		      "Pictures", OPT_IM_BUTTON_XPM,
-		      "Text", OPT_IM_BUTTON_TEXT,
-		      "Pictures and text", OPT_IM_BUTTON_XPM | OPT_IM_BUTTON_TEXT, NULL);
+	widge = gaim_dropdown(vbox, _("Show _buttons as:"), &im_options, OPT_IM_BUTTON_TEXT | OPT_IM_BUTTON_XPM,
+		      _("Pictures"), OPT_IM_BUTTON_XPM,
+		      _("Text"), OPT_IM_BUTTON_TEXT,
+		      _("Pictures and text"), OPT_IM_BUTTON_XPM | OPT_IM_BUTTON_TEXT, NULL);
 	gtk_size_group_add_widget(sg, widge);
 	gtk_misc_set_alignment(GTK_MISC(widge), 0, 0);
 	gaim_labeled_spin_button(vbox, _("New window _width:"), &conv_size.width, 25, 9999, sg);
@@ -389,10 +389,10 @@
 	sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
 	vbox = make_frame (ret, _("Window"));
-	dd = gaim_dropdown(vbox, "Show _buttons as:", &chat_options, OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM,
-			   "Pictures", OPT_CHAT_BUTTON_XPM,
-			   "Text", OPT_CHAT_BUTTON_TEXT,
-			   "Pictures and text", OPT_CHAT_BUTTON_XPM | OPT_CHAT_BUTTON_TEXT, NULL);
+	dd = gaim_dropdown(vbox, _("Show _buttons as:"), &chat_options, OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM,
+			   _("Pictures"), OPT_CHAT_BUTTON_XPM,
+			   _("Text"), OPT_CHAT_BUTTON_TEXT,
+			   _("Pictures and text"), OPT_CHAT_BUTTON_XPM | OPT_CHAT_BUTTON_TEXT, NULL);
 	gtk_size_group_add_widget(sg, dd);
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0);
 	gaim_labeled_spin_button(vbox, _("New window _width:"), &buddy_chat_size.width, 25, 9999, sg);
@@ -423,21 +423,21 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	vbox = make_frame (ret, _("IM Tabs"));
-	dd = gaim_dropdown(vbox, "Tab _placement:", &im_options, OPT_IM_SIDE_TAB | OPT_IM_BR_TAB,
-		      "Top", 0,
-		      "Bottom", OPT_IM_BR_TAB,
-		      "Left", OPT_IM_SIDE_TAB,
-		      "Right", OPT_IM_BR_TAB | OPT_IM_SIDE_TAB, NULL);
+	dd = gaim_dropdown(vbox, _("Tab _placement:"), &im_options, OPT_IM_SIDE_TAB | OPT_IM_BR_TAB,
+		      _("Top"), 0,
+		      _("Bottom"), OPT_IM_BR_TAB,
+		      _("Left"), OPT_IM_SIDE_TAB,
+		      _("Right"), OPT_IM_BR_TAB | OPT_IM_SIDE_TAB, NULL);
 	gtk_size_group_add_widget(sg, dd);
 	gaim_button(_("Show all _instant messages in one tabbed\nwindow"), &im_options, OPT_IM_ONE_WINDOW, vbox);
 	gaim_button(_("Show a_liases in tabs/titles"), &im_options, OPT_IM_ALIAS_TAB, vbox);
 
 	vbox = make_frame (ret, _("Chat Tabs"));
-	dd = gaim_dropdown(vbox, "Tab _placement:", &chat_options, OPT_CHAT_SIDE_TAB | OPT_CHAT_BR_TAB,
-			   "Top", 0,
-			   "Bottom", OPT_CHAT_BR_TAB,
-			   "Left", OPT_CHAT_SIDE_TAB,
-			   "Right", OPT_CHAT_SIDE_TAB | OPT_CHAT_BR_TAB, NULL);
+	dd = gaim_dropdown(vbox, _("Tab _placement:"), &chat_options, OPT_CHAT_SIDE_TAB | OPT_CHAT_BR_TAB,
+			   _("Top"), 0,
+			   _("Bottom"), OPT_CHAT_BR_TAB,
+			   _("Left"), OPT_CHAT_SIDE_TAB,
+			   _("Right"), OPT_CHAT_SIDE_TAB | OPT_CHAT_BR_TAB, NULL);
 	gtk_size_group_add_widget(sg, dd);
 	gaim_button(_("Show all c_hats in one tabbed window"), &chat_options, OPT_CHAT_ONE_WINDOW,
 		    vbox);
@@ -446,9 +446,9 @@
 	gaim_button(_("Show IMs and chats in _same tabbed\nwindow."), &convo_options, OPT_CONVO_COMBINE, vbox);
 
 	vbox = make_frame (ret, _("Buddy List Tabs"));
-	dd = gaim_dropdown(vbox, "Tab _placement:", &blist_options, OPT_BLIST_BOTTOM_TAB,
-		      "Top", 0,
-		      "Bottom", OPT_BLIST_BOTTOM_TAB, NULL);
+	dd = gaim_dropdown(vbox, _("Tab _placement:"), &blist_options, OPT_BLIST_BOTTOM_TAB,
+		      _("Top"), 0,
+		      _("Bottom"), OPT_BLIST_BOTTOM_TAB, NULL);
 	gtk_size_group_add_widget(sg, dd);
 
 	gtk_widget_show_all(ret);
@@ -467,8 +467,8 @@
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
 
 	vbox = make_frame (ret, _("Proxy Type"));
-	gaim_dropdown(vbox, "Proxy _type:", &proxytype, -1,
-		      "No proxy", PROXY_NONE,
+	gaim_dropdown(vbox, _("Proxy _type:"), &proxytype, -1,
+		      _("No proxy"), PROXY_NONE,
 		      "SOCKS 4", PROXY_SOCKS4,
 		      "SOCKS 5", PROXY_SOCKS5,
 		      "HTTP", PROXY_HTTP, NULL);
@@ -573,13 +573,13 @@
 #ifndef _WIN32
 	/* Registered default browser is used by Windows */
 	vbox = make_frame (ret, _("Browser Selection"));
-	label = gaim_dropdown(vbox, "_Browser", &web_browser, -1,
+	label = gaim_dropdown(vbox, _("_Browser"), &web_browser, -1,
 			      "Netscape", BROWSER_NETSCAPE,
 			      "Konqueror", BROWSER_KONQ,
 			      "Mozilla", BROWSER_MOZILLA,
-			      "Manual", BROWSER_MANUAL,
+			      _("Manual"), BROWSER_MANUAL,
 /* fixme: GNOME binary helper
-			      "GNOME URL Handler", BROWSER_GNOME, */
+			      _("GNOME URL Handler"), BROWSER_GNOME, */
 			      "Galeon", BROWSER_GALEON,
 			      "Opera", BROWSER_OPERA, NULL);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
@@ -668,10 +668,10 @@
 
 #ifndef _WIN32
 	vbox = make_frame (ret, _("Sound Method"));
-	dd = gaim_dropdown(vbox, "_Method", &sound_options, OPT_SOUND_BEEP |
+	dd = gaim_dropdown(vbox, _("_Method"), &sound_options, OPT_SOUND_BEEP |
 		      OPT_SOUND_ESD | OPT_SOUND_ARTSC | OPT_SOUND_NAS | OPT_SOUND_NORMAL |
 		      OPT_SOUND_CMD,
-		      "Console beep", OPT_SOUND_BEEP,
+		      _("Console beep"), OPT_SOUND_BEEP,
 #ifdef ESD_SOUND
 		      "ESD", OPT_SOUND_ESD,
 #endif
@@ -681,8 +681,8 @@
 #ifdef NAS_SOUND
 		      "NAS", OPT_SOUND_NAS,
 #endif
-		      "Internal", OPT_SOUND_NORMAL,
-		      "Command", OPT_SOUND_CMD, NULL);
+		      _("Internal"), OPT_SOUND_NORMAL,
+		      _("Command"), OPT_SOUND_CMD, NULL);
 	gtk_size_group_add_widget(sg, dd);
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0);
 
@@ -1173,7 +1173,7 @@
 		gtk_list_store_append (event_store, &iter);
 		gtk_list_store_set(event_store, &iter,
 				   0, sound_options & sounds[j].opt,
-				   1, sounds[j].label,
+				   1, gettext(sounds[j].label),
 				   2, j, -1);
 	}