# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1248818859 0
# Node ID b48aaed6391f696dc058a84eda734b650066bea8
# Parent  390c3a6a44c6c38ac56fd882bafc3a0820382e50# Parent  8b4008eb02a04fa4b75459dc5016c6accccc6837
merge of '18102fcd19439a6e6f2e689922316eaa8fd42ca1'
     and 'b1751fad51777025056348d2e46ed2a6f330725e'

diff -r 8b4008eb02a0 -r b48aaed6391f pidgin/plugins/themeedit-icon.c
--- a/pidgin/plugins/themeedit-icon.c	Tue Jul 28 22:04:15 2009 +0000
+++ b/pidgin/plugins/themeedit-icon.c	Tue Jul 28 22:07:39 2009 +0000
@@ -73,7 +73,10 @@
 }, chatemblems[] = {
 	{PIDGIN_STOCK_STATUS_IGNORED, N_("Ignored")},
 	{PIDGIN_STOCK_STATUS_FOUNDER, N_("Founder")},
+	/* A user in a chat room who has special privileges. */
 	{PIDGIN_STOCK_STATUS_OPERATOR, N_("Operator")},
+	/* A half operator is someone who has a subset of the privileges
+	   that an operator has. */
 	{PIDGIN_STOCK_STATUS_HALFOP, N_("Half Operator")},
 	{PIDGIN_STOCK_STATUS_VOICE, N_("Voice")},
 	{NULL, NULL}