# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1134409783 0
# Node ID 1b57012eec7bd432157bc311d1be6026cb9fceb3
# Parent  31e4eb57cc8651742c37c248c0829ee6aba3bd06
[gaim-migrate @ 14777]
It seems to me that we should use consistent status names. I don't like having Online and Available. Let me know if I'm missing something. Perhaps we should allow passing of a NULL name to the status _new() functions and it could have a default name? If that sounds good, let me know and I'll code it up.

committer: Tailor Script <tailor@pidgin.im>

diff -r 31e4eb57cc86 -r 1b57012eec7b src/protocols/gg/gg.c
--- a/src/protocols/gg/gg.c	Mon Dec 12 17:32:32 2005 +0000
+++ b/src/protocols/gg/gg.c	Mon Dec 12 17:49:43 2005 +0000
@@ -1434,7 +1434,7 @@
 	types = g_list_append(types, type);
 
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, "available",
-			_("Online"), TRUE, TRUE, FALSE, "message", _("Message"),
+			_("Available"), TRUE, TRUE, FALSE, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
diff -r 31e4eb57cc86 -r 1b57012eec7b src/protocols/jabber/buddy.c
--- a/src/protocols/jabber/buddy.c	Mon Dec 12 17:32:32 2005 +0000
+++ b/src/protocols/jabber/buddy.c	Mon Dec 12 17:49:43 2005 +0000
@@ -1086,7 +1086,7 @@
 		case JABBER_BUDDY_STATE_UNAVAILABLE:
 			return _("Offline");
 		case JABBER_BUDDY_STATE_ONLINE:
-			return _("Online");
+			return _("Available");
 		case JABBER_BUDDY_STATE_CHAT:
 			return _("Chatty");
 		case JABBER_BUDDY_STATE_AWAY:
diff -r 31e4eb57cc86 -r 1b57012eec7b src/protocols/napster/napster.c
--- a/src/protocols/napster/napster.c	Mon Dec 12 17:32:32 2005 +0000
+++ b/src/protocols/napster/napster.c	Mon Dec 12 17:49:43 2005 +0000
@@ -581,7 +581,7 @@
 
 	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
 									 "available",
-									 _("Online"), TRUE, TRUE, FALSE);
+									 _("Available"), TRUE, TRUE, FALSE);
 	types = g_list_append(types, type);
 
 	return types;
diff -r 31e4eb57cc86 -r 1b57012eec7b src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon Dec 12 17:32:32 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Dec 12 17:49:43 2005 +0000
@@ -2641,17 +2641,17 @@
 	case YAHOO_STATUS_BUSY:
 		return _("Busy");
 	case YAHOO_STATUS_NOTATHOME:
-		return _("Not At Home");
+		return _("Not at Home");
 	case YAHOO_STATUS_NOTATDESK:
-		return _("Not At Desk");
+		return _("Not at Desk");
 	case YAHOO_STATUS_NOTINOFFICE:
-		return _("Not In Office");
+		return _("Not in Office");
 	case YAHOO_STATUS_ONPHONE:
-		return _("On The Phone");
+		return _("On the Phone");
 	case YAHOO_STATUS_ONVACATION:
 		return _("On Vacation");
 	case YAHOO_STATUS_OUTTOLUNCH:
-		return _("Out To Lunch");
+		return _("Out to Lunch");
 	case YAHOO_STATUS_STEPPEDOUT:
 		return _("Stepped Out");
 	case YAHOO_STATUS_INVISIBLE:
@@ -2661,7 +2661,7 @@
 	case YAHOO_STATUS_OFFLINE:
 		return _("Offline");
 	default:
-		return _("Online");
+		return _("Available");
 	}
 }
 
diff -r 31e4eb57cc86 -r 1b57012eec7b src/protocols/zephyr/zephyr.c
--- a/src/protocols/zephyr/zephyr.c	Mon Dec 12 17:32:32 2005 +0000
+++ b/src/protocols/zephyr/zephyr.c	Mon Dec 12 17:49:43 2005 +0000
@@ -2250,7 +2250,7 @@
 	   Away won't change their exposure but will set an auto away message (for IMs only)
 	*/
 	
-	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, "available", _("Online"), FALSE);
+	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, "available", _("Available"), FALSE);
 	types = g_list_append(types,type);
 
 	type = gaim_status_type_new(GAIM_STATUS_HIDDEN, "hidden", _("Hidden"), FALSE);