# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1050349349 0
# Node ID 494b6b6a6ffa6aca08e2a2b4565eda16201d6169
# Parent  feda37d46e1757d85a847fb527332f8fa52a87c9
[gaim-migrate @ 5495]
I changed some zephyr stuff.  I think it's funny.  I made the get info
box not show "Alias: (null)" for people without aliases, which I guess
will fix a crash bug with zephyr on solaris, maybe.  And I also
gettexticised some strings.

I thought I'd mention this in the change log because it's funny (that
zephyr still exists).  And to anyone who's wondering, NC State does have
a zephyr realm set up, but not many people use it.

I also mentioned the ICQ authorization thing.  I figure some
peeps might care.  I bet the Care Bears care.

committer: Tailor Script <tailor@pidgin.im>

diff -r feda37d46e17 -r 494b6b6a6ffa ChangeLog
--- a/ChangeLog	Mon Apr 14 18:24:38 2003 +0000
+++ b/ChangeLog	Mon Apr 14 19:42:29 2003 +0000
@@ -6,6 +6,9 @@
 	* Support for Jabber XHTML messages
 	* Updated a number of translations. Thanks to everyone who submitted
 	  a translation update.
+	* Ability to re-request authorization from ICQ users by right 
+	  clicking on them in your buddy list.
+	* Improved Zephyr internationalization.
 
 version 0.61 (04/07/2003):
 	* Split the buddy pounce core and UI, and rewrote the UI for it.
diff -r feda37d46e17 -r 494b6b6a6ffa src/protocols/zephyr/zephyr.c
--- a/src/protocols/zephyr/zephyr.c	Mon Apr 14 18:24:38 2003 +0000
+++ b/src/protocols/zephyr/zephyr.c	Mon Apr 14 19:42:29 2003 +0000
@@ -333,15 +333,15 @@
 				ZLocations_t locs;
 				int one = 1;
 				GString *str = g_string_new("");
-				g_string_append_printf(str, "<b>User:</b> %s<br>"
-								"<b>Alias:</b> %s<br>",
-								b->name, b->alias);
+				g_string_append_printf(str, _("<b>User:</b> %s<br>"), b->name);
+				if (b->alias)
+					g_string_append_printf(str, _("<b>Alias:</b> %s<br>"), b->alias);
 				if (!nlocs) {
-					g_string_append_printf(str, "<br>Hidden or not logged-in");
+					g_string_append_printf(str, _("<br>Hidden or not logged-in"));
 				}
 				for (; nlocs > 0; nlocs--) {
 					ZGetLocations(&locs, &one);
-					g_string_append_printf(str, "<br>At %s since %s", locs.host,
+					g_string_append_printf(str, _("<br>At %s since %s"), locs.host,
 									locs.time);
 				}
 				g_show_info_text(NULL, NULL, 2, str->str, NULL);
@@ -513,8 +513,7 @@
 			if (buff[0]) {
 				triple = g_strsplit(buff, ",", 3);
 				if (triple[0] && triple[1] ) {
-					/*					char *tmp = g_strdup_printf("%s@%s", g_getenv("USER"), 
-										ZGetRealm());*/
+					/* char *tmp = g_strdup_printf("%s@%s", g_getenv("USER"), ZGetRealm()); */
 					char *tmp = g_strdup_printf("%s",ZGetSender());
 					char *atptr;
 					sub.zsub_class = triple[0];
@@ -595,8 +594,8 @@
 	ZSubscription_t sub;
 
 	if (zgc) {
-		do_error_dialog("Already logged in with Zephyr", "Because Zephyr uses your system username, you are unable to "
-				"have multiple accounts on it when logged in as the same user.", GAIM_ERROR);
+		do_error_dialog(_("Already logged in with Zephyr"), _("Because Zephyr uses your system username, you are unable to "
+				"have multiple accounts on it when logged in as the same user."), GAIM_ERROR);
 		return;
 	}
 
@@ -858,10 +857,10 @@
 		gc->away = NULL;
 	}
 
-	if (!g_ascii_strcasecmp(state, "Hidden")) {
+	if (!g_ascii_strcasecmp(state, _("Hidden"))) {
 		ZSetLocation(EXPOSE_OPSTAFF);
 		gc->away = g_strdup("");
-	} else if (!g_ascii_strcasecmp(state, "Online"))
+	} else if (!g_ascii_strcasecmp(state, _("Online")))
 		ZSetLocation(get_exposure_level());
 	else /* state is GAIM_AWAY_CUSTOM */ if (msg)
 		gc->away = g_strdup(msg);
@@ -871,9 +870,9 @@
 {
 	GList *m = NULL;
 
-	m = g_list_append(m, "Online");
+	m = g_list_append(m, _("Online"));
 	m = g_list_append(m, GAIM_AWAY_CUSTOM);
-	m = g_list_append(m, "Hidden");
+	m = g_list_append(m, _("Hidden"));
 
 	return m;
 }