Mercurial > pidgin.yaz
comparison src/multi.c @ 4834:0ed37c803503
[gaim-migrate @ 5159]
Bjoern Voigt writes:
"I resolved the conflicts and added a new patch in the attachment.
Besides this updates
| I have updated the German translation and fixed some i18n bugs. Most
| interesting is, that the new Gaim main menu now can be translated. As
| a quick fix I added a new item_factory_translate_func function to
| buddy.c. Now there are 2 static item_factory_translate_func functions
| in buddy.c and gtkconv.c. If you are interested, I can clean this next
| time (only one global function in gaim.h and utils.c).
| The other i18n fixed mark some strings as translatable, for instance
| in the "Get Buddy Info" message boxes.
I included an i18n fix for src/util.c:for sec_to_text (seconds to
text)."
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Wed, 19 Mar 2003 23:07:52 +0000 |
parents | 1e28e7d802a1 |
children | ac9ed6c5594f |
comparison
equal
deleted
inserted
replaced
4833:a6960b4b0c9b | 4834:0ed37c803503 |
---|---|
904 gtk_widget_show(label); | 904 gtk_widget_show(label); |
905 | 905 |
906 dropdown = gtk_option_menu_new(); | 906 dropdown = gtk_option_menu_new(); |
907 menu = gtk_menu_new(); | 907 menu = gtk_menu_new(); |
908 | 908 |
909 opt = gtk_menu_item_new_with_label("Use Global Proxy Settings"); | 909 opt = gtk_menu_item_new_with_label(_("Use Global Proxy Settings")); |
910 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_USE_GLOBAL)); | 910 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_USE_GLOBAL)); |
911 g_signal_connect(G_OBJECT(opt), "activate", | 911 g_signal_connect(G_OBJECT(opt), "activate", |
912 G_CALLBACK(proxy_dropdown_set), ma); | 912 G_CALLBACK(proxy_dropdown_set), ma); |
913 gtk_widget_show(opt); | 913 gtk_widget_show(opt); |
914 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 914 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
915 if(!gpi) | 915 if(!gpi) |
916 gtk_menu_set_active(GTK_MENU(menu), 0); | 916 gtk_menu_set_active(GTK_MENU(menu), 0); |
917 | 917 |
918 opt = gtk_menu_item_new_with_label("No Proxy"); | 918 opt = gtk_menu_item_new_with_label(_("No Proxy")); |
919 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_NONE)); | 919 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_NONE)); |
920 g_signal_connect(G_OBJECT(opt), "activate", | 920 g_signal_connect(G_OBJECT(opt), "activate", |
921 G_CALLBACK(proxy_dropdown_set), ma); | 921 G_CALLBACK(proxy_dropdown_set), ma); |
922 gtk_widget_show(opt); | 922 gtk_widget_show(opt); |
923 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 923 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |