[Gaim-commits] CVS: gaim/src/protocols/icq gaim_icq.c,1.41,1.42

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/icq
In directory sc8-pr-cvs1:/tmp/cvs-serv3956/src/protocols/icq

Modified Files:
	gaim_icq.c 
Log Message:
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)."




Index: gaim_icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/gaim_icq.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- gaim_icq.c	13 Mar 2003 06:08:54 -0000	1.41
+++ gaim_icq.c	19 Mar 2003 23:07:49 -0000	1.42
@@ -291,7 +291,7 @@
 	iq->uin = uin;
 	iq->gc = link->icq_UserData;
 
-	g_snprintf(msg, sizeof(msg), "The user %s (%s%s%s%s%s) wants you to authorize them.",
+	g_snprintf(msg, sizeof(msg), _("The user %s (%s%s%s%s%s) wants you to authorize them."),
 			nick, first ? first : "", first && last ? " " : "", last ? last : "",
 			(first || last) && email ? ", " : "", email ? email : "");
 	do_ask_dialog(msg, NULL, iq, _("Authorize"), icq_acc_auth, _("Deny"), icq_den_auth, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
@@ -341,7 +341,7 @@
 	icq_ContactClear(id->link);
 
 	if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) {
-		hide_login_progress(gc, "Unable to connect");
+		hide_login_progress(gc, _("Unable to connect"));
 		signoff(gc);
 		return;
 	}
@@ -349,7 +349,7 @@
 	id->cur_status = STATUS_ONLINE;
 	icq_Login(link, STATUS_ONLINE);
 
-	set_login_progress(gc, 0, "Connecting...");
+	set_login_progress(gc, 0, _("Connecting..."));
 }
 
 static void icq_close(struct gaim_connection *gc) {