merge of '2187f9250a16ad1a137fd9d85f182385071b993c'

     and 'ca2e1101631d27b5071d9a9d912f0eea52f5e19e'


committer: Luke Schierer <lschiere@pidgin.im>

90 files changed, 32104 insertions, 25027 deletions

diff --git a/ChangeLog.API b/ChangeLog.API
index 59b687366c..bfc4d4697e 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -390,6 +390,7 @@ version 2.0.0:
 	* GtkGaimScrollBook and its functions.
 	* purple_markup_unescape_entity()
 	* purple_markup_get_css_property()
+	* purple_group_get_name()
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.
diff --git a/configure.ac b/configure.ac
index 672f4d755f..399c58bbb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2061,7 +2061,9 @@ AC_OUTPUT([Makefile
 		   pidgin/pixmaps/toolbar/22/scalable/Makefile
 		   pidgin/pixmaps/tray/Makefile
 		   pidgin/pixmaps/tray/16/Makefile
+		   pidgin/pixmaps/tray/16/scalable/Makefile
 		   pidgin/pixmaps/tray/22/Makefile
+		   pidgin/pixmaps/tray/22/scalable/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
 		   pidgin/plugins/gestures/Makefile
diff --git a/finch/gntblist.c b/finch/gntblist.c
index 10b99de004..7dadc07bdd 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -112,7 +112,7 @@ static void savedstatus_changed(PurpleSavedStatus *now, PurpleSavedStatus *old);
 static void blist_show(PurpleBuddyList *list);
 static void update_node_display(PurpleBlistNode *buddy, FinchBlist *ggblist);
 static void update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist);
-static void account_signed_on_cb(void);
+static void account_signed_on_cb(PurpleConnection *pc, gpointer null);
 
 /* Sort functions */
 static int blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2);
@@ -1421,6 +1421,7 @@ draw_tooltip(FinchBlist *ggblist)
 static void
 selection_changed(GntWidget *widget, gpointer old, gpointer current, FinchBlist *ggblist)
 {
+	remove_peripherals(ggblist);
 	draw_tooltip(ggblist);
 }
 
@@ -2065,7 +2066,7 @@ reconstruct_accounts_menu()
 }
 
 static void
-account_signed_on_cb()
+account_signed_on_cb(PurpleConnection *pc, gpointer null)
 {
 	PurpleBlistNode *node;
 
@@ -2073,7 +2074,8 @@ account_signed_on_cb()
 			node = purple_blist_node_next(node, FALSE)) {
 		if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
 			PurpleChat *chat = (PurpleChat*)node;
-			if (purple_blist_node_get_bool(node, "gnt-autojoin"))
+			if (chat->account == purple_connection_get_account(pc) &&
+					purple_blist_node_get_bool(node, "gnt-autojoin"))
 				serv_join_chat(purple_account_get_connection(chat->account), chat->components);
 		}
 	}
diff --git a/finch/libgnt/gntmain.c b/finch/libgnt/gntmain.c
index e7b70e95d1..45644cad9e 100644
--- a/finch/libgnt/gntmain.c
+++ b/finch/libgnt/gntmain.c
@@ -518,6 +518,7 @@ gboolean gnt_screen_menu_show(gpointer newmenu)
 	gnt_widget_draw(GNT_WIDGET(wm->menu));
 
 	g_signal_connect(G_OBJECT(wm->menu), "hide", G_CALLBACK(reset_menu), NULL);
+	g_signal_connect(G_OBJECT(wm->menu), "destroy", G_CALLBACK(reset_menu), NULL);
 
 	return TRUE;
 }
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
index e3be8273a8..1d40ba2991 100644
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -152,7 +152,7 @@ dbus_headers  = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-d
 
 dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
                 connection.h conversation.h core.h log.h prefs.h roomlist.h \
-                savedstatuses.h status.h server.h xmlnode.h
+                savedstatuses.h status.h server.h util.h xmlnode.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders))
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
diff --git a/libpurple/blist.c b/libpurple/blist.c
index 13c199bbc0..0a8313c917 100644
--- a/libpurple/blist.c
+++ b/libpurple/blist.c
@@ -1825,7 +1825,6 @@ void purple_blist_remove_buddy(PurpleBuddy *buddy)
 	/* Delete the node */
 	purple_buddy_icon_unref(buddy->icon);
 	g_hash_table_destroy(buddy->node.settings);
-	purple_presence_remove_buddy(buddy->presence, buddy);
 	purple_presence_destroy(buddy->presence);
 	g_free(buddy->name);
 	g_free(buddy->alias);
@@ -2037,13 +2036,18 @@ const char *purple_chat_get_name(PurpleChat *chat)
 	struct proto_chat_entry *pce;
 	GList *parts;
 	char *ret;
+	PurplePlugin *prpl;
+	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	g_return_val_if_fail(chat != NULL, NULL);
 
 	if ((chat->alias != NULL) && (*chat->alias != '\0'))
 		return chat->alias;
 
-	parts = PURPLE_PLUGIN_PROTOCOL_INFO(chat->account->gc->prpl)->chat_info(chat->account->gc);
+	prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account));
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+
+	parts = prpl_info->chat_info(chat->account->gc);
 	pce = parts->data;
 	ret = g_hash_table_lookup(chat->components, pce->identifier);
 	g_list_foreach(parts, (GFunc)g_free, NULL);
@@ -2406,6 +2410,13 @@ gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account)
 	return FALSE;
 }
 
+const char *purple_group_get_name(PurpleGroup *group)
+{
+	g_return_val_if_fail(group != NULL, NULL);
+
+	return group->name;
+}
+
 void
 purple_blist_request_add_buddy(PurpleAccount *account, const char *username,
 							 const char *group, const char *alias)
diff --git a/libpurple/blist.h b/libpurple/blist.h
index 76eae5b6db..90b569e0ae 100644
--- a/libpurple/blist.h
+++ b/libpurple/blist.h
@@ -686,6 +686,15 @@ GSList *purple_group_get_accounts(PurpleGroup *g);
 gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account);
 
 /**
+ * Returns the name of a group.
+ *
+ * @param group The group.
+ *
+ * @return The name of the group.
+ */
+const char *purple_group_get_name(PurpleGroup *group);
+
+/**
  * Called when an account gets signed on.  Tells the UI to update all the
  * buddies.
  *
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index 9030472c4a..901b8c999e 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -372,7 +372,7 @@ purple_buddy_icon_update(PurpleBuddyIcon *icon)
 	PurpleAccount *account;
 	const char *username;
 	PurpleBuddyIcon *icon_to_set;
-	GSList *sl, *list;
+	GSList *buddies;
 
 	g_return_if_fail(icon != NULL);
 
@@ -386,11 +386,10 @@ purple_buddy_icon_update(PurpleBuddyIcon *icon)
 	 * the icon when they realize it has no data. */
 	icon_to_set = icon->img ? icon : NULL;
 
-	for (list = sl = purple_find_buddies(account, username);
-	     sl != NULL;
-	     sl = sl->next)
+	buddies = purple_find_buddies(account, username);
+	while (buddies != NULL)
 	{
-		PurpleBuddy *buddy = (PurpleBuddy *)sl->data;
+		PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
 		char *old_icon;
 
 		purple_buddy_set_icon(buddy, icon_to_set);
@@ -425,9 +424,9 @@ purple_buddy_icon_update(PurpleBuddyIcon *icon)
 		}
 		unref_filename(old_icon);
 		g_free(old_icon);
-	}
 
-	g_slist_free(list);
+		buddies = g_slist_delete_link(buddies, buddies);
+	}
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, username, account);
 
diff --git a/libpurple/connection.c b/libpurple/connection.c
index a61e61c9de..0113260a26 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -161,7 +161,7 @@ void
 purple_connection_destroy(PurpleConnection *gc)
 {
 	PurpleAccount *account;
-	GSList *buddies, *tmp;
+	GSList *buddies;
 #if 0
 	GList *wins;
 #endif
@@ -197,11 +197,11 @@ purple_connection_destroy(PurpleConnection *gc)
 
 	/* Clear out the proto data that was freed in the prpl close method*/
 	buddies = purple_find_buddies(account, NULL);
-	for (tmp = buddies; tmp; tmp = tmp->next) {
-		PurpleBuddy *buddy = tmp->data;
+	while (buddies != NULL) {
+		PurpleBuddy *buddy = buddies->data;
 		buddy->proto_data = NULL;
+		buddies = g_slist_delete_link(buddies, buddies);
 	}
-	g_slist_free(buddies);
 
 	connections = g_list_remove(connections, gc);
 
diff --git a/libpurple/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py
index f79c0388ee..bfe45f6f50 100644
--- a/libpurple/dbus-analyze-functions.py
+++ b/libpurple/dbus-analyze-functions.py
@@ -102,7 +102,7 @@ class Binding:
         # pointers ... 
         if (len(type) == 2) and (type[1] == pointer):
             # strings
-            if type[0] == "char":
+            if type[0] in ["char", "gchar"]:
                 if const:
                     return self.inputstring(type, name)
                 else:
@@ -134,7 +134,7 @@ class Binding:
             const = True
 
         # a string
-        if type == ["char", pointer]:
+        if type == ["char", pointer] or type == ["gchar", pointer]:
             return self.outputstring(type, name, const)
 
         # simple types (ints, booleans, enums, ...)
diff --git a/libpurple/gaim-compat.h b/libpurple/gaim-compat.h
index 66c8e8d9f9..d05c8053b3 100644
--- a/libpurple/gaim-compat.h
+++ b/libpurple/gaim-compat.h
@@ -115,7 +115,6 @@
 #define gaim_account_add_buddy       purple_account_add_buddy
 #define gaim_account_add_buddies     purple_account_add_buddies
 #define gaim_account_remove_buddy    purple_account_remove_buddy
-#define gaim_account_remove_buddies  purple_account_remove_buddies
 
 #define gaim_account_remove_group  purple_account_remove_group
 
@@ -1997,7 +1996,6 @@
 #define gaim_presence_get_account        purple_presence_get_account
 #define gaim_presence_get_conversation   purple_presence_get_conversation
 #define gaim_presence_get_chat_user      purple_presence_get_chat_user
-#define gaim_presence_get_buddies        purple_presence_get_buddies
 #define gaim_presence_get_statuses       purple_presence_get_statuses
 #define gaim_presence_get_status         purple_presence_get_status
 #define gaim_presence_get_active_status  purple_presence_get_active_status
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
index 8ccdde0f2e..accc3d7dd6 100644
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -122,7 +122,8 @@ EXTRA_DIST = \
 	filectl.c \
 	fortuneprofile.pl \
 	ipc-test-client.c \
-	ipc-test-server.c
+	ipc-test-server.c \
+	startup.py
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
index 512215483f..f0d312bd89 100644
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -77,10 +77,14 @@ common_sources = \
 #	common/fallback/const-c.inc \
 #	common/fallback/const-xs.inc
 
+perl_scripts = \
+	scripts/function_list.pl
+
 EXTRA_DIST = \
 	Makefile.mingw \
 	common/Makefile.mingw \
-	$(common_sources)
+	$(common_sources) \
+	$(perl_scripts)
 
 common/Makefile: common/Makefile.PL
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index d048917465..f42bfd273d 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -108,7 +108,7 @@ ssl_nss_init_nss(void)
 {
 	char *lib;
 	PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
-	NSS_NoDB_Init(NULL);
+	NSS_NoDB_Init(".");
 
 	/* TODO: Fix this so autoconf does the work trying to find this lib. */
 #ifndef _WIN32
diff --git a/libpurple/plugins/startup.py b/libpurple/plugins/startup.py
new file mode 100644
index 0000000000..d4acc292b1
--- /dev/null
+++ b/libpurple/plugins/startup.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# Makes sure only one purple instance is running
+#
+# Purple is the legal property of its developers, whose names are too numerous
+# to list here.  Please refer to the COPYRIGHT file distributed with this
+# source distribution.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+import sys
+import dbus
+import os
+
+home = os.path.expanduser('~/.purple/')
+for arg in range(1, len(sys.argv[1:])):
+	if sys.argv[arg] == "-c":
+		home = os.path.expanduser(sys.argv[arg + 1])
+		break
+
+bus = dbus.SessionBus()
+
+try:
+	obj = bus.get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
+	purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
+	userdir = purple.PurpleUserDir()
+	if not os.path.isabs(userdir):
+		userdir = os.path.join(purple.PurpleHomeDir(), userdir)
+	if home == userdir:
+		print "Already running."
+		purple.PurpleBlistShow()
+	else:
+		print "Starting client from a different home directory."
+		raise
+except:
+	os.execlp(sys.argv[1], " ".join(sys.argv[2:]))
diff --git a/libpurple/privacy.c b/libpurple/privacy.c
index 0f52995f35..88dbd0a506 100644
--- a/libpurple/privacy.c
+++ b/libpurple/privacy.c
@@ -206,7 +206,8 @@ purple_privacy_deny_remove(PurpleAccount *account, const char *who,
 static void
 add_buddies_in_permit(PurpleAccount *account, gboolean local)
 {
-	GSList *list, *iter;
+	GSList *list;
+
 	/* Remove anyone in the permit list who is not in the buddylist */
 	for (list = account->permit; list != NULL; ) {
 		char *person = list->data;
@@ -214,13 +215,16 @@ add_buddies_in_permit(PurpleAccount *account, gboolean local)
 		if (!purple_find_buddy(account, person))
 			purple_privacy_permit_remove(account, person, local);
 	}
+
 	/* Now make sure everyone in the buddylist is in the permit list */
-	for (iter = list = purple_find_buddies(account, NULL); iter; iter = iter->next) {
-		PurpleBuddy *buddy = iter->data;
+	list = purple_find_buddies(account, NULL);
+	while (list != NULL)
+	{
+		PurpleBuddy *buddy = list->data;
 		if (!g_slist_find_custom(account->permit, buddy->name, (GCompareFunc)g_utf8_collate))
 			purple_privacy_permit_add(account, buddy->name, local);
+		list = g_slist_delete_link(list, list);
 	}
-	g_slist_free(list);
 }
 
 void
diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index e3d5ddcb92..e7154853e7 100644
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -460,6 +460,7 @@ initialize_default_account_values()
 	const char *fullname = NULL;
 #endif
 	char *splitpoint = NULL;
+	char *tmp;
 	char hostname[255];
 
 #ifndef _WIN32
@@ -545,7 +546,16 @@ initialize_default_account_values()
 	if (splitpoint != NULL)
 	{
 		default_firstname = g_strndup(fullname, splitpoint - fullname);
-		default_lastname = g_strdup(&splitpoint[1]);
+		tmp = &splitpoint[1];
+		
+		/* The last name may be followed by a comma and additional data.
+		 * Only use the last name itself.
+		 */
+		splitpoint = strchr(tmp, ',');
+		if (splitpoint != NULL)
+			default_lastname = g_strndup(tmp, splitpoint - tmp);			
+		else
+			default_lastname = g_strdup(tmp);
 	}
 	else
 	{
diff --git a/libpurple/protocols/oscar/family_feedbag.c b/libpurple/protocols/oscar/family_feedbag.c
index fc8ade83b3..621b1e04a2 100644
--- a/libpurple/protocols/oscar/family_feedbag.c
+++ b/libpurple/protocols/oscar/family_feedbag.c
@@ -139,13 +139,13 @@ static struct aim_ssi_item *aim_ssi_itemlist_add(struct aim_ssi_item **list, con
 					}
 			} while (exists);
 		}
-	} else if (new->gid == 0x0000) {
+	} else if (type == AIM_SSI_TYPE_ICONINFO) {
 		if (new->bid == 0xFFFF) {
 			do {
 				new->bid += 0x0001;
 				exists = FALSE;
 				for (cur = *list; cur != NULL; cur = cur->next)
-					if (((cur->bid == new->bid) && (cur->gid == new->gid)) || (cur->gid == new->bid)) {
+					if ((cur->bid >= new->bid) || (cur->gid >= new->bid)) {
 						exists = TRUE;
 						break;
 					}
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 4c4faf7a03..ea98bcd806 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1343,7 +1343,7 @@ purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 			purple_connection_error(gc, _("The AOL Instant Messenger service is temporarily unavailable."));
 			break;
 		case 0x18:
-			/* connecting too frequently */
+			/* screen name connecting too frequently */
 			gc->wants_to_die = TRUE;
 			purple_connection_error(gc, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
 			break;
@@ -1353,6 +1353,11 @@ purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), PURPLE_WEBSITE);
 			purple_connection_error(gc, buf);
 			break;
+		case 0x1d:
+			/* IP address connecting too frequently */
+			gc->wants_to_die = TRUE;
+			purple_connection_error(gc, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
+			break;
 		default:
 			purple_connection_error(gc, _("Authentication failed"));
 			break;
@@ -1770,7 +1775,7 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 											 info->status, info->status_len);
 	}
 
-	if (info->flags & AIM_FLAG_WIRELESS || info->capabilities & OSCAR_CAPABILITY_HIPTOP)
+	if (info->flags & AIM_FLAG_WIRELESS)
 	{
 		purple_prpl_got_user_status(account, info->sn, OSCAR_STATUS_ID_MOBILE, NULL);
 	} else {
@@ -2871,7 +2876,7 @@ static int purple_parse_userinfo(OscarData *od, FlapConnection *conn, FlapFrame
 			tmp = oscar_encoding_to_utf8(userinfo->status_encoding,
 											 userinfo->status, userinfo->status_len);
 #if defined (_WIN32) || defined (__APPLE__)
-		if (userinfo->itmsurl[0] != '\0') {
+		if (userinfo->itmsurl && (userinfo->itmsurl[0] != '\0')) {
 			gchar *itmsurl, *tmp2;
 			itmsurl = oscar_encoding_to_utf8(userinfo->itmsurl_encoding,
 					userinfo->itmsurl, userinfo->itmsurl_len);
@@ -5428,8 +5433,8 @@ const char* oscar_list_emblem(PurpleBuddy *b)
 			return "admin";
 		if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY)
 			return "bot";
-		if (userinfo->flags & AIM_FLAG_AOL)
-			return "aol-client";
+		if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)
+			return "hiptop";
 		if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM)
 			return "secure";
 	}
diff --git a/libpurple/server.c b/libpurple/server.c
index 68e3248259..3591d1d346 100644
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -210,22 +210,24 @@ void
 serv_got_alias(PurpleConnection *gc, const char *who, const char *alias)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	GSList *buds, *buddies = purple_find_buddies(account, who);
+	GSList *buddies = purple_find_buddies(account, who);
 	PurpleBuddy *b;
 	PurpleConversation *conv;
 
-	for (buds = buddies; buds; buds = buds->next)
+	while (buddies != NULL)
 	{
-		b = buds->data;
+		b = buddies->data;
+		buddies = g_slist_delete_link(buddies, buddies);
+
 		if ((b->server_alias == NULL && alias == NULL) ||
 		    (b->server_alias && alias && !strcmp(b->server_alias, alias)))
 		{
 			continue;
 		}
+
 		purple_blist_server_alias_buddy(b, alias);
 
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account);
-
 		if (conv != NULL && alias != NULL && strcmp(alias, who))
 		{
 			char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
@@ -237,7 +239,6 @@ serv_got_alias(PurpleConnection *gc, const char *who, const char *alias)
 			g_free(tmp);
 		}
 	}
-	g_slist_free(buddies);
 }
 
 /*
diff --git a/libpurple/sound.c b/libpurple/sound.c
index d7fef52651..d6e241d421 100644
--- a/libpurple/sound.c
+++ b/libpurple/sound.c
@@ -31,6 +31,8 @@ static PurpleSoundUiOps *sound_ui_ops = NULL;
 #define STATUS_AVAILABLE 1
 #define STATUS_AWAY 2
 
+static time_t last_played[PURPLE_NUM_SOUNDS];
+
 static gboolean
 purple_sound_play_required(const PurpleAccount *account)
 {
@@ -77,6 +79,10 @@ purple_sound_play_event(PurpleSoundEventID event, const PurpleAccount *account)
 	if (!purple_sound_play_required(account))
 		return;
 
+	if (time(NULL) - last_played[event] < 2)
+		return;
+	last_played[event] = time(NULL);
+
 	if(sound_ui_ops && sound_ui_ops->play_event) {
 		int plugin_return;
 
@@ -127,6 +133,7 @@ purple_sound_init()
 
 	purple_prefs_add_none("/purple/sound");
 	purple_prefs_add_int("/purple/sound/while_status", STATUS_AVAILABLE);
+	memset(last_played, 0, sizeof(last_played));
 }
 
 void
diff --git a/libpurple/status.c b/libpurple/status.c
index 051f62ac5d..951b0b444a 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -91,8 +91,7 @@ struct _PurplePresence
 		{
 			PurpleAccount *account;
 			char *name;
-			size_t ref_count;
-			GList *buddies;
+			PurpleBuddy *buddy;
 
 		} buddy;
 
@@ -131,13 +130,15 @@ static int primitive_scores[] =
 	-200,   /* extended away            */
 	-400,   /* mobile                   */
 	-10,    /* idle, special case.      */
-	-5      /* idle time, special case. */
+	-5,     /* idle time, special case. */
+	10      /* Offline messageable      */
 };
 
 static GHashTable *buddy_presences = NULL;
 
 #define SCORE_IDLE      8
 #define SCORE_IDLE_TIME 9
+#define SCORE_OFFLINE_MESSAGE 10
 
 /**************************************************************************
  * PurpleStatusPrimitive API
@@ -658,13 +659,8 @@ notify_status_update(PurplePresence *presence, PurpleStatus *old_status,
 	}
 	else if (context == PURPLE_PRESENCE_CONTEXT_BUDDY)
 	{
-		const GList *l;
-
-		for (l = purple_presence_get_buddies(presence); l != NULL; l = l->next)
-		{
-			notify_buddy_status_update((PurpleBuddy *)l->data, presence,
+			notify_buddy_status_update(purple_presence_get_buddy(presence), presence,
 					old_status, new_status);
-		}
 	}
 }
 
@@ -1148,10 +1144,7 @@ purple_presence_new_for_buddy(PurpleBuddy *buddy)
 		g_free(key->name);
 		g_free(key);
 	}
-
-	presence->u.buddy.ref_count++;
-	presence->u.buddy.buddies = g_list_append(presence->u.buddy.buddies,
-			buddy);
+	presence->u.buddy.buddy = buddy;
 
 	return presence;
 }
@@ -1165,9 +1158,6 @@ purple_presence_destroy(PurplePresence *presence)
 	{
 		PurpleStatusBuddyKey key;
 
-		if(presence->u.buddy.ref_count != 0)
-			return;
-
 		key.account = presence->u.buddy.account;
 		key.name    = presence->u.buddy.name;
 
@@ -1189,27 +1179,6 @@ purple_presence_destroy(PurplePresence *presence)
 	g_free(presence);
 }
 
-/*
- * TODO: Maybe we should cal purple_presence_destroy() after we
- *       decrement the ref count?  I don't see why we should
- *       make other places do it manually when we can do it here.
- */
-void
-purple_presence_remove_buddy(PurplePresence *presence, PurpleBuddy *buddy)
-{
-	g_return_if_fail(presence != NULL);
-	g_return_if_fail(buddy    != NULL);
-	g_return_if_fail(purple_presence_get_context(presence) ==
-			PURPLE_PRESENCE_CONTEXT_BUDDY);
-
-	if (g_list_find(presence->u.buddy.buddies, buddy) != NULL)
-	{
-		presence->u.buddy.buddies = g_list_remove(presence->u.buddy.buddies,
-				buddy);
-		presence->u.buddy.ref_count--;
-	}
-}
-
 void
 purple_presence_add_status(PurplePresence *presence, PurpleStatus *status)
 {
@@ -1345,11 +1314,8 @@ purple_presence_set_idle(PurplePresence *presence, gboolean idle, time_t idle_ti
 		const GList *l;
 		time_t current_time = time(NULL);
 
-		for (l = purple_presence_get_buddies(presence); l != NULL; l = l->next)
-		{
-			update_buddy_idle((PurpleBuddy *)l->data, presence, current_time,
-			old_idle, idle);
-		}
+		update_buddy_idle(purple_presence_get_buddy(presence), presence, current_time,
+		old_idle, idle);
 	}
 	else if(purple_presence_get_context(presence) == PURPLE_PRESENCE_CONTEXT_ACCOUNT)
 	{
@@ -1443,14 +1409,14 @@ purple_presence_get_chat_user(const PurplePresence *presence)
 	return presence->u.chat.user;
 }
 
-const GList *
-purple_presence_get_buddies(const PurplePresence *presence)
+PurpleBuddy *
+purple_presence_get_buddy(const PurplePresence *presence)
 {
 	g_return_val_if_fail(presence != NULL, NULL);
 	g_return_val_if_fail(purple_presence_get_context(presence) ==
 			PURPLE_PRESENCE_CONTEXT_BUDDY, NULL);
 
-	return presence->u.buddy.buddies;
+	return presence->u.buddy.buddy;
 }
 
 const GList *
@@ -1607,8 +1573,14 @@ purple_presence_compare(const PurplePresence *presence1,
 		PurpleStatus *status = (PurpleStatus *)l->data;
 		PurpleStatusType *type = purple_status_get_type(status);
 
-		if (purple_status_is_active(status))
+		if (purple_status_is_active(status)) {
 			score1 += primitive_scores[purple_status_type_get_primitive(type)];
+			if (!purple_status_is_online(status)) {
+				PurpleBuddy *b = purple_presence_get_buddy(presence1);
+				if (b && purple_account_supports_offline_message(purple_buddy_get_account(b),b))
+					score1 += primitive_scores[SCORE_OFFLINE_MESSAGE];
+			}
+		}
 	}
 	score1 += purple_account_get_int(purple_presence_get_account(presence1), "score", 0);
 
@@ -1618,8 +1590,15 @@ purple_presence_compare(const PurplePresence *presence1,
 		PurpleStatus *status = (PurpleStatus *)l->data;
 		PurpleStatusType *type = purple_status_get_type(status);
 
-		if (purple_status_is_active(status))
+		if (purple_status_is_active(status)) {
 			score2 += primitive_scores[purple_status_type_get_primitive(type)];
+			if (!purple_status_is_online(status)) {
+				PurpleBuddy *b = purple_presence_get_buddy(presence2);
+				if (b && purple_account_supports_offline_message(purple_buddy_get_account(b),b))
+					score2 += primitive_scores[SCORE_OFFLINE_MESSAGE];
+			}
+
+		}
 	}
 	score2 += purple_account_get_int(purple_presence_get_account(presence2), "score", 0);
 
@@ -1723,6 +1702,8 @@ purple_status_init(void)
 			primitive_scores[PURPLE_STATUS_EXTENDED_AWAY]);
 	purple_prefs_add_int("/purple/status/scores/idle",
 			primitive_scores[SCORE_IDLE]);
+	purple_prefs_add_int("/purple/status/scores/offline_msg",
+			primitive_scores[SCORE_OFFLINE_MESSAGE]);
 
 	purple_prefs_connect_callback(handle, "/purple/status/scores/offline",
 			score_pref_changed_cb,
@@ -1742,6 +1723,9 @@ purple_status_init(void)
 	purple_prefs_connect_callback(handle, "/purple/status/scores/idle",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(SCORE_IDLE));
+	purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
+			score_pref_changed_cb,
+			GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
 
 	buddy_presences = g_hash_table_new_full(purple_buddy_presences_hash,
 											purple_buddy_presences_equal,
diff --git a/libpurple/status.h b/libpurple/status.h
index 49f3f714e7..85521cac0e 100644
--- a/libpurple/status.h
+++ b/libpurple/status.h
@@ -760,16 +760,6 @@ PurplePresence *purple_presence_new_for_buddy(PurpleBuddy *buddy);
 void purple_presence_destroy(PurplePresence *presence);
 
 /**
- * Removes a buddy from a presence.
- *
- * This must be done before destroying a buddy in a presence.
- *
- * @param presence The presence.
- * @param buddy    The buddy.
- */
-void purple_presence_remove_buddy(PurplePresence *presence, PurpleBuddy *buddy);
-
-/**
  * Adds a status to a presence.
  *
  * @param presence The presence.
@@ -869,13 +859,13 @@ PurpleConversation *purple_presence_get_conversation(const PurplePresence *prese
 const char *purple_presence_get_chat_user(const PurplePresence *presence);
 
 /**
- * Returns a presence's list of buddies.
+ * Returns the presence's buddy.
  *
  * @param presence The presence.
  *
- * @return The presence's list of buddies.
+ * @return The presence's buddy.
  */
-const GList *purple_presence_get_buddies(const PurplePresence *presence);
+PurpleBuddy *purple_presence_get_buddy(const PurplePresence *presence);
 
 /**
  * Returns all the statuses in a presence.
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 409b8dd765..e12f59cd1e 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -1172,8 +1172,9 @@ create_group_menu (PurpleBlistNode *node, PurpleGroup *g)
 	GtkWidget *item;
 
 	menu = gtk_menu_new();
-	pidgin_new_item_from_stock(menu, _("Add a _Buddy"), GTK_STOCK_ADD,
+	item = pidgin_new_item_from_stock(menu, _("Add a _Buddy"), GTK_STOCK_ADD,
 				 G_CALLBACK(pidgin_blist_add_buddy_cb), node, 0, 0, NULL);
+	gtk_widget_set_sensitive(item, purple_connections_get_all() != NULL);
 	item = pidgin_new_item_from_stock(menu, _("Add a C_hat"), GTK_STOCK_ADD,
 				 G_CALLBACK(pidgin_blist_add_chat_cb), node, 0, 0, NULL);
 	gtk_widget_set_sensitive(item, pidgin_blist_joinchat_is_showable());
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 2545c7fff9..c48c1c4c97 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -3389,7 +3389,7 @@ generate_send_to_items(PidginWindow *win)
 			for (iter = g_list_last(list); iter != NULL; iter = iter->prev)
 			{
 				PurplePresence *pre = iter->data;
-				PurpleBuddy *buddy = purple_presence_get_buddies(pre)->data;
+				PurpleBuddy *buddy = purple_presence_get_buddy(pre);
 				create_sendto_item(menu, sg, &group, buddy,
 							purple_buddy_get_account(buddy), purple_buddy_get_name(buddy));
 			}
diff --git a/pidgin/gtkdocklet-x11.c b/pidgin/gtkdocklet-x11.c
index 8a50181ef2..b2a19f87d3 100644
--- a/pidgin/gtkdocklet-x11.c
+++ b/pidgin/gtkdocklet-x11.c
@@ -118,6 +118,9 @@ docklet_x11_update_icon(DockletStatus icon)
 		case DOCKLET_STATUS_XA:
 			icon_name = PIDGIN_STOCK_TRAY_XA;
 			break;
+		case DOCKLET_STATUS_INVISIBLE:
+			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
+			break;
 	}
 
 	if(icon_name) {
diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
index 444b8693b8..c1906475f0 100644
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -206,6 +206,8 @@ docklet_update_status()
 		newstatus = DOCKLET_STATUS_XA;
 	else if (prim == PURPLE_STATUS_OFFLINE)
 		newstatus = DOCKLET_STATUS_OFFLINE;
+	else if (prim == PURPLE_STATUS_INVISIBLE)
+		newstatus = DOCKLET_STATUS_INVISIBLE;
 	else
 		newstatus = DOCKLET_STATUS_AVAILABLE;
 
diff --git a/pidgin/gtkdocklet.h b/pidgin/gtkdocklet.h
index d7fed5bd1e..02b57db7af 100644
--- a/pidgin/gtkdocklet.h
+++ b/pidgin/gtkdocklet.h
@@ -29,6 +29,7 @@ typedef enum
 {
 	DOCKLET_STATUS_OFFLINE,
 	DOCKLET_STATUS_AVAILABLE,
+	DOCKLET_STATUS_INVISIBLE,
 	DOCKLET_STATUS_PENDING,
 	DOCKLET_STATUS_AWAY,
 	DOCKLET_STATUS_BUSY,
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index 9eb1125316..e9aec620d7 100644
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -1547,7 +1547,7 @@ pidgin_request_file(const char *title, const char *filename,
 	if ((filename != NULL) && (*filename != '\0')) {
 		if (savedialog)
 			gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename);
-		else
+		else if (g_file_test(filename, G_FILE_TEST_EXISTS))
 			gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
 	}
 	if ((filename == NULL || *filename == '\0' || !g_file_test(filename, G_FILE_TEST_EXISTS)) &&
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index c390d3bef8..3f041c9c90 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -162,6 +162,7 @@ static struct SizedStockIcon {
 	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
 	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
diff --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
index 0fac8cf703..04940823a9 100644
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -128,6 +128,7 @@
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
+#define PIDGIN_STOCK_TRAY_INVISIBLE	  "pidgin-tray-invisible"
 #define PIDGIN_STOCK_TRAY_AWAY	  	  "pidgin-tray-away"
 #define PIDGIN_STOCK_TRAY_BUSY            "pidgin-tray-busy"
 #define PIDGIN_STOCK_TRAY_XA              "pidgin-tray-xa"
diff --git a/pidgin/pixmaps/emblems/16/Makefile.am b/pidgin/pixmaps/emblems/16/Makefile.am
index 9b9dd466f3..9974e1641f 100644
--- a/pidgin/pixmaps/emblems/16/Makefile.am
+++ b/pidgin/pixmaps/emblems/16/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST = 	aol-client.png \
 		free-for-chat.png \
 		game.png \
 		half-operator.png \
+		hiptop.png \
 		male.png \
 		mobile.png \
 		not-authorized.png \
diff --git a/pidgin/pixmaps/emblems/16/hiptop.png b/pidgin/pixmaps/emblems/16/hiptop.png
new file mode 100644
index 0000000000..a73aced40a
--- /dev/null
+++ b/pidgin/pixmaps/emblems/16/hiptop.png
diff --git a/pidgin/pixmaps/emotes/default/22/Makefile.am b/pidgin/pixmaps/emotes/default/22/Makefile.am
index 9e00eafd6d..76034b8bda 100644
--- a/pidgin/pixmaps/emotes/default/22/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.am
@@ -136,6 +136,7 @@ SMILEYS = 	act-up.png \
 		sigarette.png \
 		silly.png \
 		skeleton.png \
+		skywalker.png \
 		sleepy.png \
 		smile-big.png \
 		smile.png \
diff --git a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am
index c2ff9bde81..4e10cf097d 100644
--- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am
@@ -126,6 +126,7 @@ EXTRA_DIST = 	act-up.svg \
 		sigarette.svg \
 		silly.svg \
 		skeleton.svg \
+		skywalker.svg \
 		sleepy.svg \
 		smile-big.svg \
 		smile.svg \
diff --git a/pidgin/pixmaps/emotes/default/22/scalable/skywalker.svg b/pidgin/pixmaps/emotes/default/22/scalable/skywalker.svg
new file mode 100644
index 0000000000..61e0d8abf5
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/22/scalable/skywalker.svg
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   version="1.0"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="fighter.svg"
+   inkscape:export-filename="/home/hbons/Desktop/fighter.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2799">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2801" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2803" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2789">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2791" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2793" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3150">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3152" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop3154" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3104">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3106" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3108" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3114"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3156"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2789"
+       id="linearGradient2795"
+       x1="12"
+       y1="1.7516894"
+       x2="12"
+       y2="6.0836282"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2799"
+       id="radialGradient2805"
+       cx="4.37887"
+       cy="8.2569046"
+       fx="4.37887"
+       fy="8.2569046"
+       r="0.83306515"
+       gradientTransform="matrix(4.715125,1.421341,-1.263413,5.304515,-6.58722,-42.95017)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2799"
+       id="radialGradient2809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.715125,1.421341,-1.263413,5.304515,-6.58722,-42.95017)"
+       cx="4.37887"
+       cy="8.2569046"
+       fx="4.37887"
+       fy="8.2569046"
+       r="0.83306515" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2789"
+       id="linearGradient2814"
+       gradientUnits="userSpaceOnUse"
+       x1="12"
+       y1="1.7516894"
+       x2="12"
+       y2="6.0836282"
+       gradientTransform="matrix(0.987014,0,0,0.98324,0.155843,0.117318)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.007726"
+     inkscape:cx="24.782578"
+     inkscape:cy="13.372505"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fill="#2e3436"
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.6;fill:url(#radialGradient3156);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3140"
+       sodipodi:cx="10.748654"
+       sodipodi:cy="10.457643"
+       sodipodi:rx="6.6449099"
+       sodipodi:ry="2.3675451"
+       d="M 17.393564 10.457643 A 6.6449099 2.3675451 0 1 1  4.1037445,10.457643 A 6.6449099 2.3675451 0 1 1  17.393564 10.457643 z"
+       transform="matrix(1.504911,0,0,1.300982,-4.175772,6.474929)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:1.05276573;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1307"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(0.952236,0,0,0.952236,0.757713,1.541608)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.79545455;fill:url(#radialGradient3114);fill-opacity:1.0;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3102"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(0.8019,0,0,0.801938,2.532654,3.191833)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;fill:none;fill-opacity:1.0;stroke:#ffffff;stroke-width:1.17343897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2184"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(0.852176,0,0,0.852216,1.93909,2.639626)" />
+    <path
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 17,13 C 16.413519,15.283765 14.403819,17 12,17 C 9.596182,17 7.586481,15.283765 7,13 C 8.053747,14.478811 9.904443,16.044402 12,16.044402 C 14.095556,16.044403 15.946253,14.478811 17,13 z "
+       id="path2186"
+       sodipodi:nodetypes="cscsc" />
+    <path
+       style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.415007,0.52141473 C 6.4412517,0.52141473 1.5,3.4999435 1.5,9.5151487 L 1.5,13.135081 C 1.5,13.922344 1.9460004,14.541331 2.5,14.541331 C 3.0539996,14.541331 3.5,13.922344 3.5,13.135081 L 3.5,7.5394989 C 9.1662006,7.4604384 14.833423,7.4830282 20.5,7.5079317 L 20.5,13.135081 C 20.5,13.922344 20.946001,14.541331 21.5,14.541331 C 22.054,14.541331 22.5,13.922344 22.5,13.135081 L 22.5,9.4533234 C 22.5,3.5102944 17.497455,0.52141473 12.439861,0.52141473 L 11.415007,0.52141473 z "
+       id="rect1885"
+       sodipodi:nodetypes="cccsccccscccc" />
+    <rect
+       style="opacity:1;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1893"
+       width="2"
+       height="3"
+       x="6"
+       y="5"
+       rx="0.94798213"
+       ry="0.94798213" />
+    <rect
+       style="opacity:1;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2781"
+       width="2"
+       height="3"
+       x="16"
+       y="5"
+       rx="0.94798213"
+       ry="0.94798213" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2191"
+       sodipodi:cx="9.0598059"
+       sodipodi:cy="8.7845774"
+       sodipodi:rx="1.1679889"
+       sodipodi:ry="1.4520943"
+       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
+       transform="matrix(0.856173,0,0,1.377321,2.243239,-2.099183)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2193"
+       sodipodi:cx="9.0598059"
+       sodipodi:cy="8.7845774"
+       sodipodi:rx="1.1679889"
+       sodipodi:ry="1.4520943"
+       d="M 10.227795 8.7845774 A 1.1679889 1.4520943 0 1 1  7.891817,8.7845774 A 1.1679889 1.4520943 0 1 1  10.227795 8.7845774 z"
+       transform="matrix(0.856173,0,0,1.377321,6.243238,-2.099183)" />
+    <path
+       style="opacity:0.78977272;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1.66300178;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4,7 C 4,12.372041 5.1207216,14 8,14 C 11.920219,14 12,10.478414 12,10.478414 C 12,10.478414 12.202908,14 16,14 C 18.916405,14 20,12.750006 20,7 L 12,7 L 4,7 z "
+       id="path2264"
+       sodipodi:nodetypes="cscsccc" />
+    <rect
+       style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2783"
+       width="4"
+       height="6"
+       x="10"
+       y="1" />
+    <path
+       style="opacity:0.48295456;fill:url(#linearGradient2814);fill-opacity:1;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 11.413971,1.4999993 C 8.4396167,1.4999993 6.5267273,2.1749121 4.784828,4.0633005 C 4.0614456,4.8466049 2.7215372,5.924139 2.8577394,6.9078193 C 3.3586863,6.1791563 4.4826622,6.5275732 5.224293,6.4374981 C 10.290142,6.4078673 15.356168,6.5163298 20.42115,6.5572819 C 20.830374,6.5476225 21.338833,7.3946396 20.992121,6.6253703 C 20.129068,4.3100064 18.251084,2.6808347 15.798098,2.0529678 C 14.507085,1.6818158 12.747177,1.4799962 11.413971,1.4999993 z M 21.503187,7.9300046 C 21.481946,16.13105 21.471179,14.911402 21.503187,7.9300046 z M 2.7467548,8.2905005 C 2.5704612,8.8774295 2.4591549,9.4763944 2.5000012,10.090975 C 2.5380837,10.671112 2.401155,11.743746 2.623378,12.291731 C 2.8468093,11.723864 2.7079017,10.631029 2.7467548,10.030965 C 2.7467548,9.4508099 2.7467548,8.8706552 2.7467548,8.2905005 z "
+       id="path2787"
+       sodipodi:nodetypes="cccccccccccsccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.48295456;fill:url(#radialGradient2805);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2797"
+       sodipodi:cx="6.0397224"
+       sodipodi:cy="9.3172264"
+       sodipodi:rx="0.83306515"
+       sodipodi:ry="0.93719834"
+       d="M 6.8727876 9.3172264 A 0.83306515 0.93719834 0 1 1  5.2066573,9.3172264 A 0.83306515 0.93719834 0 1 1  6.8727876 9.3172264 z"
+       transform="matrix(2.400774,0,0,2.13402,-7.500009,-9.883144)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.48295456;fill:url(#radialGradient2809);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2807"
+       sodipodi:cx="6.0397224"
+       sodipodi:cy="9.3172264"
+       sodipodi:rx="0.83306515"
+       sodipodi:ry="0.93719834"
+       d="M 6.8727876 9.3172264 A 0.83306515 0.93719834 0 1 1  5.2066573,9.3172264 A 0.83306515 0.93719834 0 1 1  6.8727876 9.3172264 z"
+       transform="matrix(-2.400774,0,0,2.13402,31.50001,-9.883147)" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/emotes/default/22/skywalker.png b/pidgin/pixmaps/emotes/default/22/skywalker.png
new file mode 100644
index 0000000000..227cd08f45
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/22/skywalker.png
diff --git a/pidgin/pixmaps/emotes/default/22/theme b/pidgin/pixmaps/emotes/default/22/theme
index 621c338fcb..6478115a98 100644
--- a/pidgin/pixmaps/emotes/default/22/theme
+++ b/pidgin/pixmaps/emotes/default/22/theme
@@ -1,5 +1,5 @@
 Name=Default
-Description=Pidgin smileys (default)
+Description=Pidgin smileys
 Icon=smile.png
 Author=Hylke Bons
 
@@ -21,6 +21,8 @@ shut-mouth.png      :-X
 moneymouth.png      :-$
 foot-in-mouth.png   :-!
 shout.png           >:o     >:O
+! skywalker.png     C:-)
+! monkey.png        :-(|)
 
 ### Following AIM 6.1
 [AIM]
@@ -36,7 +38,7 @@ moneymouth.png      :-$
 foot-in-mouth.png   :-!
 embarrassed.png     :-[
 angel.png           O:-)
-thinking.png        :-\\
+thinking.png        :-\\    :-/
 crying.png          :'(
 shut-mouth.png      :-X
 glasses-cool.png    8-)
@@ -62,7 +64,7 @@ love-over.png       (U)     (u)
 msn.png             (M)     (m)
 cat.png             (@)
 dog.png             (&)
-moon.png            (S)     (s)
+moon.png            (S)
 star.png            (*)
 film.png            (~)
 musical-note.png    (8)
@@ -86,7 +88,7 @@ girl.png            (X)     (x)
 good.png            (Y)     (y)
 bad.png             (N)     (n)
 vampire.png         :[      :-[
-#goat.png           (nah)  (NAH)
+#goat.png           (nah)
 sun.png             (#)
 rainbow.png         (R)     (r)
 quiet.png           :-#
@@ -95,26 +97,26 @@ glasses-nerdy.png   8-|
 sarcastic.png       ^o)
 secret.png          :-*
 sick.png            +o(
-snail.png           (sn)    (SN)
-turtle.png          (tu)    (TU)
-plate.png           (pl)    (PL)
+snail.png           (sn)
+turtle.png          (tu)
+plate.png           (pl)
 bowl.png            (||)
-pizza.png           (pi)    (PI)
-soccerball.png      (so)    (SO)
-car.png             (au)    (AU)
-airplane.png        (ap)    (AP)
-umbrella.png        (um)    (UM)
-island.png          (ip)    (IP)
-computer.png        (co)    (CO)
-mobile.png          (mp)    (MP)
-brb.png             (brb)   (BRB)
-rain.png            (st)    (ST)
-highfive.png        (h5)    (H5)
-coins.png           (mo)    (MO)
-sheep.png           (bah)   (BAH)
+pizza.png           (pi)
+soccerball.png      (so)
+car.png             (au)
+airplane.png        (ap)
+umbrella.png        (um)
+island.png          (ip)
+computer.png        (co)
+mobile.png          (mp)
+brb.png             (brb)
+rain.png            (st)
+highfive.png        (h5)
+coins.png           (mo)
+sheep.png           (bah)
 dont-know.png       :^)
 thinking.png        *-)
-thunder.png         (li)    (LI)
+thunder.png         (li)
 party.png           <:o)
 eyeroll.png         8-)
 yawn.png            |-) 
@@ -125,7 +127,7 @@ shock.png           /惊讶 /:O /jy /surprised
 curl-lip.png        /撇嘴 /:~ /pz /curl_lip
 desire.png          /色 /:* /se /desire
 dazed.png           /发呆 /:| /dazed
-party.png           /得意 /8-) /dy /revel (to revel in)
+party.png           /得意 /8-) /dy /revel
 crying.png          /:< /ll /cry
 bashful.png         /害羞 /:$ /hx /bashful
 shut-mouth.png      /闭嘴 /:X /bz /shut_mouth
@@ -141,7 +143,7 @@ glasses-cool.png    /酷 /:+ /kuk /cool
 doctor.png          /非典 /:# /feid /SARS
 silly.png           /抓狂 /:Q /zk /crazy
 sick.png            /吐 /:T /tu /vomit
-snicker.png         /偷笑 /;p /tx /titter (snicker)
+snicker.png         /偷笑 /;p /tx /titter
 cute.png            /可爱 /;-D /ka /cute
 disdain.png         /白眼 /;d /by /disdain
 arrogant.png        /傲慢 /;o /am /arrogant
@@ -152,21 +154,21 @@ sweat.png           /流汗 /:L /sweat
 smirk.png           /憨笑 /:> /hanx /smirk
 soldier.png         /大兵 /:; /db /soldier
 struggle.png        /奋斗 /;f /fendou /struggle
-curse.png           /咒骂 /:-S /zhm /curse (swear)
-question.png        /疑问 /? /yiw /question (confused)
+curse.png           /咒骂 /:-S /zhm /curse
+question.png        /疑问 /? /yiw /question
 quiet.png           /嘘... /;x /xu /shh
 hypnotized.png      /晕 /;@ /yun /dizzy
 excruciating.png    /折磨 /:8 /zhem /excrutiating
-freaked-out.png     /衰 /;! /shuai /freaked_out (pissed off)
+freaked-out.png     /衰 /;! /shuai /freaked_out
 skeleton.png        /骷髅 /!!! /kl /skeleton
 hammer.png          /敲打 /xx  /qiao /hammer
 bye.png             /再见        /bye /zj /bye
-go-away.png         /闪人 /go /shan /go (going somewhere)
-tremble.png         /发抖 /shake /fad /shake (tremble)
+go-away.png         /闪人 /go /shan /go
+tremble.png         /发抖 /shake /fad /shake
 in-love.png         /爱情 /love /aiq /love
 jump.png            /跳 /jump /tiao /jump
 search.png          /找 /find /zhao /search
-lashes.png          /美眉 /& /mm /beautiful_eyebrows (synonym for beauty)
+lashes.png          /美眉 /& /mm /beautiful_eyebrows
 pig.png             /猪头 /pig /zt /pig
 cat.png             /猫咪 /cat /mm /cat
 dog.png             /小狗 /dog /xg /dog
@@ -201,11 +203,11 @@ good.png            /强 /strong /qiang /thumbs_up
 bad.png             /弱 /weak /ruo /thumbs_down
 handshake.png       /握手 /share /ws /handshake
 victory.png         /胜利 /v /shl /victory
-beauty.png          /美女 /<J> /mn /beauty (noun)
-qq.png              /Q仔 /<QQ> /qz /qq (QQ's penguin logo)
+beauty.png          /美女 /<J> /mn /beauty
+qq.png              /Q仔 /<QQ> /qz /qq
 blowkiss.png        /飞吻 /<L> /fw /blow_kiss
 angry.png           /怄火 /<O> /oh  /angry
-liquor.png          /白酒 /<B> /bj /baijiu (a type of Chinese liquor)
+liquor.png          /白酒 /<B> /bj /baijiu
 can.png             /汽水 /<U> /qsh /soda
 watermelon.png      /西瓜 /<W> /xigua /watermelon
 rain.png            /下雨 /<!!> /xy /rain
@@ -217,20 +219,20 @@ boy.png             /男 /<11> /nan /man
 
 ### Following ICQ 5.1
 [ICQ]
-smile.png           :-) :)
-sad.png             :-( :(
-wink.png            ;-) ;)
-tongue.png          :-P :P
+smile.png           :-)     :)
+sad.png             :-(     :(
+wink.png            ;-)     ;)
+tongue.png          :-P     :P
 laugh.png           *JOKINGLY*
 crying.png          :'(
 #*KISSED*
 kiss.png            :-*
 embarrassed.png     :-[
 angel.png           O:-)
-shut-mouth.png      :-X :X
-thinking.png        :-\\
-shout.png           >:o >:O
-smile-big.png       :-D :D
+shut-mouth.png      :-X     :X
+thinking.png        :-\\    :-/
+shout.png           >:o     >:O
+smile-big.png       :-D     :D
 moneymouth.png      :-$
 shock.png           =-O
 glasses-cool.png    8-)
@@ -248,90 +250,90 @@ in-love.png         *IN\ LOVE*
 
 ### Following Yahoo! Messenger 8.1
 [Yahoo]
-smile.png           :) :-)
-question.png        :-/ :-\\
-shock.png           :-O :O :-o :o 
+smile.png           :)      :-)
+question.png        :-/     :-\\
+shock.png           :-O     :O      :-o     :o 
 devil.png           >:)
-angel.png           O:-) o:-) 0:-)
+angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
 yawn.png            (:|
 hypnotized.png      @-)
-#on_the_phone       :)]             MISSING: "Wait,I'm phoning!" (not phone.png)    => smily showing phone and hand ("stop")
-sad.png             :( :-(
-in-love.png         :x :-x :X :-X
-angry.png           X-( x-( X( x(
+#on_the_phone       :)]     MISSING: "Wait,I'm phoning!" (not phone.png)    => smily showing phone and hand ("stop")
+sad.png             :(      :-(
+in-love.png         :x      :-x     :X      :-X
+angry.png           X-(     x-(     X(      x(
 crying.png          :((
-glasses-nerdy.png   :-B :-b
+glasses-nerdy.png   :-B     :-b
 quiet.png           :-$
-drool.png           =P~ =p~
-lying.png           :^O :^o
+drool.png           =P~     =p~
+lying.png           :^O     :^o
 call-me.png         :-c
-wink.png            ;) ;-)
+wink.png            ;)      ;-)
 embarrassed.png     :">
-mean.png            :-> :>
-laugh.png           :)) :-))
+mean.png            :->     :>
+laugh.png           :))     :-))
 bye.png             =;
 arrogant.png        [-(
 thinking.png        :-?
-waiting.png         :-w :-W
-#at_wits_end        ~x( ~X(         MISSING: "Why.Does.This.Not.Work.AAAAARGH!!"    => angry smily shouting and pulling hair off
-smile-big.png       :D :-D :d :-d
-tongue.png          :-P :P :-p :p
-glasses-cool.png    B-) b-)
-neutral.png         :| :-|
-sleepy.png          I-) i-) |-)
-clown.png           :o) :O)
-doh.png             #-o #-O
+waiting.png         :-w     :-W
+#at_wits_end        ~x(     ~X(     MISSING: "Why.Does.This.Not.Work.AAAAARGH!!"    => angry smily shouting and pulling hair off
+smile-big.png       :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
+neutral.png         :|      :-|
+sleepy.png          I-)     i-)     |-)
+clown.png           :o)     :O)
+doh.png             #-o     #-O
 weep.png            :-<
 go-away.png         :-h
 lashes.png          ;;)
-kiss.png            :-* :*
-confused.png        :-S :-s
+kiss.png            :-*     :*
+confused.png        :-S     :-s
 sarcastic.png       /:)
-eyeroll.png         8-| 
+eyeroll.png         8-|
 silly.png           8-}
-clap.png            =D> =d>
-#phbbbt             >:P >:p         MISSING/YAHOO 6: "You are dumb! - No you are!!" => tongue on pissed of smily
-#timeout            :-t :-T         MISSING: "Let's have a break."
-hug-left.png        >:D< >:d<
+clap.png            =D>     =d>
+#phbbbt             >:P     >:p     MISSING/YAHOO 6: "You are dumb! - No you are!!" => tongue on pissed of smily
+#timeout            :-t     :-T     MISSING: "Let's have a break."
+hug-left.png        >:D<    >:d<
 love-over.png       =((
-sweat.png           #:-S #:-s
+sweat.png           #:-S    #:-s
 rotfl.png           =))    
-#loser              L-) l-)         MISSING/YAHOO 6: "Loser!"
-party.png	          <:-P <:-p
+#loser              L-)     l-)     MISSING/YAHOO 6: "Loser!"
+party.png	    <:-P    <:-p
 cowboy.png          <):)
 desire.png          8->
-alien.png		        =:) >-)
-beat-up.png		      b-( B-(
-chicken.png		      ~:>
-coffee.png		      ~o) ~O)
-cow.png			        3:-O 3:-o
-dance.png		        \\:D/ \\:d/
-rose.png		        @};-
-dont-know.png	    	:-L :-l
-skeleton.png		    8-X 8-x
-lamp.png		        *-:)
-monkey.png		      :(|)
-coins.png		        $-)
-peace.png		        :)>-
-pig.png			        :@)
-pray.png		        [-o< [-O<
-pumpkin.png		      (~~)
-shame.png		        [-X [-x
-flag.png		        **==
-clover.png		      %%-
-musical-note.png	  :-"
-nailbiting.png      :-SS :-ss
-giggle.png	        ;))
-worship.png	        ^:)^
-star.png		            (*)
+alien.png           =:)     >-)
+beat-up.png         b-(     B-(
+chicken.png         ~:>
+coffee.png          ~o)     ~O)
+cow.png             3:-O    3:-o
+dance.png           \\:D/   \\:d/
+rose.png            @};-
+dont-know.png       :-L     :-l
+skeleton.png        8-X     8-x
+lamp.png            *-:)
+monkey.png          :(|)
+coins.png           $-)
+peace.png           :)>-
+pig.png             :@)
+pray.png            [-o<    [-O<
+pumpkin.png         (~~)
+shame.png           [-X     [-x
+flag.png            **==
+clover.png          %%-
+musical-note.png    :-"
+nailbiting.png      :-SS    :-ss
+giggle.png          ;))
+worship.png         ^:)^
+star.png            (*)
 mad-tongue.png      >:p
-#yahoo_waving.gif	        >:/                     TODO
-#yahoo_talktohand.gif	    :-@                     TODO
-#yahoo_youkiddingme.gif	    :-j :-J               TODO
+#yahoo_waving.gif        >:/             TODO
+#yahoo_talktohand.gif    :-@             TODO
+#yahoo_youkiddingme.gif  :-j     :-J     TODO
 
 ### These only work in a certain IMvironment
-#yahoo_malefighter1.gif		o-> O->
-#yahoo_malefighter2.gif		o=> O=>
-#yahoo_femalefighter.gif	o-+ O-+
-yin-yang.png			    (%)
+#yahoo_malefighter1.gif	 o->     O->
+#yahoo_malefighter2.gif	 o=>     O=>
+#yahoo_femalefighter.gif o-+     O-+
+yin-yang.png        (%)
diff --git a/pidgin/pixmaps/tray/16/Makefile.am b/pidgin/pixmaps/tray/16/Makefile.am
index e27c852205..5feff0cf6a 100644
--- a/pidgin/pixmaps/tray/16/Makefile.am
+++ b/pidgin/pixmaps/tray/16/Makefile.am
@@ -1,5 +1,8 @@
+SUBDIRS = scalable
+
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \
+		tray-invisible.png \
 		tray-connecting.png \
 		tray-extended-away.png \
 		tray-message.png \
@@ -12,6 +15,7 @@ EXTRA_DIST = $(TRAY_ICONS) \
 	busy_4bit.ico \
 	connecting_4bit.ico \
 	extended-away_4bit.ico \
+	invisible_4bit.ico \
 	message_4bit.ico \
 	offline_4bit.ico
 
diff --git a/pidgin/pixmaps/tray/16/available_4bit.ico b/pidgin/pixmaps/tray/16/available_4bit.ico
index d30e5061ac..c96cfc1e1d 100644
--- a/pidgin/pixmaps/tray/16/available_4bit.ico
+++ b/pidgin/pixmaps/tray/16/available_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/away_4bit.ico b/pidgin/pixmaps/tray/16/away_4bit.ico
index 66b2959b11..4ecb95a71d 100644
--- a/pidgin/pixmaps/tray/16/away_4bit.ico
+++ b/pidgin/pixmaps/tray/16/away_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/busy_4bit.ico b/pidgin/pixmaps/tray/16/busy_4bit.ico
index 27084200be..15b77a8338 100644
--- a/pidgin/pixmaps/tray/16/busy_4bit.ico
+++ b/pidgin/pixmaps/tray/16/busy_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/connecting_4bit.ico b/pidgin/pixmaps/tray/16/connecting_4bit.ico
index d37e0ca53d..b3ac74c27f 100644
--- a/pidgin/pixmaps/tray/16/connecting_4bit.ico
+++ b/pidgin/pixmaps/tray/16/connecting_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/extended-away_4bit.ico b/pidgin/pixmaps/tray/16/extended-away_4bit.ico
index 0a72edd4d8..4cbc37ff0e 100644
--- a/pidgin/pixmaps/tray/16/extended-away_4bit.ico
+++ b/pidgin/pixmaps/tray/16/extended-away_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/invisible_4bit.ico b/pidgin/pixmaps/tray/16/invisible_4bit.ico
new file mode 100644
index 0000000000..3a4ccaaf73
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/invisible_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/message_4bit.ico b/pidgin/pixmaps/tray/16/message_4bit.ico
index e5f675d44c..4fc8297808 100644
--- a/pidgin/pixmaps/tray/16/message_4bit.ico
+++ b/pidgin/pixmaps/tray/16/message_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/offline_4bit.ico b/pidgin/pixmaps/tray/16/offline_4bit.ico
index ff422a3c2f..edc8b18cb9 100644
--- a/pidgin/pixmaps/tray/16/offline_4bit.ico
+++ b/pidgin/pixmaps/tray/16/offline_4bit.ico
diff --git a/pidgin/pixmaps/tray/16/scalable/Makefile.am b/pidgin/pixmaps/tray/16/scalable/Makefile.am
new file mode 100644
index 0000000000..6be417f93f
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA_DIST = 	tray-away.svg \
+		tray-busy.svg \
+		tray-connecting.svg \
+		tray-extended-away.svg \
+		tray-invisible.svg \
+		tray-message.svg \
+		tray-offline.svg \
+		tray-online.svg
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-away.svg b/pidgin/pixmaps/tray/16/scalable/tray-away.svg
new file mode 100644
index 0000000000..f3c997ec8c
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-away.svg
@@ -0,0 +1,1044 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="tray-away.svg">
+  <defs
+     id="defs1874">
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1974"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2947">
+      <stop
+         id="stop2949"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2951" />
+      <stop
+         id="stop2953"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3178"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3176"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3174"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3162"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3160"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3158"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3149"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3135"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3127"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3125"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3117"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3115"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3107">
+      <stop
+         id="stop3109"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3111" />
+      <stop
+         id="stop3113"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3105"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3103"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3101"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3099"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3093">
+      <stop
+         id="stop3095"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3097"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       id="linearGradient2231"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient3201"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient3203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3374"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3372"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3370"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3368"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3360"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3358"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3356"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3348"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3334"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3326"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3324"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3316"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3314"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3306">
+      <stop
+         id="stop3308"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3310" />
+      <stop
+         id="stop3312"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3304"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3302"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3300"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3298"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3292">
+      <stop
+         id="stop3294"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3296"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient3398"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient3400"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3402"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2260"
+       id="radialGradient3404"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       cx="11.756953"
+       cy="17.588654"
+       fx="11.756953"
+       fy="17.588654"
+       r="6.3436799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3409"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.296524,0,0,0.296522,5.75564,5.75564)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="15.940485"
+     inkscape:cy="11.44958"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="853"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2249"
+       style="opacity:0.3"
+       transform="matrix(-0.274688,0,0,0.504311,12.18504,-12.90685)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect2251"
+         style="opacity:1;color:black;fill:url(#radialGradient1970);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect2253"
+         style="opacity:1;color:black;fill:url(#radialGradient1972);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect2255"
+         style="opacity:1;color:black;fill:url(#linearGradient1974);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <g
+       id="g3183"
+       style="opacity:0.3"
+       transform="matrix(-0.340425,0,0,0.625,-11.6596,-23.99648)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect3185"
+         style="opacity:1;color:black;fill:url(#radialGradient3201);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect3187"
+         style="opacity:1;color:black;fill:url(#radialGradient3203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect3189"
+         style="opacity:1;color:black;fill:url(#linearGradient3205);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -14.90628,-7.496478 C -14.122201,-7.496478 -13.50003,-6.8637163 -13.50003,-6.058978 L -13.50003,2.066022 C -13.50003,2.87076 -14.1222,3.503522 -14.90628,3.503522 L -20.68753,3.503522 L -23.46878,5.941022 L -23.46878,3.503522 L -25.09378,3.503522 C -25.877859,3.503522 -26.500031,2.87076 -26.50003,2.066022 L -26.50003,-6.058978 C -26.50003,-6.8637163 -25.877859,-7.496478 -25.09378,-7.496478 L -14.90628,-7.496478 z "
+       id="path3192"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0047876"
+       inkscape:original="M 1.59375 0.5 C 0.990612 0.5 0.49999997 1.0124794 0.5 1.65625 L 0.5 8.34375 C 0.49999924 8.9875204 0.99061204 9.46875 1.59375 9.46875 L 2.46875 9.46875 L 2.46875 11.4375 L 5.25 9.46875 L 9.40625 9.46875 C 10.009388 9.46875 10.5 8.9875205 10.5 8.34375 L 10.5 1.65625 C 10.5 1.0124794 10.009387 0.50000001 9.40625 0.5 L 1.59375 0.5 z "
+       xlink:href="#path2221"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.19785893;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3194"
+       inkscape:href="#path2221"
+       d="M 1.59375,1.5 C 1.5597829,1.5 1.5,1.5229727 1.5,1.65625 L 1.5,8.34375 C 1.4999998,8.4770255 1.5250763,8.46875 1.59375,8.46875 L 2.46875,8.46875 C 3.0199231,8.4714246 3.4660754,8.9175769 3.46875,9.46875 L 3.46875,9.5 L 4.65625,8.65625 C 4.8293233,8.532463 5.0372235,8.4668103 5.25,8.46875 L 9.40625,8.46875 C 9.4749239,8.46875 9.5,8.4770272 9.5,8.34375 L 9.5,1.65625 C 9.5,1.5229737 9.4402151,1.5 9.40625,1.5 L 1.59375,1.5 z "
+       transform="matrix(-0.834823,0,0,0.834823,13.43129,5.899303)" />
+    <g
+       id="g3378"
+       style="opacity:0.3"
+       transform="matrix(-0.340425,0,0,0.625,-6.6596,-33.99648)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect3380"
+         style="opacity:1;color:black;fill:url(#radialGradient3398);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect3382"
+         style="opacity:1;color:black;fill:url(#radialGradient3400);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect3384"
+         style="opacity:1;color:black;fill:url(#linearGradient3402);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3404);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81530744;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2234"
+       sodipodi:cx="11.756953"
+       sodipodi:cy="17.588654"
+       sodipodi:rx="6.3436799"
+       sodipodi:ry="3.9753728"
+       d="M 18.100633 17.588654 A 6.3436799 3.9753728 0 1 1  5.4132733,17.588654 A 6.3436799 3.9753728 0 1 1  18.100633 17.588654 z"
+       transform="matrix(-1.024642,0,0,0.754646,3.54664,-13.27321)" />
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -9.90628,-17.49648 C -9.1222007,-17.49648 -8.5000301,-16.863718 -8.50003,-16.05898 L -8.50003,-7.93398 C -8.50003,-7.129242 -9.1222003,-6.49648 -9.90628,-6.49648 L -15.68753,-6.49648 L -18.46878,-4.05898 L -18.46878,-6.49648 L -20.09378,-6.49648 C -20.877859,-6.49648 -21.500031,-7.129242 -21.50003,-7.93398 L -21.50003,-16.05898 C -21.50003,-16.863718 -20.877859,-17.49648 -20.09378,-17.49648 L -9.90628,-17.49648 z "
+       id="path3387"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0047876"
+       inkscape:original="M 1.59375 0.5 C 0.990612 0.5 0.49999997 1.0124794 0.5 1.65625 L 0.5 8.34375 C 0.49999924 8.9875204 0.99061204 9.46875 1.59375 9.46875 L 2.46875 9.46875 L 2.46875 11.4375 L 5.25 9.46875 L 9.40625 9.46875 C 10.009388 9.46875 10.5 8.9875205 10.5 8.34375 L 10.5 1.65625 C 10.5 1.0124794 10.009387 0.50000001 9.40625 0.5 L 1.59375 0.5 z "
+       xlink:href="#path2221"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3389"
+       inkscape:href="#path2221"
+       d="M 1.59375,1.5 C 1.5597829,1.5 1.5,1.5229727 1.5,1.65625 L 1.5,8.34375 C 1.4999998,8.4770255 1.5250763,8.46875 1.59375,8.46875 L 2.46875,8.46875 C 3.0199231,8.4714246 3.4660754,8.9175769 3.46875,9.46875 L 3.46875,9.5 L 4.65625,8.65625 C 4.8293233,8.532463 5.0372235,8.4668103 5.25,8.46875 L 9.40625,8.46875 C 9.4749239,8.46875 9.5,8.4770272 9.5,8.34375 L 9.5,1.65625 C 9.5,1.5229737 9.4402151,1.5 9.40625,1.5 L 1.59375,1.5 z "
+       transform="matrix(-1,0,0,1,-3e-5,-19.99648)" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:2.86901665px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1339"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
+       transform="matrix(0.348549,0,0,0.348549,5.066035,4.723779)" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:4.78170681px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1341"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
+       transform="matrix(0.20913,0,0,0.20913,7.239621,7.034267)" />
+    <path
+       style="opacity:0.5;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3409);stroke-width:0.99999952px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 14.5,10.500004 C 14.5,12.708004 12.708,14.500005 10.499999,14.500005 C 8.2920005,14.500005 6.4999997,12.708004 6.4999997,10.500004 C 6.4999997,8.2920009 8.2920005,6.4999998 10.499999,6.4999998 C 12.708,6.4999998 14.5,8.2920009 14.5,10.500004 z "
+       id="path2220" />
+    <rect
+       style="fill:#2e3436;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3421"
+       width="1"
+       height="3"
+       x="10"
+       y="8"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="fill:#2e3436;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3423"
+       width="1"
+       height="3"
+       x="10"
+       y="-13"
+       transform="matrix(0,1,-1,0,0,0)"
+       rx="0.5"
+       ry="0.5" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-busy.svg b/pidgin/pixmaps/tray/16/scalable/tray-busy.svg
new file mode 100644
index 0000000000..0d269bf9e3
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-busy.svg
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/Desktop/temp"
+   sodipodi:docname="tray-busy.svg">
+  <defs
+     id="defs1874">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2260">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop2262" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop2264" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2260"
+       id="radialGradient2266"
+       cx="11.756953"
+       cy="17.588654"
+       fx="11.756953"
+       fy="17.588654"
+       r="6.3436799"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.296523,0,0,0.296522,15.24437,5.75564)"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2186">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2188" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2190" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2343"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.420408,0,0,0.420404,15.54691,5.457116)"
+       x1="11.226587"
+       y1="-5.4832759"
+       x2="11.226587"
+       y2="17.697369" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient1956"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="2.2464287"
+       x2="17.890068"
+       y2="34.458977"
+       gradientTransform="matrix(0.287092,0,0,0.287092,5.363906,5.455062)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1959"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.36035,0,0,0.358865,4.074001,4.193834)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1974"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="24.938614"
+     inkscape:cy="9.7385644"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2249"
+       style="opacity:0.3"
+       transform="matrix(-0.274688,0,0,0.504311,12.18504,-12.90685)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect2251"
+         style="opacity:1;color:black;fill:url(#radialGradient1970);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect2253"
+         style="opacity:1;color:black;fill:url(#radialGradient1972);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect2255"
+         style="opacity:1;color:black;fill:url(#linearGradient1974);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1311"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
+       transform="matrix(-0.359512,0,0,0.359513,16.06516,4.510494)" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:2.86904168px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2325"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402 16.57217 A 14.345175 14.345175 0 1 1  1.2450523,16.57217 A 14.345175 14.345175 0 1 1  29.935402 16.57217 z"
+       transform="matrix(-0.348549,0,0,0.348549,15.93396,4.723784)" />
+    <path
+       style="opacity:0.6;color:black;fill:url(#linearGradient2343);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2345);stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 6.5000022,10.500005 C 6.5000022,12.708005 8.2920019,14.500007 10.500003,14.500007 C 12.708002,14.500007 14.500003,12.708005 14.500003,10.500005 C 14.500003,8.2920031 12.708002,6.5000024 10.500003,6.5000024 C 8.2920019,6.5000024 6.5000022,8.2920031 6.5000022,10.500005 z "
+       id="path2327" />
+    <path
+       style="color:black;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.9999997px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.4999965,10.462709 C 7.4999965,11.704559 7.8536586,11.48502 10.525339,11.48502 C 13.171696,11.48502 13.499995,11.684313 13.499995,10.517346 C 13.499995,9.3321718 12.740568,9.5414293 10.499996,9.5414293 C 8.2761439,9.5414293 7.4999965,9.2026451 7.4999965,10.462709 z "
+       id="path2329"
+       sodipodi:nodetypes="czzzz" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-connecting.svg b/pidgin/pixmaps/tray/16/scalable/tray-connecting.svg
new file mode 100644
index 0000000000..f609374457
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-connecting.svg
@@ -0,0 +1,724 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   version="1.0"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="tray-connecting.svg"
+   inkscape:export-filename="/home/hbons/GUI/Tango/Gaim Refresh/notification-area/tray-connecting.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5189">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5191" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop5193" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5167">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop5169" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:0;"
+         offset="1"
+         id="stop5171" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5714">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop5716" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0;"
+         offset="1"
+         id="stop5718" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5706">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop5708" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop5710" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop29420" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop29422" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient29443"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.2733"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2261"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         id="stop2812"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2831"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2781">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2783" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2785" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2245"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2186">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2188" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2190" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2194"
+       x1="11.226587"
+       y1="-5.4832759"
+       x2="11.226587"
+       y2="17.697369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2260">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop2262" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop2264" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2200">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2202" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2204" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2200"
+       id="radialGradient2216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.522332,0,0,2.521765,40.1904,-21.83521)"
+       cx="9.9988937"
+       cy="8.963316"
+       fx="9.9988937"
+       fy="8.963316"
+       r="7.003407" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2200"
+       id="radialGradient2225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.522332,0,0,2.521765,40.1904,-21.80154)"
+       cx="9.9988937"
+       cy="8.963316"
+       fx="9.9988937"
+       fy="8.963316"
+       r="7.003407" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2260"
+       id="radialGradient2266"
+       cx="11.756953"
+       cy="17.588654"
+       fx="11.756953"
+       fy="17.588654"
+       r="6.3436799"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient1357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       x1="15.602553"
+       y1="1.5657365"
+       x2="15.522223"
+       y2="33.483475" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       x1="11.226587"
+       y1="-5.4832759"
+       x2="11.226587"
+       y2="17.697369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2343"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       x1="11.226587"
+       y1="-5.4832759"
+       x2="11.226587"
+       y2="17.697369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5706"
+       id="linearGradient5712"
+       x1="11.150298"
+       y1="20.653116"
+       x2="6.772469"
+       y2="20.653116"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5714"
+       id="linearGradient5720"
+       x1="10.95891"
+       y1="16.657467"
+       x2="5.1080284"
+       y2="16.825354"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5167"
+       id="linearGradient5173"
+       x1="2.532984"
+       y1="19.600262"
+       x2="4.5063553"
+       y2="19.600262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.520241,0,0,0.83297,-6.850746,-7.826426)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189"
+       id="linearGradient5195"
+       x1="13.140625"
+       y1="17.39238"
+       x2="13.140625"
+       y2="19.558514"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189"
+       id="linearGradient5199"
+       gradientUnits="userSpaceOnUse"
+       x1="13.140625"
+       y1="17.39238"
+       x2="13.140625"
+       y2="19.558514" />
+    <linearGradient
+       y2="19.558514"
+       x2="13.140625"
+       y1="17.39238"
+       x1="13.140625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2129"
+       xlink:href="#linearGradient5189"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.558514"
+       x2="13.140625"
+       y1="17.39238"
+       x1="13.140625"
+       id="linearGradient2127"
+       xlink:href="#linearGradient5189"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.600262"
+       x2="4.5063553"
+       y1="19.600262"
+       x1="2.532984"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2125"
+       xlink:href="#linearGradient5167"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.600262"
+       x2="4.5063553"
+       y1="19.600262"
+       x1="2.532984"
+       id="linearGradient2123"
+       xlink:href="#linearGradient5167"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="16.825354"
+       x2="5.1080284"
+       y1="16.657467"
+       x1="10.95891"
+       id="linearGradient2121"
+       xlink:href="#linearGradient5714"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.653116"
+       x2="6.772469"
+       y1="20.653116"
+       x1="11.150298"
+       id="linearGradient2119"
+       xlink:href="#linearGradient5706"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2117"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2115"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2113"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2111"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2109"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2101"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2099"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2097"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2083"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2075"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2073"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2065"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2063"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2055">
+      <stop
+         id="stop2057"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2059" />
+      <stop
+         id="stop2061"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2053"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2051"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2049"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2047"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2041">
+      <stop
+         id="stop2043"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2045"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="25.730843"
+     inkscape:cx="9.7885693"
+     inkscape:cy="10.965701"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fill="#d3d7cf"
+     inkscape:window-width="1274"
+     inkscape:window-height="848"
+     inkscape:window-x="3"
+     inkscape:window-y="0"
+     width="16px"
+     height="16px" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:#fce94f;fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5163"
+       width="3.9243481"
+       height="2.000005"
+       x="5.5"
+       y="9.4999905"
+       rx="0.92197275"
+       ry="1.0000025" />
+    <rect
+       style="opacity:1;fill:#fce94f;fill-opacity:1;stroke:#c4a000;stroke-width:0.99999958;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4276"
+       width="3.0000005"
+       height="1.9999996"
+       x="6.4999995"
+       y="5.4999957"
+       rx="0.70481014"
+       ry="0.99999982" />
+    <path
+       style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#204a87;stroke-width:0.99999899;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 5.4454196,4.4999958 C 3.5422197,4.4999958 3.5000001,6.8300533 3.5000001,6.8300533 L 3.5522474,9.8333292 C 3.5522474,9.8333292 3.4852045,12.499995 5.4454196,12.499995 L 7.5000026,12.499995 C 7.5000026,10.21962 7.5000026,6.7931358 7.5000026,4.4999958 L 5.4454196,4.4999958 z "
+       id="rect4812"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="opacity:1;fill:url(#linearGradient5173);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5165"
+       width="3"
+       height="1"
+       x="-3"
+       y="7.9999962"
+       transform="scale(-1,1)" />
+    <path
+       style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#204a87;stroke-width:0.99999928;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 13.554581,4.499996 C 15.45778,4.499996 15.5,6.8300545 15.5,6.8300545 L 15.447753,9.8333318 C 15.447753,9.8333318 15.514797,12.5 13.554581,12.5 L 11.499997,12.5 C 11.499997,10.219623 11.499997,6.7931371 11.499997,4.499996 L 13.554581,4.499996 z "
+       id="path5179"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.70056742"
+       inkscape:original="M 13.09375 15.5 C 11.825955 15.5 11.8125 17.25 11.8125 17.25 L 11.84375 19.5 C 11.84375 19.5 11.787975 21.5 13.09375 21.5 L 14.46875 21.5 C 14.46875 19.789718 14.46875 17.219855 14.46875 15.5 L 13.09375 15.5 z "
+       style="opacity:0.4585153;fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient5195);stroke-width:0.71123713;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5187"
+       d="M 13.09375,16.1875 C 12.937973,16.1875 12.909638,16.221044 12.84375,16.28125 C 12.777862,16.341456 12.680104,16.476035 12.625,16.625 C 12.514791,16.92293 12.5,17.25 12.5,17.25 L 12.53125,19.5 C 12.531482,19.510415 12.531482,19.520835 12.53125,19.53125 C 12.53125,19.53125 12.547019,19.946636 12.65625,20.3125 C 12.710866,20.495432 12.775674,20.6472 12.84375,20.71875 C 12.911826,20.7903 12.946144,20.8125 13.09375,20.8125 L 13.78125,20.8125 C 13.78125,19.359615 13.78125,17.646073 13.78125,16.1875 L 13.09375,16.1875 z "
+       transform="matrix(1.56098,0,0,1.266408,-15.01225,-14.99999)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.70056742"
+       inkscape:original="M 13.09375 15.5 C 11.825955 15.5 11.8125 17.25 11.8125 17.25 L 11.84375 19.5 C 11.84375 19.5 11.787975 21.5 13.09375 21.5 L 14.46875 21.5 C 14.46875 19.789718 14.46875 17.219855 14.46875 15.5 L 13.09375 15.5 z "
+       style="opacity:0.4585153;fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient5199);stroke-width:0.70271838;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5197"
+       d="M 13.09375,16.1875 C 12.937973,16.1875 12.909638,16.221044 12.84375,16.28125 C 12.777862,16.341456 12.680104,16.476035 12.625,16.625 C 12.514791,16.92293 12.5,17.25 12.5,17.25 L 12.53125,19.5 C 12.531482,19.510415 12.531482,19.520835 12.53125,19.53125 C 12.53125,19.53125 12.547019,19.946636 12.65625,20.3125 C 12.710866,20.495432 12.775674,20.6472 12.84375,20.71875 C 12.911826,20.7903 12.946144,20.8125 13.09375,20.8125 L 13.78125,20.8125 C 13.78125,19.359615 13.78125,17.646073 13.78125,16.1875 L 13.09375,16.1875 z "
+       transform="matrix(-1.56098,0,0,1.297298,34.01224,-15.50001)" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg b/pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg
new file mode 100644
index 0000000000..cc3e19544c
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg
@@ -0,0 +1,901 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="tray-extended-away.svg">
+  <defs
+     id="defs1874">
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1974"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2947">
+      <stop
+         id="stop2949"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2951" />
+      <stop
+         id="stop2953"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3178"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3176"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3174"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3162"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3160"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3158"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3149"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3135"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3127"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3125"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3117"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3115"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3107">
+      <stop
+         id="stop3109"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3111" />
+      <stop
+         id="stop3113"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3105"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3103"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3101"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3099"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3093">
+      <stop
+         id="stop3095"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3097"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       id="linearGradient2231"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3374"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3372"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3370"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3368"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3360"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3358"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3356"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3348"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3334"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3326"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3324"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3316"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3314"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3306">
+      <stop
+         id="stop3308"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3310" />
+      <stop
+         id="stop3312"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3304"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3302"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3300"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3298"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3292">
+      <stop
+         id="stop3294"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3296"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5302"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5304"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5306"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3466">
+      <stop
+         id="stop3468"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3470" />
+      <stop
+         id="stop3472"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5300"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="23.810832"
+     inkscape:cy="5.890161"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="853"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       style="fill:#fce94f;fill-opacity:1;stroke:#ce5c00;stroke-width:0.99999905;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.499991,8.1704554 L 12.602266,5.4999994 L 6.9176132,5.4999994 C 6.0082464,5.4999994 5.499995,6.0912626 5.499995,6.8290761 L 5.499995,15.500001 L 15.499991,15.500001 L 15.499991,8.1704554 z "
+       id="rect5097"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:0.5625;fill:none;fill-opacity:1;stroke:#eeeeec;stroke-width:0.99999952;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.457283,8.560765 L 12.183694,6.5000011 L 6.4999976,6.5128218 L 6.4999976,14.500001 L 14.499996,14.500001 L 14.457283,8.560765 z "
+       id="rect5099"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="opacity:0.4;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5988"
+       width="1"
+       height="2.0000002"
+       x="-12"
+       y="7"
+       transform="scale(-1,1)" />
+    <rect
+       style="opacity:0.4;fill:#ce5c00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5990"
+       width="0.99999851"
+       height="1.9999995"
+       x="8.0000114"
+       y="12.000002"
+       transform="matrix(-2.004699e-7,1,1,-8.326572e-7,0,0)" />
+    <rect
+       style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7300"
+       width="4"
+       height="1"
+       x="8"
+       y="12" />
+    <rect
+       style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7302"
+       width="3.6559839"
+       height="0.91399604"
+       x="8"
+       y="10.086004" />
+    <rect
+       style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7304"
+       width="2"
+       height="1"
+       x="8"
+       y="8" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-invisible.svg b/pidgin/pixmaps/tray/16/scalable/tray-invisible.svg
new file mode 100644
index 0000000000..77f12414ed
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-invisible.svg
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/tray/16/scalable"
+   sodipodi:docname="tray-invisible.svg"
+   inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/tray/16/tray-invisible.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs1874">
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient1956"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="2.2464287"
+       x2="17.890068"
+       y2="34.458977"
+       gradientTransform="matrix(0.287092,0,0,0.287092,5.363906,5.455062)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1959"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.36035,0,0,0.358865,4.074001,4.193834)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1974"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.669207"
+       x2="19.461548"
+       y1="6.4422231"
+       x1="19.461548"
+       id="linearGradient5193"
+       xlink:href="#linearGradient5187"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2857"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1926">
+      <stop
+         id="stop1928"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop1930"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5187"
+       inkscape:collect="always">
+      <stop
+         id="stop5189"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop5191"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.669207"
+       x2="19.461548"
+       y1="6.4422231"
+       x1="19.461548"
+       id="linearGradient2003"
+       xlink:href="#linearGradient5187"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2001"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient1999"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1981">
+      <stop
+         id="stop1983"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop1985"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1979"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5187"
+       id="linearGradient2010"
+       gradientUnits="userSpaceOnUse"
+       x1="19.461548"
+       y1="6.4422231"
+       x2="19.461548"
+       y2="28.669207" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5187"
+       id="linearGradient2013"
+       gradientUnits="userSpaceOnUse"
+       x1="19.461548"
+       y1="6.4422231"
+       x2="19.461548"
+       y2="28.669207"
+       gradientTransform="matrix(0.322979,0,0,0.322979,4.721886,4.824456)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="23.136634"
+     inkscape:cy="8.450495"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1434"
+     inkscape:window-height="844"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2249"
+       style="opacity:0.3"
+       transform="matrix(-0.274688,0,0,0.504311,12.18504,-12.90685)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect2251"
+         style="opacity:1;color:black;fill:url(#radialGradient1970);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect2253"
+         style="opacity:1;color:black;fill:url(#radialGradient1972);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect2255"
+         style="opacity:1;color:black;fill:url(#linearGradient1974);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999875;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.500001,10.499992 C 15.500001,13.25999 13.260004,15.499989 10.5,15.499989 C 7.7399965,15.499989 5.4999996,13.25999 5.4999996,10.499992 C 5.4999996,7.7399925 7.7399965,5.4999935 10.5,5.4999935 C 13.260004,5.4999935 15.500001,7.7399925 15.500001,10.499992 z "
+       id="path4331" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient2013);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.14350748;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15,10.5 C 15,12.984 12.984,15 10.5,15 C 8.0160001,15 6,12.984 6,10.5 C 6,8.0159998 8.0160001,6 10.5,6 C 12.984,6 15,8.0159998 15,10.5 z "
+       id="path4333" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-message.svg b/pidgin/pixmaps/tray/16/scalable/tray-message.svg
new file mode 100644
index 0000000000..84dfc99b68
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-message.svg
@@ -0,0 +1,866 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="tray-message.svg">
+  <defs
+     id="defs1874">
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2947">
+      <stop
+         id="stop2949"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2951" />
+      <stop
+         id="stop2953"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3178"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3176"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3174"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3162"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3160"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3158"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3149"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3135"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3127"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3125"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3117"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3115"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3107">
+      <stop
+         id="stop3109"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3111" />
+      <stop
+         id="stop3113"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3105"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3103"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3101"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3099"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3093">
+      <stop
+         id="stop3095"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3097"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       id="linearGradient2231"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3374"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3372"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3370"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3368"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3360"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3358"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3356"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3348"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3334"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3326"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3324"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3316"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3314"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3306">
+      <stop
+         id="stop3308"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3310" />
+      <stop
+         id="stop3312"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3304"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3302"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3300"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3298"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3292">
+      <stop
+         id="stop3294"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3296"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3466">
+      <stop
+         id="stop3468"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3470" />
+      <stop
+         id="stop3472"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2261"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3547">
+      <stop
+         id="stop3549"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3551" />
+      <stop
+         id="stop3553"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="22.954891"
+     inkscape:cy="8.0975868"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="853"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       style="fill:#efefef;fill-opacity:1;stroke:#888a85;stroke-width:1.00000167;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6.4416648,8.0767122 L 14.508728,8.0767122 C 15.030409,8.0767122 15.450391,8.4774422 15.450391,8.9752122 L 15.450391,14.601489 C 15.450391,15.099258 15.030409,15.49999 14.508728,15.49999 L 6.4416648,15.49999 C 5.9199828,15.49999 5.5000008,15.099258 5.5000008,14.601489 L 5.5000008,8.9752122 C 5.5000008,8.4774422 5.9199828,8.0767122 6.4416648,8.0767122 z "
+       id="path7503" />
+    <path
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:white;stroke-width:1.00000155;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 7.1139138,8.9015152 L 13.836463,8.9015152 C 14.271197,8.9015152 14.621182,9.2131942 14.621182,9.6003474 L 14.621182,13.976335 C 14.621182,14.363489 14.271197,14.675168 13.836463,14.675168 L 7.1139138,14.675168 C 6.6791788,14.675168 6.3291938,14.363489 6.3291938,13.976335 L 6.3291938,9.6003474 C 6.3291938,9.2131942 6.6791788,8.9015152 7.1139138,8.9015152 z "
+       id="path7507" />
+    <path
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:white;stroke-width:0.99999934;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 10.475189,12.200748 L 7.1583938,14.675172 L 13.791985,14.675172 L 10.475189,12.200748 z "
+       id="path7509" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#babdb6;stroke-width:1.00000119;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.763998,15.500002 L 6.2015868,15.500002 C 5.8167108,15.500002 5.5068658,15.13371 5.5068658,14.678722 L 10.472899,10.500001 L 15.458721,14.678722 C 15.458721,15.13371 15.148874,15.500002 14.763998,15.500002 z "
+       id="path7499" />
+    <path
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:white;stroke-width:1.00000119;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 7.1583978,8.9015212 L 10.475193,11.375936 L 13.791988,8.9015212 L 7.1583978,8.9015212 z "
+       id="path7512" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#babdb6;stroke-width:1.00000131;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.763998,7.5000019 L 6.2015868,7.5000019 C 5.8167108,7.5000019 5.5068658,7.8662936 5.5068658,8.3212822 L 10.472899,12.499995 L 15.458721,8.3212822 C 15.458721,7.8662936 15.148874,7.5000019 14.763998,7.5000019 z "
+       id="path7514" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000155;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6.4463598,7.500006 L 14.553645,7.500006 C 15.077927,7.500006 15.500003,7.9318687 15.500003,8.4683105 L 15.500003,14.531693 C 15.500003,15.068134 15.077927,15.499999 14.553645,15.499999 L 6.4463598,15.499999 C 5.9220768,15.499999 5.5000008,15.068134 5.5000008,14.531693 L 5.5000008,8.4683105 C 5.5000008,7.9318687 5.9220768,7.500006 6.4463598,7.500006 z "
+       id="path7501" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-offline.svg b/pidgin/pixmaps/tray/16/scalable/tray-offline.svg
new file mode 100644
index 0000000000..b0dd8ed16a
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-offline.svg
@@ -0,0 +1,868 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="tray-offline.svg">
+  <defs
+     id="defs1874">
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient1956"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="2.2464287"
+       x2="17.890068"
+       y2="34.458977"
+       gradientTransform="matrix(0.287092,0,0,0.287092,5.363906,5.455062)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1959"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.36035,0,0,0.358865,4.074001,4.193834)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1974"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2345"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2343"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient2194"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2947">
+      <stop
+         id="stop2949"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2951" />
+      <stop
+         id="stop2953"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2261"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient3011"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.420408,0,0,0.420404,15.5469,5.457115)"
+       x1="11.226587"
+       y1="-5.4832759"
+       x2="11.226587"
+       y2="17.697369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3013"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.296522,0,0,0.296523,15.24437,5.755639)"
+       x1="15.535398"
+       y1="1.8014067"
+       x2="15.535398"
+       y2="48.674999" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.370788,0,0,0.370892,2.569561,8.563159)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3178"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.525701,0,0,0.525844,2.191252,8.189764)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3176"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3174"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient3162"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3160"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3158"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3149"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient3135"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       id="linearGradient3127"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3125"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3117"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3115"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3107">
+      <stop
+         id="stop3109"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3111" />
+      <stop
+         id="stop3113"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3105"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3103"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3101"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3099"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3093">
+      <stop
+         id="stop3095"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3097"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       id="linearGradient2231"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient3201"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient3203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2260"
+       id="radialGradient3207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       cx="11.756953"
+       cy="17.588654"
+       fx="11.756953"
+       fy="17.588654"
+       r="6.3436799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2225"
+       id="linearGradient3211"
+       gradientUnits="userSpaceOnUse"
+       x1="11.802028"
+       y1="1.9986149"
+       x2="11.802028"
+       y2="14.895812"
+       gradientTransform="matrix(0.799641,0,0,0.799917,3.703059,-1.099214)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="20.94098"
+     inkscape:cy="10.016866"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="853"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2249"
+       style="opacity:0.3"
+       transform="matrix(-0.274688,0,0,0.504311,12.18504,-12.90685)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect2251"
+         style="opacity:1;color:black;fill:url(#radialGradient1970);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect2253"
+         style="opacity:1;color:black;fill:url(#radialGradient1972);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect2255"
+         style="opacity:1;color:black;fill:url(#linearGradient1974);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <g
+       id="g3183"
+       style="opacity:0.3"
+       transform="matrix(-0.340425,0,0,0.625,-11.6596,-23.99648)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect3185"
+         style="opacity:1;color:black;fill:url(#radialGradient3201);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect3187"
+         style="opacity:1;color:black;fill:url(#radialGradient3203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect3189"
+         style="opacity:1;color:black;fill:url(#linearGradient3205);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -14.90628,-7.496478 C -14.122201,-7.496478 -13.50003,-6.8637163 -13.50003,-6.058978 L -13.50003,2.066022 C -13.50003,2.87076 -14.1222,3.503522 -14.90628,3.503522 L -20.68753,3.503522 L -23.46878,5.941022 L -23.46878,3.503522 L -25.09378,3.503522 C -25.877859,3.503522 -26.500031,2.87076 -26.50003,2.066022 L -26.50003,-6.058978 C -26.50003,-6.8637163 -25.877859,-7.496478 -25.09378,-7.496478 L -14.90628,-7.496478 z "
+       id="path3192"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0047876"
+       inkscape:original="M 1.59375 0.5 C 0.990612 0.5 0.49999997 1.0124794 0.5 1.65625 L 0.5 8.34375 C 0.49999924 8.9875204 0.99061204 9.46875 1.59375 9.46875 L 2.46875 9.46875 L 2.46875 11.4375 L 5.25 9.46875 L 9.40625 9.46875 C 10.009388 9.46875 10.5 8.9875205 10.5 8.34375 L 10.5 1.65625 C 10.5 1.0124794 10.009387 0.50000001 9.40625 0.5 L 1.59375 0.5 z "
+       xlink:href="#path2221"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3194"
+       inkscape:href="#path2221"
+       d="M 1.59375,1.5 C 1.5597829,1.5 1.5,1.5229727 1.5,1.65625 L 1.5,8.34375 C 1.4999998,8.4770255 1.5250763,8.46875 1.59375,8.46875 L 2.46875,8.46875 C 3.0199231,8.4714246 3.4660754,8.9175769 3.46875,9.46875 L 3.46875,9.5 L 4.65625,8.65625 C 4.8293233,8.532463 5.0372235,8.4668103 5.25,8.46875 L 9.40625,8.46875 C 9.4749239,8.46875 9.5,8.4770272 9.5,8.34375 L 9.5,1.65625 C 9.5,1.5229737 9.4402151,1.5 9.40625,1.5 L 1.59375,1.5 z "
+       transform="matrix(-1,0,0,1,-5.00003,-9.996478)" />
+    <path
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.46711,8.5945802 C 12.697599,8.5945812 12.884662,9.1557552 12.884662,9.8472022 C 12.884662,10.538649 12.697599,11.099824 12.46711,11.099823 C 12.236622,11.099823 12.049558,10.538648 12.049558,9.8472022 C 12.049558,9.1557542 12.236622,8.5945802 12.46711,8.5945802 z "
+       id="path1588" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:#555753;stroke-width:0.99999905;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.035707,14.0357 C 12.083594,15.987813 8.915277,15.988142 6.963571,14.036438 C 5.0118649,12.08473 5.0121953,8.9164146 6.9643092,6.9643005 C 8.9164221,5.012187 12.084737,5.0118562 14.036444,6.9635632 C 15.988151,8.9152688 15.98782,12.083586 14.035707,14.0357 z "
+       id="path2187" />
+    <path
+       style="opacity:0.4;fill:url(#linearGradient3211);fill-opacity:1;stroke:white;stroke-width:0.99999774;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 10.500005,6.4999989 C 9.4701653,6.5001062 8.4600166,6.892018 7.6762741,7.6748771 C 6.1077225,9.2416614 6.1080997,11.757883 7.6762741,13.324292 C 9.2454692,14.891716 11.754165,14.892095 13.323736,13.324292 C 14.892287,11.757508 14.891909,9.241284 13.323736,7.6748771 C 12.54017,6.8921943 11.529535,6.4998916 10.500005,6.4999989 z "
+       id="path2215" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:0.99999911;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.012717,7.0856385 L 10.493143,8.5136887 L 9.0186203,6.9641831 L 6.905447,9.0600445 L 8.5171518,10.486297 L 6.9955461,11.971298 L 9.1224384,14.094548 L 10.493143,12.45891 L 11.967667,14.035803 L 14.094559,11.912554 L 12.469139,10.486297 L 14.125891,9.2088861 L 12.012717,7.0856385 z "
+       id="rect1322"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/scalable/tray-online.svg b/pidgin/pixmaps/tray/16/scalable/tray-online.svg
new file mode 100644
index 0000000000..ab1d1ea82a
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/scalable/tray-online.svg
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg1872"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="tray-online.svg">
+  <defs
+     id="defs1874">
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7751"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7753"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7755"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2855"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3149"
+       inkscape:collect="always">
+      <stop
+         id="stop3151"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3153"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient1956"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="2.2464287"
+       x2="17.890068"
+       y2="34.458977"
+       gradientTransform="matrix(0.287092,0,0,0.287092,5.363906,5.455062)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient1959"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.36035,0,0,0.358865,4.074001,4.193834)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient1972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient1974"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="24.938614"
+     inkscape:cy="9.7569307"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="853"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata1877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2249"
+       style="opacity:0.3"
+       transform="matrix(-0.274688,0,0,0.504311,12.18504,-12.90685)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect2251"
+         style="opacity:1;color:black;fill:url(#radialGradient1970);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect2253"
+         style="opacity:1;color:black;fill:url(#radialGradient1972);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect2255"
+         style="opacity:1;color:black;fill:url(#linearGradient1974);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.418273,0.49999995 C 10.02141,0.49999995 10.500003,1.0061936 10.500003,1.6499642 L 10.500003,8.32996 C 10.500003,8.9737304 10.021411,9.4799242 9.418273,9.4799242 L 5.2414529,9.4799242 L 2.471336,11.429863 L 2.471336,9.4799242 L 1.5817316,9.4799242 C 0.9785936,9.4799242 0.49999957,8.9737304 0.50000033,8.32996 L 0.50000033,1.6499642 C 0.50000033,1.0061936 0.9785936,0.49999995 1.5817316,0.49999995 L 9.418273,0.49999995 z "
+       id="path2221"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.2045414,1.5000001 C 9.3816286,1.5000001 9.4999957,1.6028844 9.4999957,1.7987807 L 9.4999957,7.3475646 C 9.4999957,7.543461 9.3816293,7.6463453 9.2045414,7.6463453 L 4.9999978,8.3220879 C 4.8242182,8.3232475 4.6547723,8.3838621 4.5227251,8.4928197 L 3.7045437,9.175747 L 3.7045437,9.0050151 C 3.7025982,8.6286041 3.3781242,8.3239148 2.9772712,8.3220879 L 1.7954537,7.6463453 C 1.6183665,7.6463453 1.4999993,7.5434596 1.4999993,7.3475646 L 1.4999993,1.7987807 C 1.4999993,1.6028846 1.6183665,1.5000001 1.7954537,1.5000001 L 9.2045414,1.5000001 z "
+       id="path5807"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       style="fill:url(#linearGradient1959);fill-opacity:1;fill-rule:evenodd;stroke:#387101;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.541385,10.5 C 15.541385,13.26 13.292114,15.5 10.520692,15.5 C 7.7492697,15.5 5.4999993,13.26 5.4999993,10.5 C 5.4999993,7.7399998 7.7492697,5.5000001 10.520692,5.5000001 C 13.292114,5.5000001 15.541385,7.7399998 15.541385,10.5 z "
+       id="path2245" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient1956);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.500006,10.499996 C 14.500006,12.707996 12.708004,14.499996 10.500004,14.499996 C 8.2920042,14.499996 6.5000039,12.707996 6.5000039,10.499996 C 6.5000039,8.2919968 8.2920042,6.4999962 10.500004,6.4999962 C 12.708004,6.4999962 14.500006,8.2919968 14.500006,10.499996 z "
+       id="path3145" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/16/tray-away.png b/pidgin/pixmaps/tray/16/tray-away.png
index 9a986b1f65..e225086d74 100644
--- a/pidgin/pixmaps/tray/16/tray-away.png
+++ b/pidgin/pixmaps/tray/16/tray-away.png
diff --git a/pidgin/pixmaps/tray/16/tray-busy.png b/pidgin/pixmaps/tray/16/tray-busy.png
index e0770f0260..9a45db3227 100644
--- a/pidgin/pixmaps/tray/16/tray-busy.png
+++ b/pidgin/pixmaps/tray/16/tray-busy.png
diff --git a/pidgin/pixmaps/tray/16/tray-connecting.png b/pidgin/pixmaps/tray/16/tray-connecting.png
index 857107eb7d..6e11bf4c50 100644
--- a/pidgin/pixmaps/tray/16/tray-connecting.png
+++ b/pidgin/pixmaps/tray/16/tray-connecting.png
diff --git a/pidgin/pixmaps/tray/16/tray-extended-away.png b/pidgin/pixmaps/tray/16/tray-extended-away.png
index 4e1fa36dce..99f96424f1 100644
--- a/pidgin/pixmaps/tray/16/tray-extended-away.png
+++ b/pidgin/pixmaps/tray/16/tray-extended-away.png
diff --git a/pidgin/pixmaps/tray/16/tray-invisible.png b/pidgin/pixmaps/tray/16/tray-invisible.png
new file mode 100644
index 0000000000..ea87e07bd1
--- /dev/null
+++ b/pidgin/pixmaps/tray/16/tray-invisible.png
diff --git a/pidgin/pixmaps/tray/16/tray-message.png b/pidgin/pixmaps/tray/16/tray-message.png
index 705ca9c0b0..3efe8e93ac 100644
--- a/pidgin/pixmaps/tray/16/tray-message.png
+++ b/pidgin/pixmaps/tray/16/tray-message.png
diff --git a/pidgin/pixmaps/tray/16/tray-offline.png b/pidgin/pixmaps/tray/16/tray-offline.png
index 07579a62ad..a77cc247fd 100644
--- a/pidgin/pixmaps/tray/16/tray-offline.png
+++ b/pidgin/pixmaps/tray/16/tray-offline.png
diff --git a/pidgin/pixmaps/tray/16/tray-online.png b/pidgin/pixmaps/tray/16/tray-online.png
index 4cda0de499..2731ba39df 100644
--- a/pidgin/pixmaps/tray/16/tray-online.png
+++ b/pidgin/pixmaps/tray/16/tray-online.png
diff --git a/pidgin/pixmaps/tray/22/Makefile.am b/pidgin/pixmaps/tray/22/Makefile.am
index 0d6b9b7067..37b09fdeb7 100644
--- a/pidgin/pixmaps/tray/22/Makefile.am
+++ b/pidgin/pixmaps/tray/22/Makefile.am
@@ -1,7 +1,10 @@
+SUBSIRS = scalable
+
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \
 		tray-connecting.png \
 		tray-extended-away.png \
+		tray-invisible.png \
 		tray-message.png \
 		tray-offline.png \
 		tray-online.png
diff --git a/pidgin/pixmaps/tray/22/scalable/Makefile.am b/pidgin/pixmaps/tray/22/scalable/Makefile.am
new file mode 100644
index 0000000000..331a4c35c0
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = tray-invisible.svg
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
new file mode 100644
index 0000000000..8dcd39ac32
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg4403"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   version="1.0"
+   sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/tray/22/scalable"
+   sodipodi:docname="tray-invisible.svg"
+   inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/tray/22/tray-invisible.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4405">
+    <linearGradient
+       id="linearGradient5187"
+       inkscape:collect="always">
+      <stop
+         id="stop5189"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop5191"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2261"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         id="stop2812"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient7755"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient7753"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2781">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2783" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2785" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient7751"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5187"
+       id="linearGradient2220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.394752,0,0,0.394752,8.437859,8.563225)"
+       x1="19.461548"
+       y1="6.4422231"
+       x2="19.461548"
+       y2="28.669207" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="25.498579"
+     inkscape:cx="19.883015"
+     inkscape:cy="11.999162"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="24px"
+     height="24px"
+     inkscape:window-width="1274"
+     inkscape:window-height="844"
+     inkscape:window-x="6"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata4408">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2249"
+       style="opacity:0.3"
+       transform="matrix(-0.340425,0,0,0.625,17.34043,-14)">
+      <rect
+         transform="scale(-1,-1)"
+         y="-48"
+         x="-11"
+         height="8"
+         width="10"
+         id="rect2251"
+         style="opacity:1;color:black;fill:url(#radialGradient2257);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="38"
+         height="8"
+         width="10"
+         id="rect2253"
+         style="opacity:1;color:black;fill:url(#radialGradient2259);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="40"
+         x="11"
+         height="8"
+         width="27"
+         id="rect2255"
+         style="opacity:1;color:black;fill:url(#linearGradient2261);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 9.90625,2.5 C 9.1221707,2.5 8.5000001,3.1327617 8.5,3.9375 L 8.5,12.0625 C 8.5,12.867238 9.1221703,13.5 9.90625,13.5 L 15.6875,13.5 L 18.46875,15.9375 L 18.46875,13.5 L 20.09375,13.5 C 20.877829,13.5 21.500001,12.867238 21.5,12.0625 L 21.5,3.9375 C 21.5,3.1327617 20.877829,2.5 20.09375,2.5 L 9.90625,2.5 z "
+       id="path2221"
+       transform="matrix(-1,0,0,1,24,0)" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 9.90625,3.5 C 9.6627547,3.5 9.5,3.650652 9.5,3.9375 L 9.5,12.0625 C 9.5,12.349348 9.6627543,12.5 9.90625,12.5 L 15.6875,12.5 C 15.929197,12.501698 16.162185,12.590455 16.34375,12.75 L 17.46875,13.75 L 17.46875,13.5 C 17.471425,12.948827 17.917577,12.502675 18.46875,12.5 L 20.09375,12.5 C 20.337245,12.5 20.5,12.349346 20.5,12.0625 L 20.5,3.9375 C 20.5,3.6506524 20.337245,3.5 20.09375,3.5 L 9.90625,3.5 z "
+       id="path5807"
+       transform="matrix(-1,0,0,1,24,0)" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999863;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 21.500007,15.500001 C 21.500007,18.812 18.81201,21.499999 15.500004,21.499999 C 12.188,21.499999 9.5000032,18.812 9.5000032,15.500001 C 9.5000032,12.188001 12.188,9.5000014 15.500004,9.5000014 C 18.81201,9.5000014 21.500007,12.188001 21.500007,15.500001 z "
+       id="path4331" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient2220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.14350748;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 21,15.500001 C 21,18.536 18.535999,21 15.499999,21 C 12.464,21 10,18.536 10,15.500001 C 10,12.464 12.464,10 15.499999,10 C 18.535999,10 21,12.464 21,15.500001 z "
+       id="path4333" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/22/tray-invisible.png b/pidgin/pixmaps/tray/22/tray-invisible.png
new file mode 100644
index 0000000000..3cb7a66588
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/tray-invisible.png
diff --git a/pidgin/plugins/timestamp_format.c b/pidgin/plugins/timestamp_format.c
index bedec2ab43..f836ed626a 100644
--- a/pidgin/plugins/timestamp_format.c
+++ b/pidgin/plugins/timestamp_format.c
@@ -58,7 +58,8 @@ static char *timestamp_cb_common(PurpleConversation *conv,
                                  time_t t,
                                  gboolean show_date,
                                  gboolean force,
-                                 const char *dates)
+                                 const char *dates,
+								 gboolean parens)
 {
 	g_return_val_if_fail(dates != NULL, NULL);
 
@@ -68,15 +69,15 @@ static char *timestamp_cb_common(PurpleConversation *conv,
 	{
 		struct tm *tm = localtime(&t);
 		if (force)
-			return g_strdup(purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm));
+			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : "");
 		else
-			return g_strdup(purple_date_format_long(tm));
+			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_date_format_long(tm), parens ? ")" : "");
 	}
 
 	if (force)
 	{
 		struct tm *tm = localtime(&t);
-		return g_strdup(purple_utf8_strftime("%H:%M:%S", tm));
+		return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%H:%M:%S", tm), parens ? ")" : "");
 	}
 
 	return NULL;
@@ -92,7 +93,7 @@ static char *conversation_timestamp_cb(PurpleConversation *conv,
 
 	g_return_val_if_fail(conv != NULL, NULL);
 
-	return timestamp_cb_common(conv, t, show_date, force, dates);
+	return timestamp_cb_common(conv, t, show_date, force, dates, TRUE);
 }
 
 static char *log_timestamp_cb(PurpleLog *log, time_t t, gboolean show_date, gpointer data)
@@ -104,7 +105,7 @@ static char *log_timestamp_cb(PurpleLog *log, time_t t, gboolean show_date, gpoi
 
 	g_return_val_if_fail(log != NULL, NULL);
 
-	return timestamp_cb_common(log->conv, t, show_date, force, dates);
+	return timestamp_cb_common(log->conv, t, show_date, force, dates, FALSE);
 }
 
 static gboolean
diff --git a/pidgin/win32/gtkdocklet-win32.c b/pidgin/win32/gtkdocklet-win32.c
index e7788bd87d..d00ae11cc4 100644
--- a/pidgin/win32/gtkdocklet-win32.c
+++ b/pidgin/win32/gtkdocklet-win32.c
@@ -496,6 +496,8 @@ static void winpidgin_tray_update_icon(DockletStatus icon) {
 		case DOCKLET_STATUS_XA:
 			icon_name = PIDGIN_STOCK_TRAY_XA;
 			break;
+		case DOCKLET_STATUS_INVISIBLE:
+			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
 		}
 
 		g_return_if_fail(icon_name != NULL);
@@ -569,6 +571,8 @@ static void winpidgin_tray_create() {
 			MAKEINTRESOURCE(PIDGIN_TRAY_CONNECTING_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
 		cached_icons[DOCKLET_STATUS_PENDING] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_PENDING_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
+		cached_icons[DOCKLET_STATUS_INVISIBLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+			MAKEINTRESOURCE(PIDGIN_TRAY_INVISIBLE_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
 	}
 
 	/* Create icon in systray */
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
index 0d6da91b5b..70ba38ed43 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -114,6 +114,7 @@ VIAddVersionKey "FileDescription" "Pidgin Installer (w/o GTK+ Installer)"
   !define MUI_ABORTWARNING
 
   ;Finish Page config
+  !define MUI_FINISHPAGE_NOAUTOCLOSE
   !define MUI_FINISHPAGE_RUN			"$INSTDIR\pidgin.exe"
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_FINISHPAGE_LINK			$(PIDGIN_FINISH_VISIT_WEB_SITE)
@@ -260,7 +261,7 @@ Section -SecUninstallOldPidgin
   ReadRegStr $STARTUP_RUN_KEY HKCU "${STARTUP_RUN_KEY}" $R7
   IfErrors +3
   StrCpy $STARTUP_RUN_KEY "HKCU"
-  Goto +4
+  Goto +5
   ClearErrors
   ReadRegStr $STARTUP_RUN_KEY HKLM "${STARTUP_RUN_KEY}" $R7
   IfErrors +2
@@ -282,9 +283,9 @@ Section -SecUninstallOldPidgin
 
   ; If a previous version exists, remove it
   try_uninstall:
-    StrCmp $R1 "" done
+    StrCmp $R1 "" no_version_found
       ; Version key started with 0.60a3. Prior versions can't be
-      ; automaticlly uninstalled.
+      ; automatically uninstalled.
       StrCmp $R2 "" uninstall_problem
         ; Check if we have uninstall string..
         IfFileExists $R3 0 uninstall_problem
@@ -306,16 +307,18 @@ Section -SecUninstallOldPidgin
               Delete "$TEMP\$R6"
               Goto uninstall_problem
 
-        uninstall_problem:
+        no_version_found:
+          ;We've already tried to fallback to an old gaim instance
+          StrCmp $R7 "Gaim" done
           ; If we couldn't uninstall Pidgin, try to uninstall Gaim
-          StrCmp $R4 ${PIDGIN_REG_KEY} cannot_uninstall
+          StrCpy $STARTUP_RUN_KEY "NONE"
           StrCpy $R4 ${OLD_GAIM_REG_KEY}
           StrCpy $R5 ${OLD_GAIM_UNINSTALL_KEY}
           StrCpy $R6 ${OLD_GAIM_UNINST_EXE}
           StrCpy $R7 "Gaim"
           Goto start_comparison
 
-          cannot_uninstall:
+        uninstall_problem:
           ; We can't uninstall.  Either the user must manually uninstall or we ignore and reinstall over it.
           MessageBox MB_OKCANCEL $(PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL) /SD IDOK IDOK done
           Quit
@@ -344,7 +347,7 @@ Section $(GTK_SECTION_TITLE) SecGtk
   StrCmp $R0 "0" have_gtk
   StrCmp $R0 "1" upgrade_gtk
   StrCmp $R0 "2" upgrade_gtk
-  StrCmp $R0 "3" no_gtk no_gtk
+  ;StrCmp $R0 "3" no_gtk no_gtk
 
   no_gtk:
     StrCmp $R1 "NONE" gtk_no_install_rights
@@ -1138,6 +1141,9 @@ Function .onInit
   IfErrors +2
   WriteRegStr HKCU "${PIDGIN_REG_KEY}" "Installer Language" "$R0"
 
+  !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO}
+  !insertmacro UnselectSection ${SecSpellCheck}
+
   ;Mark the dictionaries that are already installed as readonly
   Call SelectAndDisableInstalledDictionaries
 
@@ -1642,7 +1648,7 @@ Function InstallAspell
   StrCpy $R1 "$TEMP\aspell_installer.exe"
   StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=aspell_core"
   DetailPrint "Downloading Aspell... ($R2)"
-  NSISdl::download $R2 $R1
+  NSISdl::download /TIMEOUT=10000 $R2 $R1
   Pop $R0
   StrCmp $R0 "success" +2
     Goto done
@@ -1682,7 +1688,7 @@ Function InstallAspellDictionary
   StrCpy $R1 "$TEMP\aspell_dict-$R0.exe"
   StrCpy $R3 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=lang_$R0"
   DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)"
-  NSISdl::download $R3 $R1
+  NSISdl::download /TIMEOUT=10000 $R3 $R1
   Pop $R3
   StrCmp $R3 "success" +3
     StrCpy $R0 $R3
diff --git a/pidgin/win32/pidgin_dll_rc.rc.in b/pidgin/win32/pidgin_dll_rc.rc.in
index c3d0f5c9bf..47157453a2 100644
--- a/pidgin/win32/pidgin_dll_rc.rc.in
+++ b/pidgin/win32/pidgin_dll_rc.rc.in
@@ -40,3 +40,4 @@ PIDGIN_TRAY_XA_4BIT		ICON PIXMAPDIR "extended-away_4bit.ico"
 PIDGIN_TRAY_OFFLINE_4BIT	ICON PIXMAPDIR "offline_4bit.ico"
 PIDGIN_TRAY_CONNECTING_4BIT	ICON PIXMAPDIR "connecting_4bit.ico"
 PIDGIN_TRAY_PENDING_4BIT	ICON PIXMAPDIR "message_4bit.ico"
+PIDGIN_TRAY_INVISIBLE_4BIT	ICON PIXMAPDIR "invisible_4bit.ico"
diff --git a/pidgin/win32/resource.h b/pidgin/win32/resource.h
index 90025be745..40b7e5c73b 100644
--- a/pidgin/win32/resource.h
+++ b/pidgin/win32/resource.h
@@ -6,3 +6,4 @@
 #define PIDGIN_TRAY_OFFLINE_4BIT	109
 #define PIDGIN_TRAY_CONNECTING_4BIT	110
 #define PIDGIN_TRAY_PENDING_4BIT	111
+#define PIDGIN_TRAY_INVISIBLE_4BIT      112
diff --git a/po/af.po b/po/af.po
index d3566cddb7..c67ad98bb6 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1,427 +1,487 @@
 # Afrikaans translations for gaim
-# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Friedel Wolff <friedel BY translate.org.za>, 2006.
+# Copyright (C) 2006
+# This file is distributed under the same license as the pidgin package.
+# Friedel Wolff <friedel BY translate.org.za>, 2006-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-25 00:00-0500\n"
-""
-"PO-Revision-Date: 2007-01-25 11:16+0200\n"
+"POT-Creation-Date: 2007-04-09 08:32-0400\n"
+"PO-Revision-Date: 2007-05-01 23:30+0200\n"
 "Last-Translator: F Wolff <friedel BY translate.org.za>\n"
 "Language-Team: <translate-discuss-af@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.0beta\n"
-
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim Internetboodskapper"
+"X-Generator: Pootle 1.0beta2\n"
 
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Internetboodskapper"
+#: ../finch/finch.c:229
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Probeer `%s -h' vir meer inligting.\n"
 
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Stuur kitsboodskappe oor veelvoudige protokolle"
+#: ../finch/finch.c:231
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Gebruik: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    gebruik DIR vir konfigurasielêers\n"
+"  -d, --debug         skryf ontfoutboodskappe na stdout\n"
+"  -h, --help          vertoon hierdie hulp en sluit af\n"
+"  -n, --nologin       moenie outomaties anmeld nie\n"
+"  -v, --version       wys die huidige weergawe en sluit af\n"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:272
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1399
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1210
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
+#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
+#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1406
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/qq/group_join.c:324
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Fout"
 
-#: ../console/gntaccount.c:119
+#: ../finch/gntaccount.c:119
 msgid "Account was not added"
 msgstr "Rekening is nie bygevoeg nie"
 
-#: ../console/gntaccount.c:120
+#: ../finch/gntaccount.c:120
 msgid "Screenname of an account must be non-empty."
 msgstr "Skermnaam van rekening kan nie leeg wees nie."
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
 msgid "New mail notifications"
 msgstr "Kennisgewings vir nuwe pos"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
 msgid "Remember password"
 msgstr "Onthou wagwoord"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
+#: ../pidgin/gtkblist.c:3891
 msgid "Modify Account"
 msgstr "Wysig rekening"
 
-#: ../console/gntaccount.c:474
+#: ../finch/gntaccount.c:474
 msgid "New Account"
 msgstr "Nuwe rekening"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
+#: ../pidgin/gtkblist.c:5293
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Skermnaam:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
+#: ../pidgin/gtkblist.c:5677
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Cancel button
 #. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:313
-#: ../console/gntblist.c:380 ../console/gntblist.c:413
-#: ../console/gntblist.c:737 ../console/gntblist.c:906
-#: ../console/gntblist.c:997 ../console/gntblist.c:2021
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
-#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
-#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
-#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
-#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
-#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1761
-#: ../libgaim/protocols/jabber/buddy.c:1795
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:1365
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
-#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
-#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
-#: ../libgaim/protocols/oscar/oscar.c:6043
-#: ../libgaim/protocols/oscar/peer.c:1021
-#: ../libgaim/protocols/qq/buddy_info.c:484
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
-#: ../libgaim/protocols/qq/group_join.c:138
-#: ../libgaim/protocols/qq/group_join.c:359
-#: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
-#: ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:3410
-#: ../libgaim/protocols/sametime/sametime.c:3495
-#: ../libgaim/protocols/sametime/sametime.c:3665
-#: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5498
-#: ../libgaim/protocols/sametime/sametime.c:5622
-#: ../libgaim/protocols/silc/buddy.c:467
-#: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:961
-#: ../libgaim/protocols/yahoo/yahoo.c:3208
-#: ../libgaim/protocols/yahoo/yahoo.c:3217
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
+#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
+#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
+#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
+#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:969 ../libpurple/account.c:1218
+#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
+#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1768
+#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/xdata.c:338
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
+#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
+#: ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/sys_msg.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:159
+#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5477
+#: ../libpurple/protocols/sametime/sametime.c:5601
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
+#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
+#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
+#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
+#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
 msgid "Cancel"
 msgstr "Kanselleer"
 
+#. Save button
 #. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
-#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
+#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
+#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
+#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Stoor"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Is u seker u wil %s uitvee?"
+msgstr "Wil u definitief %s uitvee?"
 
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
+#: ../finch/gntaccount.c:614
 msgid "Delete Account"
 msgstr "Vee rekening uit"
 
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:335
+#. Delete button
+#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
+#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
+#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
+#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:335
 msgid "Delete"
 msgstr "Vee uit"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
+#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
 msgid "Accounts"
 msgstr "Rekeninge"
 
-#: ../console/gntaccount.c:650
+#: ../finch/gntaccount.c:650
 msgid "You can enable/disable accounts from the following list."
 msgstr "U kan rekeninge aktiveer/deaktiveer vanuit die volgende lys."
 
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:313 ../console/gntblist.c:380
-#: ../console/gntblist.c:413 ../console/gntnotify.c:309
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
-#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
-#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:5497
-#: ../libgaim/protocols/silc/chat.c:596
+#. Add button
+#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
+#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
+#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:159
+#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/sametime/sametime.c:5476
+#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
+#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Voeg by"
 
-#: ../console/gntaccount.c:677
+#. Modify button
+#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
 msgid "Modify"
 msgstr "Wysig"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
+#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s het %s sy/haar vriend/vriendin gemaak%s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
+#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
 msgid "Add buddy to your list?"
 msgstr "Voeg vriend by u lys?"
 
-#: ../console/gntblist.c:264
+#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s"
+
+#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
+#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+msgid "Authorize buddy?"
+msgstr "Laat vriend toe?"
+
+#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
+#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+msgid "Authorize"
+msgstr "Laat toe"
+
+#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
+#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+msgid "Deny"
+msgstr "Weier"
+
+#: ../finch/gntblist.c:266
 msgid "You must provide a screename for the buddy."
 msgstr "U moet 'n skermnaam verskaf vir die vriend."
 
-#: ../console/gntblist.c:266
+#: ../finch/gntblist.c:268
 msgid "You must provide a group."
 msgstr "U moet 'n groep voorsien."
 
-#: ../console/gntblist.c:268
+#: ../finch/gntblist.c:270
 msgid "You must select an account."
 msgstr "U moet 'n rekening kies."
 
-#: ../console/gntblist.c:272
+#: ../finch/gntblist.c:274
 msgid "Error adding buddy"
 msgstr "Fout met byvoeging van vriend"
 
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
+#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
+#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
 msgid "Screen Name"
 msgstr "Skermnaam"
 
-#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
-#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1207
+#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
+#: ../libpurple/protocols/msn/msn.c:1340
+#: ../libpurple/protocols/silc/chat.c:587
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
+#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
 msgid "Group"
 msgstr "Groep"
 
-#: ../console/gntblist.c:306 ../console/gntblist.c:363
-#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
-#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
-#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
+#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
+#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Rekening"
 
-#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
-#: ../libgaim/protocols/silc/buddy.c:736
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/buddy.c:1075
-#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3122
+#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
+#: ../libpurple/protocols/silc/buddy.c:736
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1174
+#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Voeg vriend by"
 
-#: ../console/gntblist.c:312
+#: ../finch/gntblist.c:315
 msgid "Please enter buddy information."
 msgstr "Gee asb. vriendinligting."
 
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
+#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
 msgid "Chats"
 msgstr "Geselsies"
 
 #. Extract their Name and put it in
-#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:792
-#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
-#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
+#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Naam"
 
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
+#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
 msgid "Add Chat"
 msgstr "Voeg geselsie by"
 
-#: ../console/gntblist.c:379
+#: ../finch/gntblist.c:382
 msgid "You can edit more information from the context menu later."
 msgstr "U kan later meer inligting wysig vanaf die kieslys."
 
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
 msgid "Error adding group"
 msgstr "Fout met byvoeg van groep"
 
-#: ../console/gntblist.c:391
+#: ../finch/gntblist.c:394
 msgid "You must give a name for the group to add."
 msgstr "U moet 'n naam gee vir die nuwe groep."
 
-#: ../console/gntblist.c:404
+#: ../finch/gntblist.c:407
 msgid "A group with the name already exists."
 msgstr "'n Groep met dié naam bestaan reeds."
 
-#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
-#: ../libgaim/protocols/sametime/sametime.c:5408
-#: ../libgaim/protocols/sametime/sametime.c:5495
+#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
+#: ../libpurple/protocols/sametime/sametime.c:5387
+#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
 msgid "Add Group"
 msgstr "Voeg groep by"
 
-#: ../console/gntblist.c:411
+#: ../finch/gntblist.c:414
 msgid "Enter the name of the group"
 msgstr "Gee die naam van die groep"
 
-#: ../console/gntblist.c:736
+#: ../finch/gntblist.c:739
 msgid "Edit Chat"
 msgstr "Wysig geselsie"
 
-#: ../console/gntblist.c:736
+#: ../finch/gntblist.c:739
 msgid "Please Update the necessary fields."
 msgstr "Dateer asb. die nodige velde."
 
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
+#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
 msgid "Edit"
 msgstr "Wysig"
 
-#: ../console/gntblist.c:751
+#: ../finch/gntblist.c:754
 msgid "Auto-join"
 msgstr "Outoaansluit"
 
-#: ../console/gntblist.c:760
+#: ../finch/gntblist.c:763
 msgid "Edit Settings"
 msgstr "Wysig instellings"
 
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Kry inligting"
 
-#: ../console/gntblist.c:811
+#: ../finch/gntblist.c:831
 msgid "Add Buddy Pounce"
-msgstr ""
+msgstr "Voeg vriendwag by"
 
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
+#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Stuur lêer"
 
-#: ../console/gntblist.c:822
+#: ../finch/gntblist.c:842
 msgid "View Log"
-msgstr "Bekyk joernaal"
+msgstr "Bekyk staaflêer"
 
-#: ../console/gntblist.c:902
+#: ../finch/gntblist.c:922
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Gee asb. die nuwe naam vir %s"
 
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
+#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
 msgid "Rename"
 msgstr "Hernoem"
 
-#: ../console/gntblist.c:904
+#: ../finch/gntblist.c:924
 msgid "Enter empty string to reset the name."
 msgstr ""
 
-#: ../console/gntblist.c:977
+#: ../finch/gntblist.c:997
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
+"Verwydering van hierdie kontak sal ook al die vriende in hierdie kontak "
+"verwyder"
 
-#: ../console/gntblist.c:985
+#: ../finch/gntblist.c:1005
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
+"Verwydering van hierdie groep sal ook al die vriende in hierdie groep "
+"verwyder"
 
-#: ../console/gntblist.c:990
+#: ../finch/gntblist.c:1010
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Wil u definitief %s verwyder?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
+#: ../finch/gntblist.c:1013
 msgid "Confirm Remove"
 msgstr "Bevestig verwydering"
 
-#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
-#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
+#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
 msgid "Remove"
 msgstr "Verwyder"
 
 #. Buddy List
-#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Vriendelys"
 
-#: ../console/gntblist.c:1123
+#: ../finch/gntblist.c:1143
 msgid "Place tagged"
 msgstr ""
 
-#: ../console/gntblist.c:1128
+#: ../finch/gntblist.c:1148
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:814
-#: ../libgaim/protocols/jabber/buddy.c:1562
-#: ../libgaim/protocols/jabber/buddy.c:1744
-#: ../libgaim/protocols/jabber/jabber.c:802
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
+#: ../libpurple/protocols/gg/gg.c:2182
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:1569
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/jabber.c:817
+#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
 msgid "Nickname"
-msgstr ""
+msgstr "Bynaam"
 
 #. Idle stuff
-#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
-#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:645
-#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2860
-#: ../libgaim/protocols/oscar/oscar.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:2876
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:646
+#: ../libpurple/protocols/jabber/buddy.c:686
+#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2826
+#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
+#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
 msgid "Idle"
 msgstr "Ledig"
 
-#: ../console/gntblist.c:1270
+#: ../finch/gntblist.c:1290
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -430,12 +490,12 @@ msgstr ""
 "Aanlyn: %d\n"
 "Totaal: %d"
 
-#: ../console/gntblist.c:1279
+#: ../finch/gntblist.c:1299
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Rekening: %s (%s)"
 
-#: ../console/gntblist.c:1291
+#: ../finch/gntblist.c:1311
 #, c-format
 msgid ""
 "\n"
@@ -444,96 +504,103 @@ msgstr ""
 "\n"
 "Laas gesien: %s gelede"
 
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
+#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
+#: ../pidgin/gtkstatusbox.c:1102
 msgid "New..."
 msgstr "Nuwe..."
 
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
+#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
+#: ../pidgin/gtkstatusbox.c:1103
 msgid "Saved..."
 msgstr "Gestoor..."
 
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
+#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
 msgid "Plugins"
 msgstr "Inproppe"
 
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
+#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
 msgid "_Name"
 msgstr "_Naam"
 
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
+#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
 msgid "_Account"
 msgstr "_Rekening"
 
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
+#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Nuwe kitsboodskap"
 
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
+#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
-"Gee asb. die skermnaam of alias van die persoon om 'n kitsboodskap na te "
+"Gee asb. die skermnaam of alias van die persoon om 'n kitsboodskap heen te "
 "stuur."
 
-#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
-#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
-#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
-#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
-#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
-#: ../libgaim/protocols/yahoo/yahoo.c:3207
-#: ../libgaim/protocols/yahoo/yahoo.c:3216
+#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:968 ../libpurple/account.c:1217
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
+#: ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
+#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:725
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Regso"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
+#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
 msgid "Options"
 msgstr "Keuses"
 
-#: ../console/gntblist.c:2045
+#: ../finch/gntblist.c:2073
 msgid "Send IM..."
 msgstr "Stuur kitsboodskap..."
 
-#: ../console/gntblist.c:2049
+#: ../finch/gntblist.c:2077
 msgid "Toggle offline buddies"
 msgstr ""
 
-#: ../console/gntblist.c:2053
+#: ../finch/gntblist.c:2083
 msgid "Sort by status"
 msgstr "Sorteer volgens status"
 
-#: ../console/gntblist.c:2057
+#: ../finch/gntblist.c:2087
 msgid "Sort alphabetically"
 msgstr "Sorteer alfabeties"
 
-#: ../console/gntblist.c:2061
+#: ../finch/gntblist.c:2091
 msgid "Sort by log size"
-msgstr "Sorteer volgens joernaalgrootte"
+msgstr "Sorteer volgens staaflêergrootte"
 
-#: ../console/gntconn.c:36
+#: ../finch/gntconn.c:38
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../console/gntconn.c:39
+#: ../finch/gntconn.c:41
 #, c-format
 msgid "%s disconnected."
 msgstr "%s afgesny."
 
-#: ../console/gntconn.c:40
+#: ../finch/gntconn.c:42
 #, c-format
 msgid ""
 "%s was disconnected due to the following error:\n"
@@ -542,51 +609,56 @@ msgstr ""
 "%s is afgesny weens die volgende fout:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
+#: ../finch/gntconn.c:45 ../libpurple/account.c:996
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
 msgid "Connection Error"
 msgstr "Verbindingfout"
 
-#: ../console/gntconv.c:102
+#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
+#: ../pidgin/gtkblist.c:3892
+msgid "Connect"
+msgstr "Verbind"
+
+#: ../finch/gntconv.c:103
 msgid "No such command."
-msgstr ""
+msgstr "Daar is nie so 'n opdrag nie."
 
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Sintaksfout:  U het die verkeerde aantal argumente vir daardie opdrag getik."
 
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
 msgid "Your command failed for an unknown reason."
 msgstr "Die opdrag het misluk weens 'n onbekende rede."
 
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
 msgid "That command only works in chats, not IMs."
 msgstr "Daardie opdrag werk net in geselsies, nie gesprekke nie."
 
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
 msgid "That command only works in IMs, not chats."
 msgstr "Daardie opdrag werk net in gesprekke, nie geselsies nie."
 
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
 msgid "That command doesn't work on this protocol."
 msgstr "Daardie opdrag werk nie met hierdie protokol nie."
 
-#: ../console/gntconv.c:130
+#: ../finch/gntconv.c:131
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Opdragte word nog nie ondersteun nie. Boodskap is NIE gestuur nie."
 
-#: ../console/gntconv.c:232
+#: ../finch/gntconv.c:234
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:255
+#: ../finch/gntconv.c:257
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
 #, c-format
 msgid ""
 "\n"
@@ -595,24 +667,24 @@ msgstr ""
 "\n"
 "%s tik..."
 
-#: ../console/gntconv.c:399
+#: ../finch/gntconv.c:403
 msgid "<AUTO-REPLY> "
 msgstr ""
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:501
+#: ../finch/gntconv.c:505
 msgid "List of users:\n"
 msgstr "Lys van gebruikers:\n"
 
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
+#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
+#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
 msgid "No such command (in this context)."
-msgstr ""
+msgstr "Daar is nie so 'n opdrag (in hierdie konteks) nie."
 
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
+#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -620,56 +692,58 @@ msgstr ""
 "Gebruik \"/help &lt;opdrag&gt;\" vir hulp met 'n spesifieke opdrag.\n"
 "Die volgende opdragte is in hierdie konteks beskikbaar:\n"
 
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
+#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "say &lt;boodskap&gt;:  Stuur 'n boodskap gewoonweg net soos sonder 'n opdrag."
 
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
+#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
+msgstr "me &lt;action&gt;:  Stuur 'n IRC-tipe aksie na 'n vriend of geselskap."
 
-#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
+#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
+"debug &lt;option&gt;:  Stuur 'n verskeidenheid ontfout-inligting na die "
+"huidige gesprek."
 
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
+#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
 msgid "clear: Clears the conversation scrollback."
-msgstr ""
+msgstr "clear: Maak die gesprekvenster skoon."
 
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
+#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;opdrag&gt;:  Hulp oor 'n spesifieke opdrag."
 
-#: ../console/gntconv.c:719
+#: ../finch/gntconv.c:723
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Wys die inpropvenster."
 
-#: ../console/gntconv.c:722
+#: ../finch/gntconv.c:726
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Wys die vriendelys."
 
-#: ../console/gntconv.c:725
+#: ../finch/gntconv.c:729
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Wys die rekeningvenster."
 
-#: ../console/gntconv.c:728
+#: ../finch/gntconv.c:732
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Wys die ontfoutvenster."
 
-#: ../console/gntconv.c:731
+#: ../finch/gntconv.c:735
 msgid "prefs: Show the preference window."
 msgstr "prefs: Wys die voorkeurevenster."
 
-#: ../console/gntconv.c:734
+#: ../finch/gntconv.c:738
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses: Wys die venster met gestoorde statusse."
 
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
 msgid "Debug Window"
 msgstr "Ontfoutvenster"
 
@@ -677,113 +751,180 @@ msgstr "Ontfoutvenster"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
 msgid "Pause"
 msgstr "Pouseer"
 
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
 msgid "Timestamps"
 msgstr "Tydstempels"
 
-#: ../console/gntgaim.c:227
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
-msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Probeer `%s -h' vir meer inligting.\n"
+msgid "File Transfers - %d%% of %d files"
+msgstr "Lêeroordragte - %d%% van %d lêers"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "Lêeroordragte"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "Vordering"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Lêernaam"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Grootte"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "Spoed"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Oorblywend"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
+#: ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:637
+#: ../libpurple/protocols/jabber/buddy.c:641
+#: ../libpurple/protocols/jabber/buddy.c:676
+#: ../libpurple/protocols/jabber/jabber.c:1201
+#: ../libpurple/protocols/msn/msn.c:512
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/oscar/oscar.c:802
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:2664
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
+#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+msgid "Status"
+msgstr "Status"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Sluit hierdie venster wanneer alle oordragte klaar is"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Verwyder afgehandelde oordragte van lys"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Stop"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
+#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
+#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Sluit"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "Wag vir oordrag om te begin"
 
-#: ../console/gntgaim.c:229
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "Gekanselleer"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "Misluk"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
 #, c-format
-msgid ""
-"%s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -v, --version       display the current version and exit\n"
+msgid "%.2f KB/s"
+msgstr "%.2f KG/s"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "Afgehandel"
+
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
 msgstr ""
-"%s\n"
-"Gebruik: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    gebruik DIR vir konfigurasielêers\n"
-"  -d, --debug         skryf ontfoutboodskappe na stdout\n"
-"  -h, --help          vertoon hierdie hulp en sluit af\n"
-"  -n, --nologin       moenie outomaties anmeld nie\n"
-"  -v, --version       wys die huidige weergawe en sluit af\n"
 
-#: ../console/gntnotify.c:146
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "E-posse"
 
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
 msgid "You have mail!"
-msgstr "U het pos!"
+msgstr "Daar is pos!"
 
-#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "Van"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "Sluit"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) het %d nuwe boodskap."
 msgstr[1] "%s (%s) het %d nuwe boodskappe."
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Nuwe pos"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "Inligting vir %s"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "Vriendinligting"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "Gaan voort"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
 msgid "Info"
 msgstr "Inligting"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Kitsklets"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "Sluit aan"
 
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -800,4892 +941,785 @@ msgstr ""
 "Webwerf: %s\n"
 "Lêernaam: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Inprop moet gelaai word voordat dit opgestel kan word."
 
-#: ../console/gntplugin.c:193
+#: ../finch/gntplugin.c:193
 msgid "..."
 msgstr "..."
 
-#: ../console/gntplugin.c:194
+#: ../finch/gntplugin.c:194
 msgid "Still need to do something about this."
 msgstr "Moet nog iets hieromtrent doen."
 
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "Geen opstelkeuses vir hierdie inprop nie."
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:221
 msgid "You can (un)load plugins from the following list."
 msgstr "U kan inproppe laai / ontlaai vanaf die volgende lys."
 
-#: ../console/gntplugin.c:264
+#: ../finch/gntplugin.c:264
 msgid "Configure Plugin"
 msgstr "Stel inprop op"
 
-#: ../console/gntprefs.c:122
-msgid "Show Idle Time"
-msgstr "Wys ledige tyd"
-
-#: ../console/gntprefs.c:123
-msgid "Show Offline Buddies"
-msgstr "Wys aflynvriende"
-
-#: ../console/gntprefs.c:129
-msgid "Show Timestamps"
-msgstr "Wys tydstempels"
-
-#: ../console/gntprefs.c:130
-msgid "Notify buddies when you are typing"
-msgstr ""
-
-#: ../console/gntprefs.c:136
-msgid "Log format"
-msgstr "Joernaalformaat"
-
-#: ../console/gntprefs.c:137
-msgid "Log IMs"
-msgstr ""
-
-#: ../console/gntprefs.c:138
-msgid "Log chats"
-msgstr ""
-
-#: ../console/gntprefs.c:139
-msgid "Log status change events"
-msgstr ""
-
-#. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
-msgid "Conversations"
-msgstr "Gesprekke"
-
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
-msgid "Logging"
-msgstr ""
-
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Voorkeure"
-
-#: ../console/gntrequest.c:495
-msgid "Not implemented yet."
-msgstr "Nog nie geïmplementeer nie."
-
-#: ../console/gntstatus.c:135
-#, c-format
-msgid "Are you sure you want to delete \"%s\""
-msgstr "Is u seker u wil \"%s\" uitvee?"
-
-#: ../console/gntstatus.c:138
-msgid "Delete Status"
-msgstr "Verwyder status"
-
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
-msgid "Saved Statuses"
-msgstr "Gestoorde statusse"
-
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:931
-#: ../libgaim/protocols/novell/novell.c:1484
-msgid "Title"
-msgstr "Titel"
-
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
-msgid "Type"
-msgstr "Tipe"
-
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1227
-#: ../libgaim/protocols/jabber/jabber.c:1237
-#: ../libgaim/protocols/jabber/jabber.c:1247
-#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/jabber/jabber.c:1267
-#: ../libgaim/protocols/jabber/jabber.c:1279
-#: ../libgaim/protocols/novell/novell.c:2873
-#: ../libgaim/protocols/novell/novell.c:2976
-#: ../libgaim/protocols/novell/novell.c:2982
-#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/oscar/oscar.c:5501
-#: ../libgaim/protocols/oscar/oscar.c:5729
-#: ../libgaim/protocols/oscar/oscar.c:5741
-#: ../libgaim/protocols/oscar/oscar.c:5754
-#: ../libgaim/protocols/oscar/oscar.c:5761
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
-msgid "Message"
-msgstr "Boodskap"
-
-#. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
-msgid "Use"
-msgstr "Gebruik"
-
-#: ../console/gntstatus.c:291
-msgid "Invalid title"
-msgstr "Ongeldige titel"
-
-#: ../console/gntstatus.c:292
-msgid "Please enter a non-empty title for the status."
-msgstr "Gee asb. 'n nieleë title vir die status."
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+msgid "Please enter a buddy to pounce."
+msgstr "Gee asb. 'n vriend om dop te hou."
 
-#: ../console/gntstatus.c:299
-msgid "Duplicate title"
-msgstr "Duplikaat titel"
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "New Buddy Pounce"
+msgstr "Nuwe vriendwag"
 
-#: ../console/gntstatus.c:300
-msgid "Please enter a different title for the status."
-msgstr "Gee asb. 'n ander titel vir die status."
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "Edit Buddy Pounce"
+msgstr "Wysig vriendwag"
 
-#: ../console/gntstatus.c:440
-msgid "Substatus"
-msgstr "Substatus"
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "Hou wie dop"
 
+#. Account:
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
+#: ../pidgin/gtkblist.c:5657
 msgid "Account:"
 msgstr "Rekening:"
 
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
-msgid "Status:"
-msgstr "Status:"
-
-#: ../console/gntstatus.c:466
-msgid "Message:"
-msgstr "Boodskap:"
-
-#: ../console/gntstatus.c:515
-msgid "Edit Status"
-msgstr "Wysig status"
-
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:674
-#: ../libgaim/protocols/jabber/jabber.c:1195
-#: ../libgaim/protocols/msn/msn.c:547
-#: ../libgaim/protocols/novell/novell.c:2870
-#: ../libgaim/protocols/oscar/oscar.c:800
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:2655
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Status"
-
-#: ../console/gntstatus.c:557
-msgid "Use different status for following accounts"
-msgstr "Gebruik 'n ander status vir die volgende rekenings"
-
-#. Save & Use
-#: ../console/gntstatus.c:591
-msgid "Save & Use"
-msgstr "Stoor en gebruik"
-
-#: ../console/gntui.c:75
-msgid "Statuses"
-msgstr "Statusse"
-
-#: ../console/plugins/gntgf.c:209
-#, c-format
-msgid "%s just signed on"
-msgstr "%s het pas aangemeld"
-
-#: ../console/plugins/gntgf.c:216
-#, c-format
-msgid "%s just signed off"
-msgstr "%s het pas afgemeld"
-
-#: ../console/plugins/gntgf.c:224
-#, c-format
-msgid "%s sent you a message"
-msgstr "%s het u 'n boodskap gestuur"
-
-#: ../console/plugins/gntgf.c:243
-#, c-format
-msgid "%s said your nick in %s"
-msgstr "%s het u bynaam gesê in %s"
-
-#: ../console/plugins/gntgf.c:245
-#, c-format
-msgid "%s sent a message in %s"
-msgstr "%s het 'n boodskap gestuur in %s"
-
-#: ../console/plugins/gntgf.c:283
-msgid "Buddy signs on/off"
-msgstr "Vriend meld aan/af"
-
-#: ../console/plugins/gntgf.c:284
-msgid "You receive an IM"
-msgstr "U ontvang 'n kitsboodskap"
-
-#: ../console/plugins/gntgf.c:285
-msgid "Someone speaks in a chat"
-msgstr "Iemand praat in 'n geselskap"
-
-#: ../console/plugins/gntgf.c:286
-msgid "Someone says your name in a chat"
-msgstr "Iemand sê u naam in 'n geselskap"
-
-#: ../console/plugins/gntgf.c:314
-msgid "Notify with a toaster when"
-msgstr ""
-
-#: ../console/plugins/gntgf.c:329
-msgid "Beep too!"
-msgstr ""
-
-#: ../console/plugins/gntgf.c:335
-msgid "Set URGENT for the terminal window."
-msgstr "Stel DRINGEND vir die terminaalvenster."
-
-#: ../console/plugins/gntgf.c:355
-msgid "GntGf"
-msgstr "GntGf"
-
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr ""
-
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
-#, c-format
-msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Gesprek met %s op %s:</b><br>"
-
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: ../console/plugins/gnthistory.c:179
-msgid "GntHistory"
-msgstr "GntHistory"
-
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
-msgid "Shows recently logged conversations in new conversations."
-msgstr ""
-
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"Wanneer 'n nuwe gesprek begin word, sal hierdie inprop die laaste gesprek in "
-"die huidige een invoeg."
-
-#: ../console/plugins/lastlog.c:69
-msgid "Lastlog"
-msgstr ""
-
-#: ../console/plugins/lastlog.c:99
-msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
-
-#: ../console/plugins/lastlog.c:121
-msgid "GntLastlog"
-msgstr "GntLastlog"
-
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr ""
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Oriëntasie"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr ""
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "_Alias"
-
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "_Sluit aan"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "Sluit _oortjies"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "_Kitsklets"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "_Kry info"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "_Nooi uit"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "_Wysig"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "_Open pos"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Pouseer"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "Aanmeldkeuses"
-
-#: ../gtk/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "Plaaslike alias:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:554
-msgid "User Options"
-msgstr "Gebruikerkeuses"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr ""
-
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:684
-#, c-format
-msgid "%s Options"
-msgstr "%s-keuses"
-
-#: ../gtk/gtkaccount.c:881
-msgid "Use GNOME Proxy Settings"
-msgstr "Gebruik GNOME se instaaninstellings"
-
-#: ../gtk/gtkaccount.c:882
-msgid "Use Global Proxy Settings"
-msgstr "Gebruik globale instaaninstellings"
-
-#: ../gtk/gtkaccount.c:888
-msgid "No Proxy"
-msgstr "Geen instaanbediener"
-
-#: ../gtk/gtkaccount.c:894
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:900
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:906
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "Gebruik omgewinginstellings"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:951
-msgid "If you look real closely"
-msgstr "As mens stip kyk"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:954
-msgid "you can see the butterflies mating"
-msgstr "kan mens skoenlappers sien paar"
-
-#: ../gtk/gtkaccount.c:975
-msgid "Proxy Options"
-msgstr "Instaankeuses"
-
-#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "Instaan_tipes:"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_Rekenaar:"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "_Poort:"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "_Gebruikernaam:"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "_Wagwoord:"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "Voeg rekening by"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "_Eenvoudig"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "_Gevorderd"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
-msgid "Register"
-msgstr "Registreer"
-
-#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
-msgid "Enabled"
-msgstr "Aktiveer"
-
-#: ../gtk/gtkaccount.c:1961
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../gtk/gtkaccount.c:2133
-msgid ""
-"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../gtk/gtkaccount.c:2483
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s"
-
-#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
-msgid "Authorize buddy?"
-msgstr ""
-
-#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
-msgid "Authorize"
-msgstr ""
-
-#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
-msgid "Deny"
-msgstr ""
-
-#: ../gtk/gtkblist.c:709
-msgid "Join a Chat"
-msgstr "Sluit by gesprek aan"
-
-#: ../gtk/gtkblist.c:730
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Gee asb. die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
-
-#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
-msgid "_Account:"
-msgstr "_Rekening:"
-
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Blokkeer"
-
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr ""
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "_Inligting"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "_Stuur lêer"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr ""
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "Bekyk _joernaal"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "_Alias..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "_Verwyder"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "Voeg 'n _vriend by"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "Voeg 'n _gesprek by"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "_Verwyder groep"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "_Hernoem"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "Outoaansluit"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr ""
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr ""
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "Demp klanke"
-
-#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg."
-
-#. Buddies menu
-#: ../gtk/gtkblist.c:2567
-msgid "/_Buddies"
-msgstr "/_Vriende"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "Nuwe _kitsboodskap..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "Sluit by _geselsie aan..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "Kry gebruiker_inligting..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "Bekyk gebruiker_joernaal..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "Wys a_flynvriende"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "Wys _leë groepe"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "Wys vrienddetail"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "Wys ledige _tye"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "_Sorteer vriende"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "Voeg _vriend by..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "Voeg gese_lsie by..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "Voeg _groep by..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "_Sluit af"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/_Rekeninge"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
-msgid "/Accounts/Add\\/Edit"
-msgstr "Voeg by \\/ redigeer"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/_Gereedskap"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/Gereedskap/_Inproppe"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/Gereedskap/_Voorkeure"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/Gereedskap/_Privaatheid"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/Gereedskap/_Lêeroordragte"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/Gereedskap/_Kamerlys"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "Stelsel_joernaal"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr ""
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/_Hulp"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/Hulp/Hulp aanlyn"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "_Ontfoutvenster"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/Hulp/_Aangaande"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Rekening:</b> %s"
-
-#: ../gtk/gtkblist.c:2722
-msgid "Buddy Alias"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2743
-msgid "Logged In"
-msgstr "Aangemeld"
-
-#: ../gtk/gtkblist.c:2789
-msgid "Last Seen"
-msgstr "Laas gesien"
-
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1401
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
-#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
-#: ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Aflyn"
-
-#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "Beskrywing"
-
-#: ../gtk/gtkblist.c:2809
-msgid "Spooky"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2811
-msgid "Awesome"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2813
-msgid "Rockin'"
-msgstr ""
-
-#: ../gtk/gtkblist.c:3302
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Ledig %dh %02dm"
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "Ledig %dm"
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "Nuwe kitsboodskap..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "Sluit by geselskap aan..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "Kry gebruikerinligting..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr ""
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "Voeg geselsie by..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "Voeg groep by..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr ""
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "Privaatheid"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "Kamerlys"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d ongelese boodskap van %s\n"
-msgstr[1] "%d ongelese boodskappe van %s\n"
-
-#: ../gtk/gtkblist.c:3654
-msgid "Manually"
-msgstr "Handmatig"
-
-#: ../gtk/gtkblist.c:3656
-msgid "Alphabetically"
-msgstr "Alfabeties"
-
-#: ../gtk/gtkblist.c:3657
-msgid "By status"
-msgstr "Volgens status"
-
-#: ../gtk/gtkblist.c:3658
-msgid "By log size"
-msgstr "Volgens joernaalgrootte"
-
-#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "%s afgesny"
-
-#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
-msgid "Connect"
-msgstr "Verbind"
-
-#: ../gtk/gtkblist.c:3869
-msgid "Re-enable Account"
-msgstr "Heraktiveer rekening"
-
-#: ../gtk/gtkblist.c:3890
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s afgesny: %s</span>"
-
-#: ../gtk/gtkblist.c:4027
-msgid "<b>Username:</b>"
-msgstr "<b>Gebruikernaam:</b>"
-
-#: ../gtk/gtkblist.c:4034
-msgid "<b>Password:</b>"
-msgstr "<b>Wagwoord:</b>"
-
-#: ../gtk/gtkblist.c:4045
-msgid "_Login"
-msgstr "_Meld aan"
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/Rekeninge"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr ""
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "Wys leë groepe"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr ""
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "Wys ledige tye"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "Vriende"
-
-#: ../gtk/gtkblist.c:5207
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Gee asb. die skermnaam van die persoon wat by die vriendelys gevoeg word. U "
-""
-"kan 'n alias of bynaam vir die vriend gebruik as u wil.  Die alias sal in "
-"die "
-"plek van die skermnaam gebruik word wanneer moontlik.\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Groep:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr "Hierdie protokol ondersteun nie gesprekkamers nie."
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"U is nie tans aangemeld met enige protokol met geselskapfasiliteit nie."
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "Gee asb. die naam van die groep om by te voeg."
-
-#: ../gtk/gtkblist.c:6299
-msgid "<GaimMain>/Accounts/"
-msgstr "<GaimMain>/Rekeninge/"
-
-#: ../gtk/gtkblist.c:6324
-msgid "_Edit Account"
-msgstr "_Wysig rekening"
-
-#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6371
-msgid "_Disable"
-msgstr "_Deaktiveer"
-
-#: ../gtk/gtkblist.c:6383
-msgid "Enable Account"
-msgstr "Aktiveer rekening"
-
-#: ../gtk/gtkblist.c:6389
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6438
-msgid "/Tools"
-msgstr "Gereedskap"
-
-#: ../gtk/gtkblist.c:6508
-msgid "/Buddies/Sort Buddies"
-msgstr "Sorteer vriende"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-""
-"%s\n"
-"\n"
-"Gaim sal eers weer probeer verbind nadat u die fout reggemaak het en die "
-"rekening geheraktiveer het."
-
-#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
-msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: ../gtk/gtkconv.c:786
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-
-#: ../gtk/gtkconv.c:839
-msgid "Invite Buddy Into Chat Room"
-msgstr ""
-
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:869
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Gee asb. die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
-"uitnodigingsboodskap."
-
-#: ../gtk/gtkconv.c:890
-msgid "_Buddy:"
-msgstr "_Vriend:"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "_Boodskap:"
-
-#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "Kan nie lêer oopmaak nie."
-
-#: ../gtk/gtkconv.c:973
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Gesprek met %s</h1>\n"
-
-#: ../gtk/gtkconv.c:997
-msgid "Save Conversation"
-msgstr "Stoor gesprek"
-
-#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "Soek"
-
-#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "_Soek vir:"
-
-#: ../gtk/gtkconv.c:1341
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: ../gtk/gtkconv.c:1349
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../gtk/gtkconv.c:1617
-msgid "Un-Ignore"
-msgstr "On-ignoreer"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Ignore"
-msgstr "Ignoreer"
-
-#: ../gtk/gtkconv.c:1640
-msgid "Get Away Message"
-msgstr "Kry Weg-boodskap"
-
-#: ../gtk/gtkconv.c:1663
-msgid "Last said"
-msgstr "Laaste gesê"
-
-#: ../gtk/gtkconv.c:2428
-msgid "Unable to save icon file to disk."
-msgstr "Kan nie ikoonlêer op skyf stoor nie."
-
-#: ../gtk/gtkconv.c:2498
-msgid "Save Icon"
-msgstr "Stoor ikoon"
-
-#: ../gtk/gtkconv.c:2547
-msgid "Animate"
-msgstr ""
-
-#: ../gtk/gtkconv.c:2552
-msgid "Hide Icon"
-msgstr "Versteek ikoon"
-
-#: ../gtk/gtkconv.c:2555
-msgid "Save Icon As..."
-msgstr "Stoor ikoon as..."
-
-#: ../gtk/gtkconv.c:2559
-msgid "Set Custom Icon..."
-msgstr "Stel eie ikoon..."
-
-#: ../gtk/gtkconv.c:2566
-msgid "Remove Custom Icon"
-msgstr "Verwyder eie ikoon"
-
-#. Conversation menu
-#: ../gtk/gtkconv.c:2707
-msgid "/_Conversation"
-msgstr "/_Gesprek"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Gesprek/Nuwe _kitsboodskap..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/Gesprek/_Vind..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "Bekyk _joernaal"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/Gesprek/_Stoor as..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr ""
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/Gesprek/S_tuur lêer..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr ""
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/Gesprek/_Kry inligting"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/Gesprek/_Nooi uit..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/Gesprek/_Meer"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/Gesprek/_Alias..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "_Blokkeer..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/Gesprek/_Voeg by..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/Gesprek/Ve_rwyder..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Gesprek/Voeg s_kakel in..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Gesprek/Voeg pr_entjie in..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/Gesprek/Slui_t"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/_Keuses"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr ""
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/Keuses/Aktiveer _klanke"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "Wys vriend_ikoon"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Keuses/Wys _formatteringgereedskap"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Keuses/Wys _tydstempels"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/Gesprek/Meer"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/Gesprek"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/Gesprek/Bekyk joernaal"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/Gesprek/Stuur lêer..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr ""
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/Gesprek/Kry inligting"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/Gesprek/Nooi uit..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/Gesprek/Alias..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/Gesprek/Blokkeer..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/Gesprek/Voeg by..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/Gesprek/Verwyder..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/Gesprek/Voeg skakel in..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/Gesprek/Voeg prentjie in..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr ""
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/Keuses/Aktiveer klanke"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Keuses/Wys formatteringgereedskap"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/Keuses/Wys _tydstempels"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr ""
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "Gebruiker tik..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "Gebruiker het iets getik en gestop"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "_Stuur na"
-
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "_Stuur"
-
-#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
-msgid "Topic:"
-msgstr "Onderwerp:"
-
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4115
-msgid "0 people in room"
-msgstr "0 mense in die kamer"
-
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d persoon in kamer"
-msgstr[1] "%d mense in kamer"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Tik"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "Het opgehou tik"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr ""
-
-#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "Ongelese boodskappe"
-
-#: ../gtk/gtkconv.c:5876
-msgid "New Event"
-msgstr ""
-
-#: ../gtk/gtkconv.c:6997
-msgid "Confirm close"
-msgstr "Bevestig sluiting"
-
-#: ../gtk/gtkconv.c:7029
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "U het ongelese boodskappe. Wil u definitief die venster toemaak?"
-
-#: ../gtk/gtkconv.c:7564
-msgid "Close other tabs"
-msgstr "Sluit ander oortjies"
-
-#: ../gtk/gtkconv.c:7570
-msgid "Close all tabs"
-msgstr "Sluit alle oortjies"
-
-#: ../gtk/gtkconv.c:7578
-msgid "Detach this tab"
-msgstr "Maak hierdie oortjie los"
-
-#: ../gtk/gtkconv.c:7584
-msgid "Close this tab"
-msgstr "Sluit hierdie oortjie"
-
-#: ../gtk/gtkconv.c:7855
-msgid "Close conversation"
-msgstr "Sluit gesprek"
-
-#: ../gtk/gtkconv.c:8319
-msgid "Last created window"
-msgstr ""
-
-#: ../gtk/gtkconv.c:8321
-msgid "Separate IM and Chat windows"
-msgstr "Aparte gesprek- en geselsvensters"
-
-#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
-msgid "New window"
-msgstr "Nuwe venster"
-
-#: ../gtk/gtkconv.c:8325
-msgid "By group"
-msgstr "Volgens groep"
-
-#: ../gtk/gtkconv.c:8327
-msgid "By account"
-msgstr "Volgens rekening"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "Stoor ontfoutjoernaal"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr ""
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr ""
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "Slegs _ikoon"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "Slegs _teks"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "_Beide ikoon en teks"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr ""
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "Klik regs vir meer keuses."
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "Vlak "
-
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr ""
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "Almal"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "Allerlei"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "Waarskuwing"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "Fout "
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "Fatale fout"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "hoofprogrammeerder"
-
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
-msgid "developer"
-msgstr "programmeerder"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "programmeerder en webmeester"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "ondersteuning"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "win32-weergawe"
-
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "onderhouer"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "libfaim-onderhouer"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
-msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-programmeerder"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "oorspronklike outeur"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Arabies"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "Bulgaars"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Bengaals"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Bosnies"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "Katalaans"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Valensiese Katalaans"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "Tsjeggies"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Deens"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "Duits"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "Grieks"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "Australiaanse Engels"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "Kanadese Engels"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "Britse Engels"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "Spaans"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "Baskies"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "Persies"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "Fins"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "Frans"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "Galisies"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "Gujaraties"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "Hebreeus"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "Hongaars"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "Italiaans"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "Japannees"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "Georgies"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "Koreaans"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "Litous"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "Masedonies"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "Nepalees"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "Flaams"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Noorweegs"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "Pools"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "Portugees"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "Portugees-Brasilië"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "Romeens"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "Russies"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "Serwies"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "Slowaaks"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "Sloweens"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "Albanees"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "Sweeds"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "Tamil"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "Thai"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "Turks"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "Viëtnamees"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh en die Gnome-Vi-span"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "Vereenvoudigde Sjinees"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "Tradisionele Sjinees"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "Omtrent Gaim"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim is 'n modulêre geselskliënt wat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
-"SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
-"Gadu, en QQ als gelyktydig kan gebruik.  Dit is geskryf met GTK+.<BR><BR>U "
-"mag die program aanpas en herversprei onderhewig aan die voorwaardes van die "
-"GPL (weergawe 2 of later).  'n Kopie van die GPL is bevat in die lêer "
-"'COPYING' wat saam met Gaim versprei word.  Die kopiereg van Gaim berus by "
-"sy bydraers.  Sien die lêer 'COPYRIGHT' vir die lys van bydraers.  Ons "
-"verskaf geen waarborg vir hierdie program nie.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim op irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:359
-msgid "Current Developers"
-msgstr "Huidige programmeerders"
-
-#: ../gtk/gtkdialogs.c:374
-msgid "Crazy Patch Writers"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:389
-msgid "Retired Developers"
-msgstr "Afgetrede programmeerders"
-
-#: ../gtk/gtkdialogs.c:404
-msgid "Current Translators"
-msgstr "Huidige vertalers"
-
-#: ../gtk/gtkdialogs.c:424
-msgid "Past Translators"
-msgstr "Vorige vertalers"
-
-#: ../gtk/gtkdialogs.c:442
-msgid "Debugging Information"
-msgstr "Ontfoutinligting"
-
-#: ../gtk/gtkdialogs.c:816
-msgid "Get User Info"
-msgstr "Kry gebruikerinligting"
-
-#: ../gtk/gtkdialogs.c:818
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Gee asb. die skermnaam of die alias van die persoon wie se inligting u wil "
-"sien."
-
-#: ../gtk/gtkdialogs.c:907
-msgid "View User Log"
-msgstr "Bekyk gebruikerjoernaal"
-
-#: ../gtk/gtkdialogs.c:909
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Gee asb. die skermnaam of die alias van die persoon wie se joernaal u wil "
-"sien."
-
-#: ../gtk/gtkdialogs.c:928
-msgid "Alias Contact"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:929
-msgid "Enter an alias for this contact."
-msgstr "Gee 'n alias vir hierdie kontak."
-
-#: ../gtk/gtkdialogs.c:949
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Gee 'n alias vir %s."
-
-#: ../gtk/gtkdialogs.c:951
-msgid "Alias Buddy"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:970
-msgid "Alias Chat"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:971
-msgid "Enter an alias for this chat."
-msgstr "Gee 'n alias vir hierdie geselsie."
-
-#: ../gtk/gtkdialogs.c:1008
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "Verwyder kontak"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "_Verwyder kontak"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"U staan op die punt om die groep genaamd %s in die groep genaamd %s te "
-"smeld. Wil u voortgaan?"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "Versmeld groepe"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "_Versmeld groepe"
-
-#: ../gtk/gtkdialogs.c:1105
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:1108
-msgid "Remove Group"
-msgstr "Verwyder groep"
-
-#: ../gtk/gtkdialogs.c:1109
-msgid "_Remove Group"
-msgstr "_Verwyder groep"
-
-#: ../gtk/gtkdialogs.c:1142
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:1145
-msgid "Remove Buddy"
-msgstr "Verwyder vriend"
-
-#: ../gtk/gtkdialogs.c:1146
-msgid "_Remove Buddy"
-msgstr "_Verwyder vriend"
-
-#: ../gtk/gtkdialogs.c:1167
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"U gaan nou die geselsie %s van die vriendelys verwyder.  Wil u voortgaan?"
-
-# 
-# 
-#: ../gtk/gtkdialogs.c:1170
-msgid "Remove Chat"
-msgstr "Verwyder geselsie"
-
-#: ../gtk/gtkdialogs.c:1171
-msgid "_Remove Chat"
-msgstr "_Verwyder geselsie"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr "Klik regs vir nog ongelese boodskappe...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "Verander status"
-
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2851
-#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
-msgid "Available"
-msgstr "Beskikbaar"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:226
-#: ../libgaim/protocols/jabber/buddy.c:1407
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4498
-#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3353
-#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
-msgid "Away"
-msgstr "Weg"
-
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
-#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
-#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "Onsigbaar"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr ""
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "Nuwe boodskap..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "Demp klanke"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr ""
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/gtkdocklet.c:567
-msgid "Quit"
-msgstr "Sluit af"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KG/s"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "Nie begin nie"
-
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:1397
-#: ../libgaim/protocols/jabber/buddy.c:1414
-#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
-msgid "Finished"
-msgstr "Afgehandel"
-
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
-msgid "Canceled"
-msgstr "Gekanselleer"
-
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "Wag vir oordrag om te begin"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Lêeroordragte - %d%% van %d lêers"
-
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "Lêeroordragte"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Ontvang as:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Ontvang vanaf:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>Stuur aan:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>Stuur as:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr "Daar is geen toepassing opgestel om hierdie lêertipe oop te maak nie."
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "'n Fout het voorgekom met die oopmaak van die lêer."
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr ""
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr ""
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "Vordering"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "Lêernaam"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "Grootte"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "Oorblywend"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "Lêernaam:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "Plaaslike lêer:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "Spoed:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr ""
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "Oorblywende tyd:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "Sluit hierdie venster wanneer alle oordragte _klaar is"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr ""
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "_Detail oor lêeroordrag"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_Hervat"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "Misluk"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Plak as gewone _teks"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr ""
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "Hiperskakelkleur"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "Kleur om hiperskakels mee te teken."
-
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr ""
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Kleur om hiperskakels mee te teken as die muis oor hulle is."
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "_Kopieer e-posadres"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "_Open skakel in blaaier"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "_Kopieer skakelligging"
-
-#: ../gtk/gtkimhtml.c:3271
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Lêertipe nie herken nie</span>\n"
-"\n"
-"Val terug na verstek van PNG."
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Lêertipe nie herken nie\n"
-"\n"
-"Val terug na verstek van PNG."
-
-#: ../gtk/gtkimhtml.c:3287
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Fout met stoor van prentjie</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Fout met stoor van prentjie\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "Stoor prentjie"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "_Stoor prentjie..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Kies skriftipe"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Kies tekskleur"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Kies agtergrondkleur"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Beskrywing"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Gee asb. die URL en die beskrywing van die skakel wat u wil invoeg. Die "
-"beskrywing is opsioneel."
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Gee asb. die URL van die skakel om in te sit."
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Voeg skakel in"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Voeg in"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Stoor van prentjie het misluk: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Voeg prentjie in"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr ""
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Glimlag!"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "Vetdruk"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "Skuinsdruk"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "Onderstreep"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Groter skrif"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Kleiner skrif"
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr ""
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Skrif se voorgrondkleur"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Agtergrondkleur"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr ""
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Voeg skakel in"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Voeg prentjie in"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr ""
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Gesprek in %s op %s</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:338
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Geen joernale gevind nie"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr ""
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Totale joernaalgrootte:"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "Gesprekke in %s"
-
-#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "Gesprekke met %s"
-
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "Stelseljoernaal"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Probeer `%s -h' vir meer inligting.\n"
-
-#: ../gtk/gtkmain.c:346
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Gebruik: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    gebruik DIR vir konfigurasielêers\n"
-"  -d, --debug         skryf ontfoutboodskappe na stdout\n"
-"  -h, --help          vertoon hierdie hulp en sluit af\n"
-"  -n, --nologin       moenie outomaties anmeld nie\n"
-"  -l, --login[=NAAM]  meld outomaties aan (opsionele NAAM-argument "
-"spesifiseer\n"
-"                      rekening(e) om te gebruik, gesky met kommas\n"
-"  -v, --version       wys die huidige weergawe en sluit af\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "Open alle boodskappe"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "Sender"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s het %d nuwe boodskap."
-msgstr[1] "%s het %d nuwe boodskappe."
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
-msgid "Search Results"
-msgstr "Soekresultate"
-
-#: ../gtk/gtknotify.c:899
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "Die blaaieropdrag \"%s\" is ongeldig."
-
-#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
-#: ../gtk/gtknotify.c:1054
-msgid "Unable to open URL"
-msgstr "Kan nie die URL oopmaak nie"
-
-#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr ""
-
-#: ../gtk/gtknotify.c:1055
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"Die 'Handmatige' blaaier-opdrag is gekies, maar geen opdrag is gestel nie."
-
-#: ../gtk/gtkplugin.c:264
-msgid "The following plugins will be unloaded."
-msgstr "Die volgende inproppe gaan ontlaai word."
-
-#: ../gtk/gtkplugin.c:283
-msgid "Multiple plugins will be unloaded."
-msgstr "Veelvuldige inproppe gaan ontlaai word."
-
-#: ../gtk/gtkplugin.c:285
-msgid "Unload Plugins"
-msgstr "Ontlaai inproppe"
-
-#: ../gtk/gtkplugin.c:397
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Geskryf deur:</span>\t%s\n"
-"<span weight=\"bold\">Webwerf:</span>\t\t%s\n"
-"<span weight=\"bold\">Lêernaam:</span>\t\t%s"
-
-#: ../gtk/gtkplugin.c:407
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Fout: %s\n"
-"Kyk by die inprop se webwerf vir 'n opdatering.</span>"
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "Stel _inprop op"
-
-#: ../gtk/gtkplugin.c:596
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Inpropdetail</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "Kies 'n lêer"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr ""
-
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr ""
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr ""
-
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr ""
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "_Vriendnaam:"
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Vriendnaam:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
+#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
 msgid "Pounce When Buddy..."
-msgstr ""
+msgstr "Reageer wanneer vriend..."
 
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "aa_nmeld"
+#: ../finch/gntpounce.c:372
+msgid "Signs on"
+msgstr "aanmeld"
 
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "a_fmeld"
+#: ../finch/gntpounce.c:373
+msgid "Signs off"
+msgstr "afmeld"
 
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "_weggaan"
+#: ../finch/gntpounce.c:374
+msgid "Goes away"
+msgstr "weggaan"
 
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "ter_ugkeer"
+#: ../finch/gntpounce.c:375
+msgid "Returns from away"
+msgstr "terugkeer"
 
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "_ledig raak"
+#: ../finch/gntpounce.c:376
+msgid "Becomes idle"
+msgstr "ledig raak"
 
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "Nie meer l_edig is nie"
+#: ../finch/gntpounce.c:377
+msgid "Is no longer idle"
+msgstr "nie meer ledig is nie"
 
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "begin _tik"
+#: ../finch/gntpounce.c:378
+msgid "Starts typing"
+msgstr "begin tik"
 
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "w_ag tydens tik"
+#: ../finch/gntpounce.c:379
+msgid "Pauses while typing"
+msgstr "wag tydens tik"
 
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "stop om te t_ik"
+#: ../finch/gntpounce.c:380
+msgid "Stops typing"
+msgstr "ophou tik"
 
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "'n _boodskap stuur"
+#: ../finch/gntpounce.c:381
+msgid "Sends a message"
+msgstr "'n boodskap stuur"
 
 #. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
 msgid "Action"
 msgstr "Aksie"
 
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "Ope_n 'n kletsvenster"
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Open 'n kletsvenster"
 
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr ""
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Wys 'n boodskapvenster"
 
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Stuur 'n _boodskap"
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Stuur 'n boodskap"
 
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "_Voer 'n opdrag uit"
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Voer 'n opdrag uit"
 
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "Spee_l 'n klank"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "_Blaai..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "_Blaai..."
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Speel 'n klank"
 
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "_Voorskou"
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Reageer slegs wanneer my status niebeskikbaar is"
 
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr ""
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "_Herhalend"
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+msgid "Recurring"
+msgstr "Herhalend"
 
-#: ../gtk/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr ""
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr ""
+msgstr "Wil u definitief die wag op %s vir %s uitvee?"
 
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "Herhalend"
-
-#: ../gtk/gtkpounce.c:1325
+#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
-msgstr ""
+msgstr "Vriendwagte"
 
-#: ../gtk/gtkpounce.c:1452
+#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s het begin om aan u te tik (%s)"
 
-#: ../gtk/gtkpounce.c:1454
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s het gewag terwyl hy/sy besig was om aan u te tik (%s)"
 
-#: ../gtk/gtkpounce.c:1456
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s het aangemeld op (%s)"
 
-#: ../gtk/gtkpounce.c:1458
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s het teruggekeer na ledigheid (%s)"
 
-#: ../gtk/gtkpounce.c:1460
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s het teruggekeer (%s)"
 
-#: ../gtk/gtkpounce.c:1462
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s het opgehou om aan u te tik (%s)"
 
-#: ../gtk/gtkpounce.c:1464
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s het afgemeld (%s)"
 
-#: ../gtk/gtkpounce.c:1466
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s het ledig geword (%s)"
 
-#: ../gtk/gtkpounce.c:1468
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s het weggegaan. (%s)"
 
-#: ../gtk/gtkpounce.c:1470
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s het u 'n boodskap gestuur. (%s)"
 
-#: ../gtk/gtkpounce.c:1471
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr ""
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Ikoon"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "Altyd"
-
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
-#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
-#: ../libgaim/plugins/autoreply.c:360
-msgid "Never"
-msgstr "Nooit"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
-msgid "When away"
-msgstr "Terwyl weg"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Oortjies"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Wys boodskappe en geselsies in _oortjies"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "Wys 'n _sluitknoppie op oortjies"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Plasing:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "Bo"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "Onder"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "Links"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "Regs"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "Vertikaal links"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "Vertikaal regs"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "Nuwe gesprekke:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "Wys _formattering op inkomende boodskappe"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "Dui _spelfoute aan"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Gebruik gladde rol"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "Verstekformattering"
-
-#: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Dit is hoe die uitgaande boodskapteks sal vertoon wanneer u protokolle "
-"gebruik wat formattering ondersteun. :)"
-
-#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3701
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP-adres"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN-bediener:"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "_Outospeur IP-adres"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "Publieke _IP:"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "Poorte"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "_Spesifiseer self die omvang van poorte om op te luister"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "_Beginpoort:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "_Endpoort:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Instaanbediener"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "Geen instaanbediener"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Gebruiker:"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Opera"
-msgstr "Opera"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "GNOME Default"
-msgstr "GNOME se verstek"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../gtk/gtkprefs.c:1225
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1234
-msgid "Manual"
-msgstr "Handmatig"
-
-#: ../gtk/gtkprefs.c:1287
-msgid "Browser Selection"
-msgstr "Blaaierkeuse"
-
-#: ../gtk/gtkprefs.c:1291
-msgid "_Browser:"
-msgstr "_Blaaier:"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "_Open skakel in:"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Browser default"
-msgstr "Verstekblaaier"
-
-#: ../gtk/gtkprefs.c:1302
-msgid "Existing window"
-msgstr "Bestaande venster"
-
-#: ../gtk/gtkprefs.c:1304
-msgid "New tab"
-msgstr "Nuwe oortjie"
-
-#: ../gtk/gtkprefs.c:1318
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Handmatig:\n"
-"(%s for URL)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "Joernaal_formaat:"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "Klankkeuse"
-
-#: ../gtk/gtkprefs.c:1521
-msgid "Quietest"
-msgstr "Sagste"
-
-#: ../gtk/gtkprefs.c:1523
-msgid "Quieter"
-msgstr "Sagter"
-
-#: ../gtk/gtkprefs.c:1525
-msgid "Quiet"
-msgstr "Sag"
-
-#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normaal"
-
-#: ../gtk/gtkprefs.c:1529
-msgid "Loud"
-msgstr "Hard"
-
-#: ../gtk/gtkprefs.c:1531
-msgid "Louder"
-msgstr "Harder"
-
-#: ../gtk/gtkprefs.c:1533
-msgid "Loudest"
-msgstr "Hardste"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Klankmetode"
-
-#: ../gtk/gtkprefs.c:1597
-msgid "_Method:"
-msgstr "_Metode:"
-
-#: ../gtk/gtkprefs.c:1599
-msgid "Console beep"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "Outomaties"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "Command"
-msgstr "Opdrag"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "No sounds"
-msgstr "Geen klanke"
-
-#: ../gtk/gtkprefs.c:1613
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Klankopdrag:\n"
-"(%s vir lêernaam)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Klankkeuses"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1642
-msgid "Enable sounds:"
-msgstr "Aktiveer klanke:"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "Slegs indien beskikbaar"
-
-#: ../gtk/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "Slegs indien nie beskikbaar nie"
+msgstr "Onbekende waggebeurtenis. Rapporteer hierdie, asb!"
 
-#: ../gtk/gtkprefs.c:1653
-msgid "Volume:"
-msgstr "Volume:"
-
-#: ../gtk/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1732
-msgid "Play"
-msgstr "Speel"
-
-#: ../gtk/gtkprefs.c:1739
-msgid "Event"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1758
-msgid "Test"
-msgstr "Toets"
-
-#: ../gtk/gtkprefs.c:1762
-msgid "Reset"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Kies..."
-
-#: ../gtk/gtkprefs.c:1809
-msgid "_Report idle time:"
-msgstr "_Raporteer ledige tyd:"
-
-#: ../gtk/gtkprefs.c:1812
+#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
 msgid "From last sent message"
 msgstr "Sedert laaste gestuurde boodskap"
 
-#: ../gtk/gtkprefs.c:1814
-msgid "Based on keyboard or mouse use"
-msgstr "Gebaseer op gebruik van sleutelbord en muis"
-
-#: ../gtk/gtkprefs.c:1823
-msgid "_Auto-reply:"
-msgstr "_Outo-antwoord:"
-
-#: ../gtk/gtkprefs.c:1827
-msgid "When both away and idle"
-msgstr "Terwyl weg en ledig"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1833
-msgid "Auto-away"
-msgstr "Outoweg"
-
-#: ../gtk/gtkprefs.c:1835
-msgid "Change status when _idle"
-msgstr "Verander status terwyl _ledig"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "_Minute voor verandering van status:"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "Verander _status na:"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1868
-msgid "Status at Startup"
-msgstr "Status by begin"
-
-#: ../gtk/gtkprefs.c:1870
-msgid "Use status from last _exit at startup"
-msgstr "By begin, gebruik status van laaste afsluiting"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "Status om te ge_bruik by begin:"
-
-#: ../gtk/gtkprefs.c:1914
-msgid "Interface"
-msgstr "Koppelvlak"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Smiley Themes"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Klanke"
-
-#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "Netwerk"
-
-#: ../gtk/gtkprefs.c:1923
-msgid "Browser"
-msgstr "Blaaier"
-
-#: ../gtk/gtkprefs.c:1927
-msgid "Status / Idle"
-msgstr "Status / ledig"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Laat alle gebruikers toe om my te kontak"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr ""
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Laat slegs die gebruikers hier onder toe"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Blokkeer alle gebruikers"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Blokkeer slegs die gebruikers hier onder"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Privaatheid"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Veranderinge aan privaatheidinstellings is onmiddelik van toepassing."
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "Stel privaatheid vir:"
-
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "Laat gebruiker toe"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "Tik 'n gebruiker wat u toelaat om u te kontak."
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Tik asb. die naam van die gebruiker wat u wil hê moet u kan kontak."
-
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Laat toe"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Laat %s toe om u te kontak?"
+#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
+#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Nooit"
 
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Is u seker u wil %s toelaat om u te kontak?"
+#: ../finch/gntprefs.c:159
+msgid "Show Idle Time"
+msgstr "Wys ledige tyd"
 
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "Blokkeer gebruiker"
+#: ../finch/gntprefs.c:160
+msgid "Show Offline Buddies"
+msgstr "Wys aflynvriende"
 
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Tik 'n gebruiker om te blokkeer."
+#: ../finch/gntprefs.c:166
+msgid "Show Timestamps"
+msgstr "Wys tydstempels"
 
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Gee asb. die naam van die gebruiker wat u wil blokkeer."
+#: ../finch/gntprefs.c:167
+msgid "Notify buddies when you are typing"
+msgstr "Laat weet vriende wanneer u tik"
 
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "Blokkeer %s?"
+#: ../finch/gntprefs.c:173
+msgid "Log format"
+msgstr "Boekstaafformaat"
 
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Is u seker u wil %s blokkeer?"
-
-#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
-#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "Ja"
+#: ../finch/gntprefs.c:174
+msgid "Log IMs"
+msgstr "Boekstaaf kitsboodskappe"
 
-#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
-#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-msgid "No"
-msgstr "Nee"
+#: ../finch/gntprefs.c:175
+msgid "Log chats"
+msgstr "Boekstaaf geselsies"
 
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "Pas toe"
+#: ../finch/gntprefs.c:176
+msgid "Log status change events"
+msgstr "Boekstaaf statusveranderinge"
 
-#: ../gtk/gtkrequest.c:1469
-msgid "That file already exists"
-msgstr "Daardie lêer bestaan reeds"
+#. Conversations
+#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+msgid "Conversations"
+msgstr "Gesprekke"
 
-#: ../gtk/gtkrequest.c:1470
-msgid "Would you like to overwrite it?"
-msgstr "Wil u dit oorskryf?"
+#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+msgid "Logging"
+msgstr "Boekstawing"
 
-#: ../gtk/gtkrequest.c:1471
-msgid "Overwrite"
-msgstr "Oorskryf"
+#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkprefs.c:1951
+msgid "Preferences"
+msgstr "Voorkeure"
 
-#: ../gtk/gtkrequest.c:1472
-msgid "Choose New Name"
-msgstr "Kies nuwe naam"
+#: ../finch/gntrequest.c:521
+msgid "Not implemented yet."
+msgstr "Nog nie geïmplementeer nie."
 
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
+#: ../pidgin/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "Stoor lêer..."
 
-#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
+#: ../pidgin/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "Open lêer..."
 
-#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
-msgid "Select Folder..."
-msgstr "Kies gids..."
-
-#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
-msgid "_Add"
-msgstr "_Voeg by"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "Kamernommer"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "_Kry lys"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "_Voeg geselsie by"
-
-#: ../gtk/gtksavedstatuses.c:331
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Is u seker u wil die gekose gestoorde statusse uitvee?"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
-msgid "_Use"
-msgstr "_Gebruik"
-
-#: ../gtk/gtksavedstatuses.c:725
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Titel reeds in gebruik.  U moet 'n unieke titel kies."
-
-#: ../gtk/gtksavedstatuses.c:913
-msgid "Different"
-msgstr "Anders"
-
-#: ../gtk/gtksavedstatuses.c:1106
-msgid "_Title:"
-msgstr "_Titel:"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "_Status:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "Gebruik 'n ander status vir sekere rekenings"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "S_toor en gebruik"
-
-#: ../gtk/gtksavedstatuses.c:1427
+#: ../finch/gntstatus.c:135
 #, c-format
-msgid "Status for %s"
-msgstr "Status vir %s"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Vriend meld aan"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Vriend meld af"
-
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "Boodskap ontvang"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Boodskapontvangs begin gesprek"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "Boodskap gestuur"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Persoon kom geselskap binne"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Persoon verlaat geselskap"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "U praat in geselsie"
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Wil u definitief \"%s\" uitvee?"
 
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Ander praat in geselsie"
+#: ../finch/gntstatus.c:138
+msgid "Delete Status"
+msgstr "Vee status uit"
 
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Iemand sê u skermnaam in 'n geselsie"
+#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+msgid "Saved Statuses"
+msgstr "Gestoorde statusse"
 
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer-mislukking"
+#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:463
+msgid "Title"
+msgstr "Titel"
 
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer kon nie begin nie."
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+msgid "Type"
+msgstr "Tipe"
 
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1021
-#: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2183
-#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
-#: ../libgaim/protocols/sametime/sametime.c:3742
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1621
-msgid "Connecting"
-msgstr "Verbind tans"
+#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
+#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
+#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
+#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1233
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2942
+#: ../libpurple/protocols/novell/novell.c:2948
+#: ../libpurple/protocols/novell/novell.c:2954
+#: ../libpurple/protocols/oscar/oscar.c:5492
+#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5734
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/sametime/sametime.c:3287
+#: ../libpurple/protocols/sametime/sametime.c:3293
+#: ../libpurple/protocols/sametime/sametime.c:3299
+#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3470
+#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+msgid "Message"
+msgstr "Boodskap"
 
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "Wag vir netwerkverbinding"
+#. Use
+#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+msgid "Use"
+msgstr "Gebruik"
 
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Die volgende fout het voorgekom met die laai van %s: %s"
+#: ../finch/gntstatus.c:291
+msgid "Invalid title"
+msgstr "Ongeldige titel"
 
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "Laai van prentjie het misluk"
+#: ../finch/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "Gee asb. 'n nieleë titel vir die status."
 
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Kan nie gids %s stuur nie."
+#: ../finch/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "Duplikaat titel"
 
-#: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"Gaim kan nie 'n gids oordra nie. U sal elke lêer binne-in afsonderlik moet "
-"stuur."
+#: ../finch/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "Gee asb. 'n ander titel vir die status."
 
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "U het 'n prentjie gesleep"
+#: ../finch/gntstatus.c:440
+msgid "Substatus"
+msgstr "Substatus"
 
-#: ../gtk/gtkutils.c:1441
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
+#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+msgid "Status:"
+msgstr "Status:"
 
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr ""
+#: ../finch/gntstatus.c:466
+msgid "Message:"
+msgstr "Boodskap:"
 
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "Stuur 'n prentjielêer"
+#: ../finch/gntstatus.c:515
+msgid "Edit Status"
+msgstr "Wysig status"
 
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "Voeg in boodskap"
+#: ../finch/gntstatus.c:557
+msgid "Use different status for following accounts"
+msgstr "Gebruik 'n ander status vir die volgende rekenings"
 
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr ""
+#. Save & Use
+#: ../finch/gntstatus.c:591
+msgid "Save & Use"
+msgstr "Stoor en gebruik"
 
-#: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
+#: ../finch/gntui.c:83
+msgid "Statuses"
+msgstr "Statusse"
 
-#: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
 msgstr ""
 
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../gtk/gtkutils.c:1511
-msgid "Cannot send launcher"
-msgstr ""
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "Knipbordinprop"
 
-#: ../gtk/gtkutils.c:1511
+#: ../finch/plugins/gntclipboard.c:152
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
 msgstr ""
 
-#: ../gtk/gtkutils.c:2343
+#: ../finch/plugins/gntgf.c:209
 #, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Lêer:</b> %s\n"
-"<b>Lêergroote:</b> %s\n"
-"<b>Prentgrootte:</b> %dx%d"
-
-#. Label
-#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
-#: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:618
-msgid "Buddy Icon"
-msgstr ""
+msgid "%s just signed on"
+msgstr "%s het pas aangemeld"
 
-#: ../gtk/gtkutils.c:2653
+#: ../finch/plugins/gntgf.c:216
 #, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-
-#: ../gtk/gtkutils.c:2655
-msgid "Icon Error"
-msgstr "Ikoonfout"
-
-#: ../gtk/gtkutils.c:2656
-msgid "Could not set icon"
-msgstr "Kon nie ikoon stel nie"
+msgid "%s just signed off"
+msgstr "%s het pas afgemeld"
 
-#: ../gtk/gtkutils.c:2757
+#: ../finch/plugins/gntgf.c:224
 #, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Kon nie lêer '%s' oopmaak nie: %s"
+msgid "%s sent you a message"
+msgstr "%s het u 'n boodskap gestuur"
 
-#: ../gtk/gtkutils.c:2806
+#: ../finch/plugins/gntgf.c:243
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Laai van beeld '%s' het misluk: rede onbekent, waarskynlik 'n korropte "
-"prentlêer"
-
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "Stoor lêer"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "Kies kleur"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "Vertoon statistiek"
-
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "Antwoordwaarskynlikheid:"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "Statistiekopstelling"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr ""
-
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
-msgid "minutes"
-msgstr "minute"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr ""
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "Drempel:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/cap/cap.c:931
-msgid "Contact Availability Prediction"
-msgstr ""
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr ""
-
-#. *  summary
-#: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Vriend is ledig"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Vriend is weg"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Vriend is weg vir lank"
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Vriend is mobiel"
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Vriend is aflyn"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Puntwaardes om te gebruik wanneer..."
-
-#: ../gtk/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"Die vriend met die <i>hoogste telling</i> is die vriend wat prioriteit sal "
-"hê in die kontak.\n"
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Gebruik die laaste vriend as tellings gelyk is"
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Puntwaardes om te gebruik vir rekening..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Kontakprioriteit"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Laat beheer van waardes toe wat geassosieer word met verskillende "
-"vriendstatusse."
-
-#. *< description
-#: ../gtk/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Laat verandering van puntwaardes van ledig/weg/aflyn-statusse toe by "
-"kontakprioriteitberekenings."
-
-#: ../gtk/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Gesprekskleure"
-
-#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "Pasgemaakte kleure vir die gespreksvenster"
-
-#: ../gtk/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Foutboodskappe"
-
-#: ../gtk/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr ""
-
-#: ../gtk/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "Stelselboodskappe"
-
-#: ../gtk/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Gestuurde boodskappe"
-
-#: ../gtk/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Ontvangde boodskappe"
+msgid "%s said your nick in %s"
+msgstr "%s het u bynaam gesê in %s"
 
-#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
+#: ../finch/plugins/gntgf.c:245
 #, c-format
-msgid "Select Color for %s"
-msgstr "Kies kleur vir %s"
-
-#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1532
-msgid "General"
-msgstr "Algemeen"
-
-#: ../gtk/plugins/convcolors.c:301
-msgid "Ignore incoming format"
-msgstr ""
-
-#: ../gtk/plugins/convcolors.c:302
-msgid "Apply in Chats"
-msgstr "Pas toe in geselsies"
-
-#: ../gtk/plugins/convcolors.c:303
-msgid "Apply in IMs"
-msgstr ""
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Volgens gesprektelling"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Gesprekplasing"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Aantal gesprekke per venster"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Aparte gesprek- en geselsvensters wanneer geplaas word volgens aantal"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Ekstra keuses vir gesprekplasing."
-
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Beperk die aantal gesprekke per venster en skei moontlik gesprekke en "
-"geselsies"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim-demostrasie-inprop"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "'n Voorbeeldinprop wat dinge doen - sien die beskrywing."
-
-#. *  description
-#: ../gtk/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Hierdie is 'n baie oulike inprop wat klomp dinge doen:\n"
-"- Dit sê wie die program geskryf het wanneer mens aanmeld\n"
-"- Dit keer alle teks agterstevoorom\n"
-"- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hiperskakelkleur"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Gesprekinskrywing"
+msgid "%s sent a message in %s"
+msgstr "%s het 'n boodskap gestuur in %s"
 
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Gesprekgeskiedenis"
+#: ../finch/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Vriend meld aan/af"
 
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr ""
+#: ../finch/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "U ontvang 'n kitsboodskap"
 
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr ""
+#: ../finch/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Iemand praat in 'n geselskap"
 
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr ""
+#: ../finch/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Iemand sê u naam in 'n geselskap"
 
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
+#: ../finch/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "Kies kleur"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "Kies skriftipe vir %s"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "Kies koppelvlakskrif"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
+#: ../finch/plugins/gntgf.c:329
+msgid "Beep too!"
 msgstr ""
 
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+#: ../finch/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "Stel DRINGEND vir die terminaalvenster."
 
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Koppelvlakkleure"
+#: ../finch/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntGf"
 
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
+#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+msgid "Toaster plugin"
 msgstr ""
 
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Skriftipes"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Gereedskap"
-
-#: ../gtk/plugins/gaimrc.c:581
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Skryf instellings na %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "Lees gtkrc-lêers weer"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+-temabeheer"
-
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Verskaf toegang tot algemeen gebruikte gtkrc-instellings."
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr ""
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Middelmuisknoppie"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Regtermuisknoppie"
-
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr ""
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>Gesprek met %s op %s:</b><br>"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+msgid "History Plugin Requires Logging"
 msgstr ""
 
-#. *  description
-#: ../gtk/plugins/gestures/gestures.c:294
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Kitsboodskappe"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Kies 'n persoon van u adresboek hier onder, of voeg 'n nuwe persoon by."
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1760
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
-#: ../libgaim/protocols/qq/sys_msg.c:250
-#: ../libgaim/protocols/sametime/sametime.c:5621
-msgid "Search"
-msgstr "Soe,"
-
-#. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
-#: ../gtk/plugins/gevolution/assoc-buddy.c:469
-#: ../gtk/plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Nuwe persoon"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "Kies vriend"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Kies 'n persoon van u adresboek om hierdie vriend by te voeg, of skep 'n "
-"nuwe persoon."
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "Gebruiker_detail"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "_Assosieer vriend"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1162
-msgid "None"
-msgstr "Geen"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Kan nie e-pos stuur nie"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr "Die evolution-programlêer is nie in die PATH gevind nie."
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "Voeg by adresboek"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "Stuur e-pos"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Opstelling van Evolution-integrasie"
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Kies al die rekeninge waarvoor vriende outomaties bygevoeg moet word."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Evolution-integrasie"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Verskaf integrasie met Evolution."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Gee asb. die persoon se inligting hier onder."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Gee asb. die vriend se skermnaam en rekeningtipe hier onder."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Rekeningtipe:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Opsionele inligting:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Naam:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Van:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-pos:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK-seinetoets"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Toets om te sien of alle koppelvlakseine goed werk."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "Geskiedenis"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr ""
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Kyk vir nuwe pos plaaslik."
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Voeg 'n klein posbus by die vriendlys wat wys as mens nuwe pos het."
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Merkstreep"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Trek 'n streep om nuwe boodskappe in 'n gesprek aan te dui"
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr ""
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "Gespre_kvensters"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "Gesel_svensters"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Daar was 'n konflik met die loop van die opdrag:"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "Die volgende fout het voorgekom:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Pas toe"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
-
-#. *  summary
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:670
-msgid "Notify For"
-msgstr ""
-
-#: ../gtk/plugins/notify.c:689
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Slegs wanneer iemand u skermnaam noem"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "Ge_fokuste vensters"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "Kennisgewingsmetodes"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "Voeg _string vooraan venstertitel:"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "Voeg _aantal nuwe boodskappe in venstertitel in"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "Voeg aantal nuwe boodskappe in _X-eienskap in"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Stel vensterbvestuurder se \"_DRINGEND\"-wenk"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "Lig geselsvenster"
-
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:767
-msgid "Notification Removal"
-msgstr "Verwydering van kennisgewing"
-
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:772
-msgid "Remove when conversation window _gains focus"
-msgstr "Verwyder wanneer gesprekvenster _fokus kry"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "Verwyder wanneer gesprekvenster ge_klik word"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "Verwyder wanneer daar in gesprekvenster ge_tik word"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "Verwyder wanneer 'n _boodskap gestuur word"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "Verwyder met aktivering van gesprekoortjie"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "Boodskapkennisgewing"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-"Verskaf 'n verskeidenheid maniere om te laat weet van ongelese boodskappe."
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr ""
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "U gebruik Gaim weergawe %s.  Die huidige weergawe is %s.<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Veranderinge:</b>\n"
-"%s<br><br>"
-
-#: ../gtk/plugins/relnot.c:80
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"U kan weergawe %s verkry vanaf:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "Nuwe weergawe beskikbaar"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Vrystellingskennisgewings"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Kyk af en toe vir nuwe weergawes."
-
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Kyk van tyd tot tyd vir nuwe weergawes en laat weet die gebruiker met die "
-"veranderings."
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "Duplikaatverbetering"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "Die gespesifiseerde woord bestaan reeds in die verbeteringlys."
-
-#: ../gtk/plugins/spellchk.c:2180
-msgid "Text Replacements"
-msgstr "Teksvervangings"
-
-#: ../gtk/plugins/spellchk.c:2203
-msgid "You type"
-msgstr "U tik"
-
-#: ../gtk/plugins/spellchk.c:2217
-msgid "You send"
-msgstr "U stuur"
-
-#: ../gtk/plugins/spellchk.c:2231
-msgid "Whole words only"
-msgstr "Slegs heelwoorde"
-
-#: ../gtk/plugins/spellchk.c:2243
-msgid "Case sensitive"
-msgstr "Kassensitief"
-
-#: ../gtk/plugins/spellchk.c:2269
-msgid "Add a new text replacement"
-msgstr "Voeg 'n nuwe teksvervanging by"
-
-#: ../gtk/plugins/spellchk.c:2285
-msgid "You _type:"
-msgstr "U _tik:"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "U _stuur:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2314
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"Identies wat _kas betref (deaktiveer vir outomatiese hantering van "
-"hoofletters)"
-
-#: ../gtk/plugins/spellchk.c:2316
-msgid "Only replace _whole words"
-msgstr "Vervang slegs _heelwoorde"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "Algemene keuses vir teksvervanging"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "Aktiveer vervanging van laaste woord tydens stuur"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "Teksvervanging"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde reëls."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "'n Weergawe van die vriendlys wat horisontaal rol."
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "Vertoon tydstempels elke"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "Tydstempel"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "Vertoon iChat-tydstempels"
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Vertoon iChat-tydstempels elke N minute."
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Tydstempelformattering"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Forseer (tradisionele Gaim-) 24-uur tydformaat"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Wys datums in..."
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "_Gesprekke:"
-
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Vir vertraagde boodskappe"
-
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Vir vertraagde boodskappe en in geselskappe"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Boodskapjoernale:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Boodskaptydstempelformate"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Pasgemaakte formate vir boodskaptydstempels."
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Hierdie inprop laat die gebruiker toe om die formaat van tydstempels in "
-"gesprekke in joernale aan te pas."
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Ondeursigtigheid:"
-
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Gesprekvensters"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "Gesrekvenster-deursigtigheid"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
+"Boekstawing kan geaktiveer word by Gereedskap -> Voorkeure -> Boekstawing.\n"
+"\n"
+"Aktivering van staaflêers vir kitsboodsappe en/of geselsies sal geskiedenis "
+"aktiveer vir die selfde gesprektipe(s)."
 
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Verwyder gesprekvenster se deursigtigheid terwyl gefokus"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Altyd bo-op"
-
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Vriendelysvenster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "_Vriendelysvenster se deursigtigheid"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Verwyder vriendelysvenster se deursigtigheid tydens fokus"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Deursigtigheid"
+#: ../finch/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "GntHistory"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr ""
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Wys onlangs gestaafde gesprekke in die nuwe gesprek."
 
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
+"Wanneer 'n nuwe gesprek begin word, sal hierdie inprop die laaste gesprek in "
+"die huidige een invoeg."
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "GTK+-weergawe"
-
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "Begin"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr "_Begin Gaim met Windows-begin"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
+#: ../finch/plugins/lastlog.c:69
+msgid "Lastlog"
 msgstr ""
 
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "_Hou vriendelysvenster bo:"
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
+#: ../finch/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr "_Flits venster wanneer geselsboodskappe ontvang word"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "WinGaim-keuses"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "Keuses spesifiek aan Windows Gaim."
+#: ../finch/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "GntLastlog"
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libgaim/account.c:769
+#: ../libpurple/account.c:777
 msgid "accounts"
 msgstr "rekeninge"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:923
 msgid "Password is required to sign on."
 msgstr "Wagwoord word benodig om aan te meld."
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Gee wagwoord vir %s (%s)"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:955
 msgid "Enter Password"
 msgstr "Gee wagwoord"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:960
 msgid "Save password"
 msgstr "Stoor wagwoord"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:994 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Ontbrekende protokolinprop vir %s"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1317
+#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "New passwords do not match."
 msgstr "Nuwe wagwoorde stem nie ooreen nie."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1163
 msgid "Fill out all fields completely."
 msgstr "Vul alle velde volledig in."
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1186
 msgid "Original password"
 msgstr "Oorspronklike wagword"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1193
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1200
 msgid "New password (again)"
 msgstr "Nuwe wagwoord (weer)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1206
 #, c-format
 msgid "Change password for %s"
 msgstr "Verander wagwoord vir %s"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1214
 msgid "Please enter your current password and your new password."
 msgstr "Gee asb. u huidige wagwoord en u nuwe wagwoord."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1244
 #, c-format
 msgid "Change user information for %s"
 msgstr "Verander gebruikerinligting vir %s"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Stel gebruikerinligting"
 
-#: ../libgaim/blist.c:548
-msgid "buddy list"
-msgstr "vriendelys"
+#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
+#: ../libpurple/protocols/jabber/buddy.c:641
+#: ../libpurple/protocols/jabber/buddy.c:1404
+#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: ../libgaim/blist.c:1919
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
+#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Vriende"
 
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "Groep nie verwyder nie"
+#: ../libpurple/blist.c:550
+msgid "buddy list"
+msgstr "vriendelys"
 
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registrasiefout"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s het aangemeld"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s het afgemeld"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "Kan nie boodskap stuur nie: Die boodskap is te groot."
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan nie boodskap stuur aan %s nie."
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr "Die boodskap is te groot."
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr "Kan nie boodskap stuur nie."
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1162
 msgid "Send Message"
 msgstr "Stuur boodskap"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1163
 msgid "_Send Message"
 msgstr "_Stuur boodskap"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
 msgstr "%s het die kamer binnegekom."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] het die kamer binnegekom."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
 msgstr "U staan nou bekend as %s"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s staan nou bekend as %s"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1767
 #, c-format
 msgid "%s left the room."
 msgstr "%s het die kamer verlaat."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s het die kamer verlaat (%s)."
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Naamloos"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kon nie verbinding kry nie: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kon nie naam kry nie: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kon nie bedienernaam kry nie: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Naamloos"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:496
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:554
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:558
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:735
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Onbekende rede"
 
-#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:248
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan nie 'n lêer van 0 grepe stuur nie."
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:273
 msgid "Cannot send a directory."
 msgstr "Kan nie 'n gids stuur nie."
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:282
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s is nie 'n gewone lêer nie. Gaan dus nie probeer om te oorskryf nie.\n"
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:340
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wil %s aan u stuur (%s)"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wil aan u 'n lêer stuur"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:388
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aanvaar die versoek tot lêeroordrag vanaf %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:392
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5693,412 +1727,436 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:425
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bied aan om lêer %s te stuur"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:477
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is nie 'n geldige lêernaam nie.\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:498
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Bied aan om %s aan %s te stuur"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:510
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Begin nou met oordrag van %s vanaf %s"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:664
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Oordrag van lêer %s voltooi"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:667
 msgid "File transfer complete"
 msgstr "Lêeroordrag voltooi"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1084
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "U het die oordrag van %s gekanselleer"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1089
 msgid "File transfer cancelled"
 msgstr "Lêeroordrag gekanselleer"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1147
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s het die oordrag van %s gekanselleer"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1152
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s het die lêeroordrag gekanselleer"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1209
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Lêeroordrag na %s het misluk."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1211
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Lêeroordrag vanaf %s het misluk."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Loop die opdrag in 'n terminaal"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"aim\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"gg\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"icq\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"irc\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"msnim\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"sip\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"xmpp\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
+"Die opdrag wat gebruik word om \"ymsgr\"-URL'e te hanteer, indien geaktiveer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "Hantering van \"aim\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "Hantering van \"gg\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "Hantering van \"icq\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "Hantering van \"irc\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "Hantering van \"msnim\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "Hantering van \"sip\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "Hantering van \"xmpp\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "Hantering van \"ymsgr\"-URL'e"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"aim\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e "
+"moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"icq\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"irc\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"msnim\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"sip\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"xmpp\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"ymsgr\"-"
+"URL'e moet hanteer."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"Waar indien die opdrag wat hierdie tipe URL hanteer in 'n terminaal moet "
+"loop."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "Eenvoudige teks"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Ou Gaim"
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr ""
 
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:732
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "Boekstawing van hierdie gesprek het misluk."
 
-#: ../libgaim/log.c:1041
+#: ../libpurple/log.c:1175
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
+#: ../libpurple/log.c:1251
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr ""
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#: ../libgaim/plugin.c:434
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libgaim/plugin.c:451
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 
-#: ../libgaim/plugin.c:468
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr ""
 
-#: ../libgaim/plugin.c:533
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: ../libgaim/plugin.c:538
-msgid "Gaim encountered errors loading the plugin."
-msgstr ""
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Kan nie inprop laai nie"
 
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr ""
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Kan nie u inprop laai nie."
 
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr ""
 
-#: ../libgaim/plugin.c:669
-msgid "Gaim encountered errors unloading the plugin."
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
 msgstr ""
 
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Outoaanvaar"
 
-#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Aanvaar die versoek tot lêeroordrag outomaties van gekose gebruikers."
 
-#: ../libgaim/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Outomaties aanvaarde lêeroordrag van \"%s\" vanaf \"%s\" voltooi."
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "Outoaanvaar voltooid"
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Wanneer 'n versoek tot lêeroordrag vanaf %s aankom"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "Verstel outoaanvaarding"
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
-#: ../libgaim/protocols/oscar/oscar.c:2234
-#: ../libgaim/protocols/oscar/oscar.c:2280
-#: ../libgaim/protocols/oscar/oscar.c:5838
-#: ../libgaim/protocols/oscar/oscar.c:5890
-#: ../libgaim/protocols/oscar/oscar.c:6068
-#: ../libgaim/protocols/oscar/oscar.c:6124
-#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
+#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
+#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
+#: ../libpurple/request.h:1360
 msgid "_Cancel"
 msgstr "_Kanselleer"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:166
 msgid "Ask"
-msgstr ""
+msgstr "Vra"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:167
 msgid "Auto Accept"
 msgstr "Outoaanvaar"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Auto Reject"
-msgstr ""
+msgstr "Outoweier"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Autoaccept File Transfers..."
 msgstr "Outoaanvaar lêeroordrag..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:211
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:216
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Wys outomaties van die hand vir gebruikers wat nie in die vriendelys is nie"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:220
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"Laat weet met opspringvenster wanneer outoaanvaarde lêeroordrag voltooi het\n"
+"(slegs as daar geen gesprek met sender is nie)"
 
-#: ../libgaim/plugins/autoreply.c:23
+#: ../libpurple/plugins/autoreply.c:23
 msgid "Autoreply"
 msgstr "Outo-antwoord"
 
-#: ../libgaim/plugins/autoreply.c:25
+#: ../libpurple/plugins/autoreply.c:25
 msgid "Autoreply for all the protocols"
-msgstr ""
+msgstr "Outo-antwoord vir al die protokolle"
 
-#: ../libgaim/plugins/autoreply.c:26
+#: ../libpurple/plugins/autoreply.c:26
 msgid ""
 "This plugin lets you set autoreply message for any protocol. You can set the "
 "global autoreply message from the Plugin-options dialog. To set some "
@@ -6106,97 +2164,106 @@ msgid ""
 "in the buddy-list window. To set autoreply messages for some account, go to "
 "the `Advanced' tab of the Account-edit dialog."
 msgstr ""
+"Hierdie inprop laat mens 'n outo-antwoord-boodskap stel vir enige protokol. "
+"Die globale outo-antwoord kan gestel word van die Inpropkeuses-dialoog. Om "
+"'n spesifieke outo-antwoord vir 'n spesifieke vriend te stel, klik regs op "
+"die vriend in die vriendelys. Om 'n outo-antwoord vir 'n rekening te stuur, "
+"gaan na die `Gevorderde'-oortjie van die Rekening-wysigingsdialoog."
 
 #. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
+#: ../libpurple/plugins/autoreply.c:218
 #, c-format
 msgid "Set autoreply message for %s"
-msgstr "Stel outoantwoordboodskap vir %s"
+msgstr "Stel outoantwoord vir %s"
 
-#: ../libgaim/plugins/autoreply.c:220
+#: ../libpurple/plugins/autoreply.c:220
 msgid "Set Autoreply Message"
-msgstr "Stel outoantwoordboodskap"
+msgstr "Stel outoantwoord"
 
-#: ../libgaim/plugins/autoreply.c:221
+#: ../libpurple/plugins/autoreply.c:221
 msgid ""
 "The following message will be sent to the buddy when the buddy sends you a "
 "message and autoreply is enabled."
 msgstr ""
+"Die volgende boodskap sal aan die vriend gestuur word as die vriend 'n "
+"boodskap stuur en u outo-antwoord is geaktiveer."
 
-#: ../libgaim/plugins/autoreply.c:238
+#: ../libpurple/plugins/autoreply.c:238
 msgid "Set _Autoreply Message"
-msgstr "Stel _outoantwoordboodskap"
+msgstr "Stel _outo-antwoord"
 
-#: ../libgaim/plugins/autoreply.c:249
+#: ../libpurple/plugins/autoreply.c:249
 msgid "Autoreply message"
-msgstr "Outoantwoordboodskap"
+msgstr "Outoantwoord"
 
-#: ../libgaim/plugins/autoreply.c:336
+#: ../libpurple/plugins/autoreply.c:336
 msgid "Send autoreply messages when"
-msgstr "Stuur outoantwoordboodskappe wanneer"
+msgstr "Stuur outo-antwoorde wanneer"
 
-#: ../libgaim/plugins/autoreply.c:340
+#: ../libpurple/plugins/autoreply.c:340
 msgid "When my account is _away"
-msgstr ""
+msgstr "my rekening op _weg is"
 
-#: ../libgaim/plugins/autoreply.c:344
+#: ../libpurple/plugins/autoreply.c:344
 msgid "When my account is _idle"
-msgstr "my rekening _ledig is"
+msgstr "my rekening op _ledig is"
 
-#: ../libgaim/plugins/autoreply.c:348
+#: ../libpurple/plugins/autoreply.c:348
 msgid "_Default reply"
 msgstr "_Verstekantwoord"
 
-#: ../libgaim/plugins/autoreply.c:354
+#: ../libpurple/plugins/autoreply.c:354
 msgid "Status message"
 msgstr "Statusboodskap"
 
-#: ../libgaim/plugins/autoreply.c:358
+#: ../libpurple/plugins/autoreply.c:358
 msgid "Autoreply with status message"
-msgstr ""
+msgstr "Outo-antwoord met statusboodskap"
 
-#: ../libgaim/plugins/autoreply.c:362
+#: ../libpurple/plugins/autoreply.c:362
 msgid "Always when there is a status message"
-msgstr ""
+msgstr "Altyd as daar 'n statusboodskap is"
 
-#: ../libgaim/plugins/autoreply.c:364
+#: ../libpurple/plugins/autoreply.c:364
 msgid "Only when there's no autoreply message"
-msgstr ""
+msgstr "Slegs as daar geen outo-antwoord is nie"
 
-#: ../libgaim/plugins/autoreply.c:369
+#: ../libpurple/plugins/autoreply.c:369
 msgid "Delay between autoreplies"
-msgstr ""
+msgstr "Wagtyd tussen outo-antwoorde"
 
-#: ../libgaim/plugins/autoreply.c:373
+#: ../libpurple/plugins/autoreply.c:373
 msgid "_Minimum delay (mins)"
-msgstr ""
+msgstr "_Minimum wagtyd (minute)"
 
-#: ../libgaim/plugins/autoreply.c:377
+#: ../libpurple/plugins/autoreply.c:377
 msgid "Times to send autoreplies"
-msgstr ""
+msgstr "Aantal outo-antwoorde om te stuur"
 
-#: ../libgaim/plugins/autoreply.c:381
+#: ../libpurple/plugins/autoreply.c:381
 msgid "Ma_ximum count"
-msgstr ""
+msgstr "Ma_ksimum aantal"
 
-#: ../libgaim/plugins/autoreply.c:428
+#: ../libpurple/plugins/autoreply.c:428
 msgid ""
 "I am currently not available. Please leave your message, and I will get back "
 "to you as soon as possible."
 msgstr ""
+"Ek is tans nie beskikbaar nie. Los gerus 'n boodskap en ek sal so gou "
+"moontlik antwoord."
 
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Notes"
 msgstr "Notas"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "Tik u notas onder in..."
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:61
 msgid "Edit Notes..."
-msgstr ""
+msgstr "Wysig notas..."
 
 #. *< type
 #. *< ui_requirement
@@ -6204,20 +2271,21 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Vriendnotas"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Stoor notas oor spesifieke vriende."
 
 #. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
+"Voeg die moontlikheid by om notas oor vriende op die vriendelys te stoor."
 
 #. *< type
 #. *< ui_requirement
@@ -6225,7 +2293,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr ""
 
@@ -6233,8 +2301,8 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
 #. *< type
@@ -6243,7 +2311,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-voorbeeld"
 
@@ -6251,7 +2319,8 @@ msgstr "DBus-voorbeeld"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus-inpropvoorbeeld"
 
@@ -6261,60 +2330,62 @@ msgstr "DBus-inpropvoorbeeld"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim-lêerbeheer"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Lêerbeheer"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Laat mens toe om Gaim te beheer deur opdragte in 'n lêer te voeg."
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "Maak beheer moontlik deur opdragte in 'n lêer te voeg."
 
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
 msgid "Minutes"
 msgstr "Minute"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
+#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr ""
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "Stel rekening se ledige tyd"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
 msgid "_Set"
 msgstr "_Stel"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Geen van u rekenings is ledig nie."
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#, fuzzy
 msgid "Unset Account Idle Time"
-msgstr ""
+msgstr "Stel rekening se ledige tyd"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:202
 msgid "_Unset"
 msgstr ""
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
-msgstr ""
+msgstr "Stel ledige tyd vir alle rekeninge"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:268
+#, fuzzy
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr ""
+msgstr "Stel ledige tyd vir alle rekeninge"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr ""
+msgstr "Laat mens toe om met die hand te stel hoe lank mens ledig was"
 
 #. *< type
 #. *< ui_requirement
@@ -6322,19 +2393,19 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
-msgstr ""
+msgstr "IPC-toetskliënt"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr ""
+msgstr "Toets inprop-IPC-ondersteuning, as 'n kliënt."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
+#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -6346,117 +2417,160 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC-toetsbediener"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Toets inprop-IPC-ondersteuning, as 'n bediener."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Toets inprop-IPC-steun, as 'n bediener. Hierdie registreer die IPC-opdragte."
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "Opstelling vir in- en uitgaanversteking"
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "Minimum kamergrootte"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:264
+msgid "Join/Part Hiding"
+msgstr "In- en uitgaanversteking"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:267
+msgid "Hides extraneous join/part messages."
+msgstr "Versteek onnodige in- en uitgaanboodskappe."
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:269
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "Gebruiker is aflyn."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Outo-antwoord gestuur:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s het afgemeld."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "Een of meer boodskappe kon dalk nie afgelewer word nie."
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "U is van die bediener afgesny."
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
+"U is tans afgesny. Boodskappe sal nie ontvang word tensy u aangemeld is nie."
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
+msgstr "Boodskap kon nie gestuur word nie want die maksimumlengte is oorskry."
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "Boodskap kon nie gestuur word nie."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr ""
 
@@ -6466,19 +2580,19 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2126
 msgid "Log Reader"
-msgstr ""
+msgstr "Staaflêerleser"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "Sluit ander kletskliënte se staaflêers in in die staaflêerleser."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2134
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6487,14 +2601,14 @@ msgid ""
 "at your own risk!"
 msgstr ""
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:211
 msgid "Mono Plugin Loader"
-msgstr ""
+msgstr "Laaier vir Mono-inproppe"
 
-#: ../libgaim/plugins/mono/loader/mono.c:215
-#: ../libgaim/plugins/mono/loader/mono.c:216
+#: ../libpurple/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:214
 msgid "Loads .NET plugins with Mono."
-msgstr ""
+msgstr "Laai .NET-inproppe met Mono."
 
 #. *< magic
 #. *< major version
@@ -6505,59 +2619,83 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Nuwe lyn"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Voeg 'n nuwe lyn vooraan die vertoonde boodskap."
 
 #. *  summary
-#: ../libgaim/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "Emulasie vir aflynboodskappe"
 
-#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "Stoor boodskappe gestuur aan 'n aflynvriend as 'n vriendwag."
 
-#: ../libgaim/plugins/offlinemsg.c:95
+#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
+"Die res van die boodskappe sal as 'n vriendwag gestoor word. Dié wag kan "
+"gewysig/verwyder word vanuit die `Vriendwag'-dialoog."
 
-#: ../libgaim/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
+"\"%s\" is tans aflyn. Wil u die res van die boodskappe in 'n vriendwag stoor "
+"en outomaties stuur as \"%s\" weer aanmeld?"
 
-#: ../libgaim/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Aflyn boodskap"
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "U kan die vriendwag wysig/verwyder vanuit die `Vriendwag'-dialoog"
+
+#: ../libpurple/plugins/offlinemsg.c:159
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:313
+#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Ja"
+
+#: ../libpurple/plugins/offlinemsg.c:160
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Nee"
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:187
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Stoor aflyn boodskappe in vriendwag"
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:191
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "Moenie vra nie. Stoor altyd in vriendwag."
 
 #. *< type
 #. *< ui_requirement
@@ -6565,48 +2703,48 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:588
 msgid "Perl Plugin Loader"
-msgstr ""
+msgstr "Laaier vir perl-inproppe"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
-msgstr ""
+msgstr "Verskaf ondersteuning vir die laai van perl-inproppe."
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:19
 msgid "Psychic Mode"
-msgstr ""
+msgstr "Sienermodus"
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "Sienermodus vir inkomende gesprekke"
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
+msgstr "Veroorsaak dat gesprekvensters verskein wanneer ander gebruikers 'n boodskap begin tik.  Hierdie werk vir AIM, ICQ, Jabber, Sametime en Yahoo!"
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr "U voel 'n magtige dreuning..."
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "Aktiveer slegs vir gebruikers in die vriendelys"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "Deaktiveer terwyl weg"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "Vertoon kennisgewingsboodskap in gesprekke"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:99
 msgid "Raise psychic conversations"
 msgstr ""
 
@@ -6616,7 +2754,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Seinetoets"
 
@@ -6624,7 +2762,8 @@ msgstr "Seinetoets"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Toets om te sien of alle seine goed werk."
 
@@ -6634,7 +2773,7 @@ msgstr "Toets om te sien of alle seine goed werk."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Eenvoudige inprop"
 
@@ -6642,7 +2781,7 @@ msgstr "Eenvoudige inprop"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Toets om te sien of meeste dinge werk."
 
@@ -6652,7 +2791,7 @@ msgstr "Toets om te sien of meeste dinge werk."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6660,7 +2799,7 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
@@ -6670,7 +2809,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6678,8 +2817,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
 msgid "Provides SSL support through GNUTLS."
 msgstr "Verskaf SSL-steun d.m.v. GNUTLS."
 
@@ -6689,7 +2828,7 @@ msgstr "Verskaf SSL-steun d.m.v. GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:409
 msgid "NSS"
 msgstr "NSS"
 
@@ -6697,48 +2836,49 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:412
+#: ../libpurple/plugins/ssl/ssl-nss.c:414
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Verskaf SSL-steun d.m.v. Mozilla-NSS."
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is nie meer weg nie."
 
-#: ../libgaim/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s het weggegaan."
 
-#: ../libgaim/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s het ledig geword."
 
-#: ../libgaim/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is nie meer ledig nie."
 
-#: ../libgaim/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s het aangemeld."
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Laat weet wanneer"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "vriend _weggaan"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "vriend _ledig word"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "vriend aan-/af_meld"
 
@@ -6748,7 +2888,7 @@ msgstr "vriend aan-/af_meld"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Vriendstatuskennisgewing"
 
@@ -6756,36 +2896,56 @@ msgstr "Vriendstatuskennisgewing"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:145
+#: ../libpurple/plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr ""
+msgstr "Dui aan in 'n gespreksvenster wanneer 'n vriend weggaan of terugkom vanaf 'n weg- of ledige status."
 
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/tcl/tcl.c:415
 msgid "Tcl Plugin Loader"
-msgstr ""
+msgstr "Laaier vir Tcl-inproppe"
 
-#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
-#: ../libgaim/plugins/tcl/tcl.c:481
+#: ../libpurple/plugins/tcl/tcl.c:483
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections\n"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
+#: ../libpurple/protocols/irc/msgs.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1414
+#: ../libpurple/protocols/novell/novell.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:4520
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
+#: ../libpurple/protocols/yahoo/yahoo.c:3373
+#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
+#: ../pidgin/gtkstatusbox.c:1090
+msgid "Away"
+msgstr "Weg"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6796,384 +2956,414 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-protokolinprop"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:474
-#: ../libgaim/protocols/bonjour/bonjour.c:482
-#: ../libgaim/protocols/bonjour/bonjour.c:540
-#: ../libgaim/protocols/silc/silc.c:300
-msgid "Gaim User"
-msgstr "Gaim-gebruiker"
+#: ../libpurple/protocols/bonjour/bonjour.c:463
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:528
+msgid "Purple Person"
+msgstr ""
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/silc/silc.c:925
 msgid "Hostname"
-msgstr ""
+msgstr "Gasheernaam"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:822
 msgid "First name"
 msgstr "Naam"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/gg/gg.c:617
+#: ../libpurple/protocols/jabber/jabber.c:827
 msgid "Last name"
 msgstr "Van"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:797
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/gg/gg.c:468
+#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:929
 msgid "E-mail"
 msgstr "E-pos"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:580
 msgid "AIM Account"
 msgstr "AIM-rekening"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:583
 msgid "Jabber Account"
 msgstr "Jabber-rekening"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s het die gesprek afgesluit."
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Kan nie sok open nie"
 
-#: ../libgaim/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Fout met instel van sokkeuses"
 
-#: ../libgaim/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "Kon nie sok aan poort verbind nie"
 
-#: ../libgaim/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "Kon nie op sok luister nie"
 
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr ""
+msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie."
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "Ongeldige instaaninstellings"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Stoor vriendelys..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Kon nie lêer open nie"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Vriendelys suksesvol gestoor!"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Kon nie vriendelys laai nie"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Laai vriendelys..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Vriendelys suksesvol gelaai!"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Stoor vriendelys..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Vul die registrasievelde in."
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Wagwoorde stem nie ooreen nie."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kan nie nuwe rekening registreer nie. 'n Fout het voorgekom.\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Registrasie suksesvol voltooi!"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:786
-#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
+#: ../libpurple/protocols/jabber/jabber.c:801
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Password"
 msgstr "Wagwoord"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Wagwoord (weer)"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
-#: ../libgaim/protocols/oscar/oscar.c:3764
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
+#: ../libpurple/protocols/gg/gg.c:1113
+#: ../libpurple/protocols/jabber/jabber.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stad"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Jaar van geboorte"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Geslag"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Manlik of vroulik"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Manlik"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:643
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Vroulik"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Slegs aanlyn"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Soek vriende"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Vul die velde in."
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "U huidige wagwoord verskil van die gespesifiseerde een."
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan nie wagwoord verander nie. 'n Fout het voorgekom.\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Verander wagwoord vir die Gadu-Gadu-rekening"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Wagwoord is suksesvol verander!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Huidige wagwoord"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
+msgstr "Gee asb. u huidige wagwoord en u nuwe wagwoord vir UIN: "
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Verander Gadu-Gadu-wagwoord"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/gg/gg.c:993
+#: ../libpurple/protocols/jabber/buddy.c:1408
+#: ../libpurple/protocols/novell/novell.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+msgid "Offline"
+msgstr "Aflyn"
+
+#: ../libpurple/protocols/gg/gg.c:996
+#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2817
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+msgid "Available"
+msgstr "Beskikbaar"
+
+#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
+#: ../libpurple/protocols/oscar/oscar.c:2663
+#: ../libpurple/protocols/oscar/oscar.c:3701
 msgid "UIN"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1558
-#: ../libgaim/protocols/jabber/buddy.c:1734
-#: ../libgaim/protocols/oscar/oscar.c:3704
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
+#: ../libpurple/protocols/jabber/buddy.c:1565
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Naam"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "Jaar van geboorte"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/oscar/oscar.c:3913
 msgid "Unable to display the search results."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "Soekresultate"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1202
 msgid "No matching users found"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
-msgstr ""
+msgstr "Kan nie sok lees nie"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr "Vriendelys afgelaai"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr "U vriendelys is van die bediener afgelaai."
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr "Vriendelys opgelaai"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
 msgstr "U vriendelys is na die bediener opgelaai."
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
 msgid "Connection failed."
 msgstr "Verbinding misluk."
 
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
 msgid "Blocked"
 msgstr "Geblokkeer"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1631
 msgid "Add to chat"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1640
 msgid "Unblock"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Block"
 msgstr "Blokkeer"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Chat _name:"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1901
 msgid "Chat error"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1902
 msgid "This chat name is already in use"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1985
 msgid "Not connected to the server."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2008
 msgid "Find buddies..."
 msgstr "Soek vriende..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2014
 msgid "Change password..."
 msgstr "Verander wagwoord..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2020
 msgid "Upload buddylist to Server"
 msgstr "Laai vriendelys op na bediener"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Download buddylist from Server"
 msgstr "Laai vriendelys af van bediener"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Delete buddylist from Server"
-msgstr ""
+msgstr "Verwyder vriendelys van bediener"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Save buddylist to file..."
 msgstr "Stoor vriendelys in lêer..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Load buddylist from file..."
 msgstr "Laai vriendelys van lêer..."
 
@@ -7188,122 +3378,147 @@ msgstr "Laai vriendelys van lêer..."
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokolinprop"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Gewilde Poolse stelsel vir kitsboodskappe"
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-gebruiker"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1575
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdrag: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1283
 #, c-format
 msgid "current topic is: %s"
 msgstr "onderwerp tans: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1287
 msgid "No topic is set"
 msgstr "Geen onderwerp gestel nie"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Lêeroordrag het misluk"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr "Gaim kon nie op 'n poort luister nie."
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "Kon nie op 'n poort luister nie."
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
 msgid "Server has disconnected"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanaal:"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
-#: ../libgaim/protocols/jabber/jabber.c:927
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2183
+#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3721
+#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/yahoo/yahoo.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+msgid "Connecting"
+msgstr "Verbind tans"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "SSL-steun nie beskikbaar nie"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "Kon nie netwerksok skep nie"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1265
 msgid "Couldn't connect to host"
-msgstr ""
+msgstr "Kon nie aan gasheer verbind nie"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Verbinding misluk"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
 msgid "Read error"
 msgstr "Leesfout"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:759
+#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:762
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Onderwerp"
 
@@ -7315,205 +3530,212 @@ msgstr "Onderwerp"
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:893
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolinprop"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:894
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Die IRC-protokolinprop wat minder suig"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1984
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/jabber.c:1994
+#: ../libpurple/protocols/msn/msn.c:2099
+#: ../libpurple/protocols/oscar/oscar.c:6621
+#: ../libpurple/protocols/qq/qq.c:746
+#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Bediener"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
+#: ../libpurple/protocols/oscar/oscar.c:6624
+#: ../libpurple/protocols/qq/qq.c:749
+#: ../libpurple/protocols/sametime/sametime.c:5711
+#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Poort"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:919
 msgid "Encodings"
 msgstr "Enkoderings"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:782
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/jabber/jabber.c:797
+#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:923
 msgid "Username"
 msgstr "Gebruikernaam"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
+#: ../libpurple/protocols/silc/silc.c:927
 msgid "Real name"
 msgstr "Regte naam"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:180
 msgid "Bad mode"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:191
 #, c-format
 msgid "You are banned from %s."
 msgstr "U is verban uit %s."
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Banned"
 msgstr "Verban"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:209
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:290
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:291
 msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentifiseer)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
-msgstr ""
+msgstr "Bynaam"
 
-#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Tans in"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:323
 msgid "Idle for"
 msgstr "Ledig vir"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:326
 msgid "Online since"
 msgstr "Aanlyn sedert"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Dié beskrywing:</b>"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "Glorious"
 msgstr "Heerlik"
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:406
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s het die onderwerp verander na: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s het die onderwerp geskrap."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:416
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Die onderwerp vir %s is: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:434
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Onbekende boodskap '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:435
 msgid "Unknown message"
 msgstr "Onbekende boodskap"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr ""
-"Gaim het 'n boodskap gestuur wat die IRC-bediener nie verstaan het nie."
+#: ../libpurple/protocols/irc/msgs.c:435
+msgid "The IRC server received a message it did not understand."
+msgstr "Die IRC-bediener het 'n boodskap ontvang wat hy nie verstaan het nie."
 
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:456
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Gebruikers op %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:553
 msgid "Time Response"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:554
 msgid "The IRC server's local time is:"
 msgstr "Die IRC-bediener se plaaslike tyd is:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:565
 msgid "No such channel"
 msgstr ""
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "no such channel"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "User is not logged in"
 msgstr "Gebruiker is nie aangemeld nie"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such nick or channel"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:604
 msgid "Could not send"
 msgstr "Kon nie stuur nie"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:660
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Uitnodiging benodig om by %s aan te sluit."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:661
 msgid "Invitation only"
 msgstr "Slegs op uitnodiging"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:773
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "U is uitgeskop deur %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Uitgeskop deur %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) deur %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
 msgid "Invalid nickname"
 msgstr "Ongeldige bynaam"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:888
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7521,7 +3743,7 @@ msgstr ""
 "U gekose bynaam is gewyer deur die bediner.  Dit bevat waarskynlik ongeldige "
 "karakters."
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:893
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7529,51 +3751,52 @@ msgstr ""
 "U gekose rekeningnaam is gewyer deur die bediner.  Dit bevat waarskynlik "
 "ongeldige karakters."
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Cannot change nick"
 msgstr "Kan nie bynaam verander nie"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Could not change nick"
 msgstr "Kon nie bynaam verander nie"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:953
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:995
 msgid "Error: invalid PONG from server"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:997
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan nie by %s aansluit nie:"
 
-#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan nie by kanaal aansluit nie"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1113
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Bynaam of kanaal is tydelik nie beskikbaar nie"
+msgstr "Bynaam of kanaal is tydelik nie beskikbaar nie."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1125
 #, c-format
 msgid "Wallops from %s"
 msgstr "Loesing van %s"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:118
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr ""
+msgstr "action &lt;aksie om uit te voer&gt;:  Voer 'n aksie uit."
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:119
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -7581,337 +3804,347 @@ msgstr ""
 "away [boodskap]:  Stel die wegboodskap, of geen boodskap om terug te keer "
 "vanaf wegstatus."
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:120
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Stuur 'n opdrag aan chanserv"
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:121
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:128
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr ""
+msgstr "me &lt;aksie om uit te voer&gt;:  Voer 'n aksie uit."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:129
 msgid "memoserv: Send a command to memoserv"
-msgstr ""
+msgstr "memoserv: Stuur 'n opdrag aan memoserv"
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/jabber/jabber.c:1798
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:134
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Stuur 'n opdrag aan nickserv"
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "operserv: Send a command to operserv"
-msgstr ""
+msgstr "operserv: Stuur 'n opdrag aan operserv"
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [boodskap]:  Sluit verbinding met bediener, met 'n opsionele boodskap."
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Vertoon die plaaslike tyd van die IRC-bediener."
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuwe onderwerp]:  Bekyk of verander die kanaalonderwerp."
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:149
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:444
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoordtyd van %s: %lu sekondes"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "PONG"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "CTCP PING reply"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:556
+#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Afgesny."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:51
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "Bediener benodig TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libpurple/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:235
-#: ../libgaim/protocols/jabber/auth.c:236
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:232
+#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/protocols/jabber/auth.c:407
+#: ../libpurple/protocols/jabber/auth.c:408
+#: ../libpurple/protocols/jabber/auth.c:489
+#: ../libpurple/protocols/jabber/auth.c:490
 msgid "Plaintext Authentication"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:234
+#: ../libpurple/protocols/jabber/auth.c:409
+#: ../libpurple/protocols/jabber/auth.c:491
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:243
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:240
+#: ../libpurple/protocols/jabber/auth.c:417
+#: ../libpurple/protocols/jabber/auth.c:499
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:330
+#: ../libpurple/protocols/jabber/auth.c:452
+#: ../libpurple/protocols/jabber/auth.c:620
+#: ../libpurple/protocols/jabber/auth.c:754
+#: ../libpurple/protocols/jabber/auth.c:779
+#: ../libpurple/protocols/jabber/auth.c:798
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Ongeldige antwoord van die bediener."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:641
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "SASL error"
 msgstr "SASL-fout"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:783
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:790
+#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Volle name"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:796
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Van"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:807
 msgid "Given Name"
 msgstr "Doopnaam"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:857
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:859
 msgid "Street Address"
 msgstr "Straatadres"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:855
 msgid "Extended Address"
 msgstr "Uitgebreide adres"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:863
 msgid "Locality"
 msgstr "Ligging"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:867
 msgid "Region"
 msgstr "Streek"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:871
 msgid "Postal Code"
 msgstr "Poskode"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:869
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:876
+#: ../libpurple/protocols/silc/silc.c:933
 msgid "Country"
 msgstr "Land"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:880
-#: ../libgaim/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:906
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-pos"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:928
 msgid "Organization Name"
 msgstr "Naam van organisasie"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:932
 msgid "Organization Unit"
 msgstr "Eenheid"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:941
 msgid "Role"
 msgstr "Rol"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:824
+#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/oscar/oscar.c:3751
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:944
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Beskrywing"
+
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Wysig Jabber-vCard"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -7919,696 +4152,724 @@ msgstr ""
 "Alle onderstaande items is opsioneel. Gee slegs die inligting waarmee u "
 "gemaklik voel."
 
-#: ../libgaim/protocols/jabber/buddy.c:652
-#: ../libgaim/protocols/jabber/buddy.c:691
+#: ../libpurple/protocols/jabber/buddy.c:654
+#: ../libpurple/protocols/jabber/buddy.c:695
 msgid "Client"
 msgstr "Kliënt"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:658
+#: ../libpurple/protocols/jabber/buddy.c:699
 msgid "Operating System"
 msgstr "Bedryfstelsel"
 
-#: ../libgaim/protocols/jabber/buddy.c:666
-#: ../libgaim/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/buddy.c:668
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1226
-#: ../libgaim/protocols/jabber/jabber.c:1236
-#: ../libgaim/protocols/jabber/jabber.c:1246
-#: ../libgaim/protocols/jabber/jabber.c:1256
-#: ../libgaim/protocols/jabber/jabber.c:1266
+msgstr "Hulpbron"
+
+#: ../libpurple/protocols/jabber/buddy.c:670
+#: ../libpurple/protocols/jabber/jabber.c:1232
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../libgaim/protocols/jabber/buddy.c:804
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
-msgstr "Middelnaam"
-
-#: ../libgaim/protocols/jabber/buddy.c:837
-#: ../libgaim/protocols/jabber/jabber.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3763
-#: ../libgaim/protocols/oscar/oscar.c:3776
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+msgstr "Tweede naam"
+
+#: ../libpurple/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adres"
 
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:851
 msgid "P.O. Box"
 msgstr "Posbus"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Logo"
 msgstr "Embleem"
 
-#: ../libgaim/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1351
 msgid "Un-hide From"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1348
+#: ../libpurple/protocols/jabber/buddy.c:1355
 msgid "Temporarily Hide From"
 msgstr "Kruip tydelik weg vir"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1356
+#: ../libpurple/protocols/jabber/buddy.c:1363
 msgid "Cancel Presence Notification"
 msgstr "Kanselleer teenwoordigheidkennisgewings"
 
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1370
 msgid "(Re-)Request authorization"
 msgstr "(Her-)Versoek magtiging"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1372
+#: ../libpurple/protocols/jabber/buddy.c:1379
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Beëindig inskrywing"
 
-#: ../libgaim/protocols/jabber/buddy.c:1405
-#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/buddy.c:1412
+#: ../libpurple/protocols/jabber/jabber.c:1241
 msgid "Chatty"
 msgstr "Geselserig"
 
-#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
 msgid "Extended Away"
 msgstr "Vir lank weg"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1265
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5760
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1418
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Moenie pla nie"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libpurple/protocols/jabber/buddy.c:1563
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1560
-#: ../libgaim/protocols/jabber/buddy.c:1739
-#: ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libpurple/protocols/jabber/buddy.c:1567
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "Last Name"
 msgstr "Van"
 
-#: ../libgaim/protocols/jabber/buddy.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:1599
 msgid "The following are the results of your search"
 msgstr "Die volgende is die resultate van u soektog"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1667
+#: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1688
+#: ../libpurple/protocols/jabber/buddy.c:1695
 msgid "Could not query the directory server."
 msgstr ""
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libpurple/protocols/jabber/buddy.c:1729
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Bedienerinstruksies: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1736
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Vul een of meer velde in om te soek vir passende Jabber-gebruikers."
 
-#: ../libgaim/protocols/jabber/buddy.c:1749
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3708
-#: ../libgaim/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "E-Mail Address"
 msgstr "E-posadres"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
-#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libpurple/protocols/jabber/buddy.c:1765
+#: ../libpurple/protocols/jabber/buddy.c:1766
 msgid "Search for Jabber users"
 msgstr "Soek vir Jabber-gebruikers"
 
-#: ../libgaim/protocols/jabber/buddy.c:1773
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/sys_msg.c:162
+#: ../libpurple/protocols/qq/sys_msg.c:232
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Soek"
+
+#: ../libpurple/protocols/jabber/buddy.c:1780
 msgid "Invalid Directory"
 msgstr "Ongeldige gids"
 
-#: ../libgaim/protocols/jabber/buddy.c:1790
+#: ../libpurple/protocols/jabber/buddy.c:1797
 msgid "Enter a User Directory"
 msgstr "Gee 'n gebruikergids"
 
-#: ../libgaim/protocols/jabber/buddy.c:1791
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Select a user directory to search"
 msgstr "Kies 'n gebruikergids om te deursoek"
 
-#: ../libgaim/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1801
 msgid "Search Directory"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5228
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Kamer:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Bediener:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is nie 'n geldige kamernaam nie"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Ongeldige kamernaam"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is nie 'n geldige bedienernaam nie"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Ongeldige bedienernaam"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:237
 #, c-format
+#, fuzzy
 msgid "%s is not a valid room handle"
-msgstr ""
+msgstr "%s is nie 'n geldige kamernaam nie"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:239
+#, fuzzy
 msgid "Invalid Room Handle"
-msgstr ""
+msgstr "Ongeldige kamernaam"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Opstellingfout"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:407
+#: ../libpurple/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "Kan nie opstel nie"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "Kameropstellingfout"
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "Hieride kamer kan nie opgestel word nie"
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:472
+#: ../libpurple/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "Registrasiefout"
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:680
+#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fout met die kry van die kamerlys"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Ongeldige bediener"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Gee 'n konferensiebediener"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Kies 'n konferensiebediener om te vra"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Vind kamers"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:294
-#: ../libgaim/protocols/jabber/jabber.c:322
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Skryffout"
 
-#: ../libgaim/protocols/jabber/jabber.c:390
-#: ../libgaim/protocols/jabber/jabber.c:427
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Leesfout"
 
-#: ../libgaim/protocols/jabber/jabber.c:504
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr "Kan nie sok skep nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:552
-#: ../libgaim/protocols/jabber/jabber.c:895
+#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber-ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrasie van %s@%s suksesvol"
 
-#: ../libgaim/protocols/jabber/jabber.c:625
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:641
 msgid "Registration Successful"
 msgstr "Registrasie suksesvol"
 
-#: ../libgaim/protocols/jabber/jabber.c:632
-#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: ../libgaim/protocols/jabber/jabber.c:634
-#: ../libgaim/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:650
 msgid "Registration Failed"
 msgstr "Registrasie het misluk"
 
-#: ../libgaim/protocols/jabber/jabber.c:750
-#: ../libgaim/protocols/jabber/jabber.c:751
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:766
 msgid "Already Registered"
 msgstr "Reeds geregistreer"
 
-#: ../libgaim/protocols/jabber/jabber.c:827
-#: ../libgaim/protocols/oscar/oscar.c:3765
-#: ../libgaim/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "State"
-msgstr "Toestand"
+msgstr "Staat"
 
-#: ../libgaim/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/jabber/jabber.c:847
 msgid "Postal code"
 msgstr "Poskode"
 
-#: ../libgaim/protocols/jabber/jabber.c:837
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:862
 msgid "Date"
 msgstr "Datum"
 
-#: ../libgaim/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:870
 msgid "Please fill out the information below to register your new account."
 msgstr "Vul die inligting onder in om die nuwe rekening te registreer."
 
-#: ../libgaim/protocols/jabber/jabber.c:858
-#: ../libgaim/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:874
 msgid "Register New Jabber Account"
 msgstr "Registreer 'n nuwe Jabber-rekening"
 
-#: ../libgaim/protocols/jabber/jabber.c:1025
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+msgid "Register"
+msgstr "Registreer"
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Initializing Stream"
 msgstr "Inisialiseer stroom"
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Staaf"
 
-#: ../libgaim/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Re-initializing Stream"
 msgstr "Herinisialiseer stroom"
 
-#: ../libgaim/protocols/jabber/jabber.c:1109
-#: ../libgaim/protocols/jabber/jabber.c:1479
-#: ../libgaim/protocols/jabber/jabber.c:1520
-#: ../libgaim/protocols/jabber/jabber.c:1554
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/jabber/jabber.c:1115
+#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:5540
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1157
 msgid "Both"
 msgstr "Beide"
 
-#: ../libgaim/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1160
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Geen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
-msgstr ""
+msgstr "Inskrywing"
 
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libpurple/protocols/jabber/jabber.c:1301
 msgid "Password Changed"
 msgstr "Wagwoord verander"
 
-#: ../libgaim/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Your password has been changed."
 msgstr "U wagwoord is verander."
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1307
 msgid "Error changing password"
 msgstr "Fout met verandering van wagwoord"
 
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/jabber/jabber.c:1363
 msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Change Jabber Password"
 msgstr "Verander Jabber-wagwoord"
 
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
 msgstr "Gee asb. u nuwe wagwoord"
 
-#: ../libgaim/protocols/jabber/jabber.c:1373
-#: ../libgaim/protocols/oscar/oscar.c:6355
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/silc/silc.c:1013
 msgid "Set User Info..."
 msgstr "Stel gebruikerinligting..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6366
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/silc/silc.c:1009
 msgid "Change Password..."
 msgstr "Verander wagwoord..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1389
 msgid "Search for Users..."
 msgstr "Soek vir gebruikers..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1467
 msgid "Bad Request"
 msgstr "Slegte versoek"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../libgaim/protocols/jabber/jabber.c:1463
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Feature Not Implemented"
 msgstr "Kenmerk nie geïmplementeer nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "Verbode"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Gone"
 msgstr "Weg"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Internal Server Error"
 msgstr "Interne bedienerfout"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Item Not Found"
 msgstr "Item nie gevind nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Malformed Jabber ID"
 msgstr "Misvormde Jabber-ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
 msgstr "Nie aanvaarbaar nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Allowed"
 msgstr "Nie toegelaat nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Payment Required"
 msgstr "Betaling benodig"
 
-#: ../libgaim/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Recipient Unavailable"
 msgstr "Ontvanger nie beskikbaar nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Registration Required"
 msgstr "Registrasie benodig"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Remote Server Not Found"
 msgstr "Afgeleë bediener nie gevind nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "Remote Server Timeout"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Server Overloaded"
 msgstr "Bediener oorlaai"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Service Unavailable"
 msgstr "Diens nie beskikbaar nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Subscription Required"
 msgstr "Inskrywing benodig"
 
-#: ../libgaim/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Unexpected Request"
 msgstr "Onverwagde versoek"
 
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Authorization Aborted"
 msgstr "Magtiging gestaak"
 
-#: ../libgaim/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Incorrect encoding in authorization"
 msgstr "Verkeerde enkodering in magtiging"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Invalid Authorization Mechanism"
 msgstr "Ongeldige magtigingmeganisme"
 
-#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization mechanism too weak"
 msgstr "Magtigingmeganisme te swak"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Temporary Authentication Failure"
 msgstr "Tydlike magtigingmislukking"
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Authentication Failure"
 msgstr "Magtigingmislukking"
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Bad Format"
 msgstr "Slegte formaat"
 
-#: ../libgaim/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Host Gone"
-msgstr ""
+msgstr "Gasheer weg"
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Unknown"
-msgstr ""
+msgstr "Gasheer onbekend"
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Invalid ID"
 msgstr "Ongeldige ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Non-matching Hosts"
-msgstr ""
+msgstr "Niepassende gashere"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Policy Violation"
 msgstr "Beleidskending"
 
-#: ../libgaim/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Restricted XML"
 msgstr "Ingeperkte XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "See Other Host"
-msgstr ""
+msgstr "Sien ander gasheer"
 
-#: ../libgaim/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "Unsupported Encoding"
 msgstr "Enkodering nie gesteun nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Version"
 msgstr "Weergawe nie gesteun nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "XML Not Well Formed"
 msgstr "XML nie goed gevorm nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Stream Error"
 msgstr "Stroomfout"
 
-#: ../libgaim/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1655
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan nie gebruiker %s verban nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1675
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Onbekene affiliasie: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1680
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan nie gebruiker %s as \"%s\" affilieer nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1699
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Onbekende rol: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan nie rol \"%s\" vir gebruiker %s stel nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/jabber/jabber.c:1759
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan nie gebruiker %s uitskop nie"
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1790
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1794
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/jabber/jabber.c:1803
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1808
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "topic [new topic]:  View or change the topic."
-msgstr ""
+msgstr "topic [nuwe onderwerp]:  Bekyk of verander die onderwerp."
 
-#: ../libgaim/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1820
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr ""
+msgstr "ban &lt;gebruiker&gt; [kamer]:  Verban 'n gebruiker uit die kamer."
 
-#: ../libgaim/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1832
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1838
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
+msgstr "invite &lt;gebruiker&gt; [boodskap]:  Nooi 'n gebruiker uit na die kamer."
 
-#: ../libgaim/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1844
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
+msgstr "join: &lt;kamer&gt; [bediener]:  Sluit by 'n geselsie aan op hierdie bediener."
 
-#: ../libgaim/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1850
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -8623,701 +4884,720 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1962
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Jabber Protocol Plugin"
-msgstr "Inprop vir Jabber-protokol"
+msgstr "Inprop vir die Jabber-protokol"
 
-#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
 msgstr "forseer ou (poort 5223-) SSL"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/jabber.c:2010
+#: ../libpurple/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "Verbindingspoort"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2004
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2014
+#: ../libpurple/protocols/silc/silc.c:1846
 msgid "Connect server"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "Boodskap van %s"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s het die onderwerp gestel na: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "Die onderwerp is: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Boodskapaflewering na %s het misluk: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Jabber-boodskapfout"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kode %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:282
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:357
 msgid "Create New Room"
 msgstr "Skep nuwe kamer"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:358
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "U skep 'n nuwe kamer.  Wil u dit opstel of die verstekinstellings aanvaar?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Stel kamer op"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:363
 msgid "_Accept Defaults"
 msgstr "_Aanvaar verstek"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fout in geselsie %s"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:404
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fout met aansluiting by geselsie %s"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Kan nie lêer stuur aan %s nie: die gebruiker steun nie lêeroordrag nie"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Lêerversending het misluk"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:35
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Ongeldige e-posadres"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Gebruiker bestaan nie"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Reeds aangemeld"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Ongeldige skermnaam"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Lys vol"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Reeds daar"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Nie op lys nie"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "Gebruiker is aflyn"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Te veel groepe"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Gebruiker nie in groep nie"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Groepnaam te lank"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Kan nie groep nul verwyder nie"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Het probeer om 'n gebruiker by niebestaande groep te voeg"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "Skakelbord het misluk"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Benodigde velde kort"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Nie aangemeld nie"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Diens tydelik nie beskikbaar nie"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Databasisbedienerfout"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Opdrag gedeaktiveer"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Bediener besig"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "Bediener nie beskikbaar nie"
 
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Databasisverbindingsfout"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Fout met skep van verbinding"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Kan nie skryf nie"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Sessie oorlaai"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Gebruiker is te aktief"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
-msgstr ""
+msgstr "Magtiging het misluk"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fout: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:262
 msgid "Set your home phone number."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:277
 msgid "Set your work phone number."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:306
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Allow"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:311
 msgid "Disallow"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:355
 msgid "Page"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:518
 msgid "Has you"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2876
+#: ../libpurple/protocols/yahoo/yahoo.c:3480
 msgid "Be Right Back"
-msgstr ""
-
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+msgstr "Binnekort terug"
+
+#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2823
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
 msgid "Busy"
-msgstr ""
+msgstr "Besig"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:556
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "On the Phone"
-msgstr ""
+msgstr "Op die foon"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3501
 msgid "Out to Lunch"
-msgstr ""
+msgstr "Uit vir ete"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:588
 msgid "Set Friendly Name..."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:593
 msgid "Set Home Phone Number..."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:597
 msgid "Set Work Phone Number..."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:601
 msgid "Set Mobile Phone Number..."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:607
 msgid "Enable/Disable Mobile Devices..."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:622
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:646
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:656
+#: ../libpurple/protocols/novell/novell.c:3409
 msgid "Initiate _Chat"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
+#: ../libpurple/protocols/msn/msn.c:694
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:719
 msgid "Failed to connect to server."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
-#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "Algemeen"
+
+#: ../libpurple/protocols/msn/msn.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Ouderdom"
 
-#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Beroep"
 
-#: ../libgaim/protocols/msn/msn.c:1542
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1214
 msgid "Location"
 msgstr "Ligging"
 
-#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
-#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
+#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
 msgid "Hobbies and Interests"
 msgstr "Stokperdjies en belangstellings"
 
-#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
-#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
-#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
 msgid "A Little About Me"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1548
 msgid "Social"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Huwelikstatus"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1551
 msgid "Interests"
 msgstr "Belangstellings"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1552
 msgid "Pets"
 msgstr "Troeteldiere"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1553
 msgid "Hometown"
 msgstr "Tuisdorp"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1554
 msgid "Places Lived"
 msgstr "Plekke gewoon"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1555
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1556
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1557
 msgid "Music"
 msgstr "Musiek"
 
-#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
-#: ../libgaim/protocols/msn/msn.c:1767
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Gunsteling aanhaling"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Contact Info"
 msgstr "Kontakinligting"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1579
 msgid "Significant Other"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1580
 msgid "Home Phone"
 msgstr "Huistelefoon"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1581
 msgid "Home Phone 2"
 msgstr "Huistelefoon 2"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1582
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Home Address"
 msgstr "Huisadres"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1583
 msgid "Personal Mobile"
 msgstr "Persoonlike sel"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1584
 msgid "Home Fax"
 msgstr "Huisfaks"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1585
 msgid "Personal E-Mail"
 msgstr "Persoonlike e-pos"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Personal IM"
 msgstr "Persoonlike kitsboodskappe"
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Anniversary"
 msgstr "Herdenking"
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Work"
 msgstr "Werk"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Company"
 msgstr "Maatskappy"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departement"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1609
 msgid "Profession"
 msgstr "Prefessie"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1610
 msgid "Work Phone"
 msgstr "Werktelefoon"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1611
 msgid "Work Phone 2"
 msgstr "Werktelefoon 2"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/msn/msn.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1613
 msgid "Work Mobile"
 msgstr "Werksel"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1614
 msgid "Work Pager"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work Fax"
 msgstr "Werkfaks"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Work E-Mail"
 msgstr "Werks-e-pos"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1617
 msgid "Work IM"
 msgstr "Werkkitsboodskappe"
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1618
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
-#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
 msgid "Favorite Things"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Last Updated"
 msgstr "Laas opgedateer"
 
-#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Tuisblad"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "The user has not created a public profile."
-msgstr ""
+msgstr "Die gebruiker het nie 'n publieke profiel geskep nie."
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
 msgstr ""
+"Kon geen inligting in die gebruiker se profiel kry nie. Heel "
+"waarskynlik bestaan die gebruiker nie."
 
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
-msgstr ""
+msgstr "Profiel-URL"
 
 #. *< type
 #. *< ui_requirement
@@ -9329,96 +5609,96 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
 msgid "MSN Protocol Plugin"
-msgstr ""
+msgstr "MSN-protokolinprop"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2108
 msgid "Use HTTP Method"
-msgstr ""
+msgstr "Gebruik HTTP-metode"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2113
 msgid "Show custom smileys"
-msgstr ""
+msgstr "Wys pasgemaakte gesiggies"
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2121
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
-msgstr ""
+msgstr "Kon nie verbind nie"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
-msgstr ""
+msgstr "Onbekende fout."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
-msgstr ""
+msgstr "%s op %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
-msgstr ""
+msgstr "Diens tydelik nie beskikbaar nie."
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:823
 msgid "Unable to rename group"
-msgstr ""
+msgstr "Kan nie groep hernoem nie"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:878
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Kan nie groep uitvee nie"
 
-#: ../libgaim/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -9437,419 +5717,416 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
-msgstr ""
+msgstr "Skryffout"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
-msgstr ""
+msgstr "Leesfout"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
-msgstr ""
+msgstr "Ons protokol word nie deur die bediener ondersteun nie."
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3467
-#: ../libgaim/protocols/yahoo/yahoo.c:191
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:201
 msgid "You have signed on from another location."
-msgstr ""
+msgstr "U het van 'n ander plek aangemeld."
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
+"Die MSN-bedieners is tydelik nie beskikbaar nie. Wag asb. en probeer weer."
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
+msgstr "U MSN-vriendelys is tydelik nie beskikbaar nie. Wag asb. en probeer weer."
 
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr ""
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
-msgstr ""
+msgstr "Kry tans koekie"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
-msgstr ""
+msgstr "Stuur tans koekie"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
-msgstr ""
+msgstr "Kry tans vriendelys"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
-msgstr ""
+msgstr "Weg van rekenaar"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
-msgstr ""
+msgstr "Op die foon"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
-msgstr ""
+msgstr "Weg vir middagete"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr ""
+msgstr "%s het u by sy of haar vriendelys gevoeg."
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr ""
+msgstr "%s het u van sy of haar vriendelys verwyder."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr ""
+msgstr "Kan nie \"%s\" byvoeg nie."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
-msgstr ""
+msgstr "Konferensie nie gevind nie"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
-msgstr ""
+msgstr "Konferensie bestaan nie"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
-msgstr ""
+msgstr "'n Gids met daardie naam bestaan reeds"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
-msgstr ""
+msgstr "Wagwoord het verval"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Verkeerde wagwoord"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
-msgstr ""
+msgstr "Gebruiker nie gevind nie"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
-msgstr ""
+msgstr "Rekening gedeaktiveer"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
-msgstr ""
+msgstr "Verkeerde skermnaam of wagwoord"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
-msgstr ""
+msgstr "'n Fout het voorgekom met die opdatering van die gids"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1967
 msgid "The user is either offline or you are blocked"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1970
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr ""
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libgaim/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr ""
+msgstr "Kan nie boodskap stuur nie (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:493
-#: ../libgaim/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1505
+#: ../libpurple/protocols/sametime/sametime.c:4121
 msgid "User ID"
 msgstr ""
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Volle name"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1723
 msgid "Authenticating..."
-msgstr ""
+msgstr "Staaf tans..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
-msgstr ""
+msgstr "Kan nie aan bediener verbind nie."
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
-msgstr ""
+msgstr "Wag vir antwoord..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9857,36 +6134,36 @@ msgid ""
 "Sent: %s"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1904
 msgid "Would you like to join the conversation?"
 msgstr ""
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -9900,51 +6177,56 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3514
+#: ../libpurple/protocols/novell/novell.c:3516
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3535
 msgid "Server address"
-msgstr ""
+msgstr "Bedieneradres"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3539
 msgid "Server port"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+msgstr "Bedienerpoort"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2287
+#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
-msgstr ""
+msgstr "Bediener het die verbinding toegemaak."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
 msgstr ""
+"Verbinding met bediener verloor:\n"
+"%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
+"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
+"%s"
 
 #. *< type
 #. *< ui_requirement
@@ -9956,17 +6238,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:112
+#: ../libpurple/protocols/oscar/libaim.c:114
 msgid "AIM Protocol Plugin"
 msgstr "AIM-protokolinprop"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9977,150 +6253,144 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:112
+#: ../libpurple/protocols/oscar/libicq.c:114
 msgid "ICQ Protocol Plugin"
-msgstr "IRC-protokolinprop"
+msgstr "ICQ-protokolinprop"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:135
+#: ../libpurple/protocols/yahoo/yahoo.c:4069
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Encoding"
 msgstr "Enkodering"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
-msgstr ""
+msgstr "Kon nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
-msgstr ""
+msgstr "Ongeldige fout"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
-msgstr ""
+msgstr "Diens nie beskikbaar nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
-msgstr ""
+msgstr "Diens nie gedefinieer nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
-msgstr ""
+msgstr "Word nie deur gasheer ondersteun nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
-msgstr ""
+msgstr "Word nie deur kliënt ondersteun nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
-msgstr ""
+msgstr "Deur kliënt geweier"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
-msgstr ""
+msgstr "Antwoord te groot"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
-msgstr ""
+msgstr "Gebruiker tydelik nie beskikbaar nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
-msgstr ""
+msgstr "Versoek dubbelsinnig"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:327
+#: ../libpurple/protocols/oscar/oscar.c:329
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -10128,159 +6398,179 @@ msgid ""
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:438
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
+#: ../pidgin/gtkutils.c:2357
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Vriendikoon"
+
+#: ../libpurple/protocols/oscar/oscar.c:623
 msgid "Voice"
-msgstr ""
+msgstr "Stem"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:626
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
-msgstr ""
+msgstr "Gesels"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:632
+#: ../libpurple/protocols/oscar/oscar.c:5955
 msgid "Get File"
-msgstr ""
+msgstr "Kry lêer"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:639
 msgid "Games"
-msgstr ""
+msgstr "Speletjies"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Add-Ins"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Send Buddy List"
-msgstr ""
+msgstr "Stuur vriendelys"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:651
 msgid "AP User"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:654
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Nihilist"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "ICQ UTF8"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "Hiptop"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Security Enabled"
-msgstr ""
+msgstr "Sekuriteit geaktiveer"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "Video Chat"
-msgstr ""
+msgstr "Videogesels"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "iChat AV"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Live Video"
-msgstr ""
+msgstr "Lewende video"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Camera"
-msgstr ""
+msgstr "Kammera"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Beskikbaar vir gesels"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:710
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Nie beskikbaar nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:712
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Beset"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:716
 msgid "Web Aware"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+msgid "Invisible"
+msgstr "Onsigbaar"
+
+#: ../libpurple/protocols/oscar/oscar.c:720
 msgid "Online"
 msgstr "Aanlyn"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:819
+#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP-adres"
+
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:2854
 msgid "Warning Level"
 msgstr "Waarskuwingvlak"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:836
 msgid "Buddy Comment"
-msgstr ""
+msgstr "Vriendkommentaar"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:976
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:984
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1024
 msgid "Screen name sent"
 msgstr "Skermnaam gestuur"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1029
 msgid "Connection established, cookie sent"
 msgstr ""
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1058
 msgid "Finalizing connection"
 msgstr "Finaliseer verbinding"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1242
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10288,125 +6578,125 @@ msgid ""
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/yahoo/yahoo.c:1929
 msgid "Invalid screen name."
-msgstr ""
+msgstr "Ongeldige skermnaam."
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1035
+#: ../libpurple/protocols/yahoo/yahoo.c:1947
 msgid "Incorrect password."
-msgstr ""
+msgstr "Verkeerde wagwoord."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1348
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
+msgstr "U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
+"weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1388
 msgid "Could Not Connect"
-msgstr ""
+msgstr "Kon nie verbind nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1393
 msgid "Received authorization"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1416
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1430
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1431
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libgaim/protocols/oscar/oscar.c:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5837
-#: ../libgaim/protocols/oscar/oscar.c:6067
-#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
 msgid "_OK"
 msgstr "_Regso"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1471
+#: ../libpurple/protocols/oscar/oscar.c:1514
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr ""
+#: ../libpurple/protocols/oscar/oscar.c:1474
+#: ../libpurple/protocols/oscar/oscar.c:1517
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
 
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1603
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr ""
+#: ../libpurple/protocols/oscar/oscar.c:1606
+msgid "Unable to get a valid login hash."
+msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
 
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1632
 msgid "Password sent"
-msgstr ""
+msgstr "Wagwoord gestuur"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1688
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
-msgstr ""
+msgstr "Magtigingversoek:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
-msgstr ""
+msgstr "Laat my asb. toe!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2271
-#: ../libgaim/protocols/oscar/oscar.c:2278
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#: ../libgaim/protocols/oscar/oscar.c:5197
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "No reason given."
-msgstr ""
+msgstr "Geen rede gegee nie."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2286
 msgid "Authorization Denied Message:"
-msgstr ""
+msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10414,17 +6704,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2414
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10433,7 +6723,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2437
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10442,7 +6732,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2445
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10451,34 +6741,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2466
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr ""
+msgstr "Wil u hierdie vriend by die vriendelys voeg?"
+
+#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Voeg by"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "_Decline"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2560
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2569
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat dit te groot was."
+msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hulle te groot was."
 
-#: ../libgaim/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2578
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10487,289 +6781,277 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2587
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr ""
-
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2760
 #, c-format
 msgid "Unable to send message: %s"
-msgstr ""
+msgstr "Kan nie boodskap stuur nie: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2758
-#: ../libgaim/protocols/oscar/oscar.c:2763
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2765
+#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2831
 msgid "Unknown reason."
-msgstr ""
+msgstr "Onbekende rede."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr ""
+msgstr "Kan nie boodskap aan %s stuur nie:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2827
 #, c-format
 msgid "User information not available: %s"
-msgstr ""
+msgstr "Gebruikerinligting nie beskikbaar nie: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2830
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr ""
+msgstr "Gebruikerinligting vir %s nie beskikbaar nie:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2859
 msgid "Online Since"
-msgstr ""
+msgstr "Aanlyn sedert"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
-msgstr ""
+msgstr "Lid sedert"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2869
 msgid "Capabilities"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Available Message"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2913
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2990
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3177
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3398
 msgid "Rate limiting error."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3399
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3471
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3723
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
-msgstr ""
+msgstr "Selfoon"
 
-#: ../libgaim/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Personal Web Page"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3758
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
-msgstr ""
+msgstr "Ekstra inligting"
 
-#: ../libgaim/protocols/oscar/oscar.c:3766
-#: ../libgaim/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Zip Code"
-msgstr ""
+msgstr "Poskode"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Division"
-msgstr ""
+msgstr "Afdeling"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Position"
-msgstr ""
+msgstr "Posisie"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Web Page"
-msgstr ""
+msgstr "Webblad"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Work Information"
-msgstr ""
+msgstr "Werkinligting"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3919
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Screen name"
 msgstr "Skermnaam"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3971
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3946
+#: ../libpurple/protocols/oscar/oscar.c:3973
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3977
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3980
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
+msgid "The e-mail address for %s is %s"
+msgstr "Die e-posadres vir %s is %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4037
 msgid "Account Info"
-msgstr ""
+msgstr "Rekeninginligting"
 
-#: ../libgaim/protocols/oscar/oscar.c:4014
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:4189
+#: ../libpurple/protocols/oscar/oscar.c:4210
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4462
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4463
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
+#: ../libpurple/protocols/oscar/oscar.c:4477
 #, c-format
 msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated it for you."
 msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Profile too long."
-msgstr ""
+msgstr "Profiel te lank."
 
-#: ../libgaim/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4527
 #, c-format
 msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4510
+#: ../libpurple/protocols/oscar/oscar.c:4532
 msgid "Away message too long."
-msgstr ""
+msgstr "Weg-boodskap te lank."
 
-#: ../libgaim/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:4601
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10777,45 +7059,44 @@ msgid ""
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4581
-#: ../libgaim/protocols/oscar/oscar.c:5004
-#: ../libgaim/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5042
 msgid "Unable To Add"
-msgstr ""
+msgstr "Kan nie byvoeg nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid "Unable To Retrieve Buddy List"
-msgstr ""
+msgstr "Kan nie vriendelys kry nie"
 
-#: ../libgaim/protocols/oscar/oscar.c:4686
+#: ../libpurple/protocols/oscar/oscar.c:4708
 msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4890
-#: ../libgaim/protocols/oscar/oscar.c:4891
-#: ../libgaim/protocols/oscar/oscar.c:4896
-#: ../libgaim/protocols/oscar/oscar.c:5072
-#: ../libgaim/protocols/oscar/oscar.c:5073
-#: ../libgaim/protocols/oscar/oscar.c:5078
+#: ../libpurple/protocols/oscar/oscar.c:4913
+#: ../libpurple/protocols/oscar/oscar.c:4914
+#: ../libpurple/protocols/oscar/oscar.c:4919
+#: ../libpurple/protocols/oscar/oscar.c:5096
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5102
 msgid "Orphans"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
 msgid "(no name)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5040
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10823,29 +7104,29 @@ msgid ""
 "buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5133
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
-msgstr ""
+msgstr "Magtiging gegee"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5217
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5218
 msgid "Authorization Granted"
-msgstr ""
+msgstr "Magtiging toegestaan"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10853,768 +7134,774 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5222
 msgid "Authorization Denied"
-msgstr ""
+msgstr "Magtiging geweier"
 
-#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5298
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5368
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5516
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Away Message"
 msgstr "Weg-boodskap"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "<i>(retrieving)</i>"
+msgstr "<i>(verkry tans)</i>"
+
+#: ../libpurple/protocols/oscar/oscar.c:5722
+msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr ""
+msgstr "Vriendkommentaar vir %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
-msgstr ""
+msgstr "Vriendkommentaar:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5877
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get AIM Info"
-msgstr ""
+msgstr "Kry AIM-inligting"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5926
 msgid "Edit Buddy Comment"
-msgstr ""
+msgstr "Wysig vriendkommentaar"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libpurple/protocols/oscar/oscar.c:5947
 msgid "Direct IM"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5969
 msgid "Re-request Authorization"
-msgstr ""
+msgstr "Herversoek magtiging"
 
-#: ../libgaim/protocols/oscar/oscar.c:6032
+#: ../libpurple/protocols/oscar/oscar.c:6028
 msgid "Require authorization"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6040
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "ICQ Privacy Options"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6053
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6054
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6065
-msgid "New screen name formatting:"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:6121
+#: ../libpurple/protocols/oscar/oscar.c:6107
 msgid "Change Address To:"
-msgstr ""
+msgstr "Verander adres na:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6152
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6169
+#: ../libpurple/protocols/oscar/oscar.c:6155
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6170
+#: ../libpurple/protocols/oscar/oscar.c:6156
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6173
 msgid "Find Buddy by E-Mail"
-msgstr ""
+msgstr "Vind vriend volgens e-pos"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6174
 msgid "Search for a buddy by e-mail address"
-msgstr ""
+msgstr "Soek vir 'n vriend volgens e-posadres"
 
-#: ../libgaim/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6175
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr ""
+msgstr "Gee die e-posadres van die vriend waarvoor u soek."
 
-#: ../libgaim/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6178
 msgid "_Search"
 msgstr "_Soek"
 
-#: ../libgaim/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
-msgstr ""
+msgstr "Stel gebruikerinligting (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
-msgstr ""
+msgstr "Verander wagwoord (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set Privacy Options..."
-msgstr ""
+msgstr "Stel privaatheidkeuses..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6393
-msgid "Format Screen Name..."
-msgstr "Formatteer skermnaam..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
 
-#: ../libgaim/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
-msgstr ""
+msgstr "Wys e-posadres wat tans geregistreer is"
 
-#: ../libgaim/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
-msgstr ""
+msgstr "Verander e-posadres wat tans geregistreer is..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6412
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
-msgstr ""
+msgstr "Wys vriende wat op magtiging wag"
 
-#: ../libgaim/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
-msgstr ""
+msgstr "Soek vir vriend met e-posadres..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
-msgstr ""
+msgstr "Soek vir vriend met inligting"
 
-#: ../libgaim/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6494
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Show how long you have been idle"
+msgstr "Wys hoe lank u ledig was"
+
+#: ../libpurple/protocols/oscar/oscar.c:6628
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1020
 msgid "_Connect"
-msgstr ""
+msgstr "_Verbind"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
-msgstr ""
+msgstr "Persoonlike inleiding"
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
-msgstr ""
+msgstr "E-pos"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
-msgstr ""
+msgstr "Poskode"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:506
 msgid "Your information has been updated"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:565
 msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
+"Setting custom faces is not currently supported. Please choose an image from "
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:582
+#: ../libpurple/protocols/qq/buddy_info.c:595
 msgid "Invalid QQ Face"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:210
 msgid "Reject request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#: ../libpurple/protocols/qq/buddy_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:139
 msgid "Sorry, you are not my type..."
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:136
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_opt.c:125
+#: ../libpurple/protocols/qq/sys_msg.c:85
+#: ../libpurple/protocols/qq/sys_msg.c:228
 msgid "Reject"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:272
 msgid "Add buddy with auth request fails"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:303
 msgid "You have successfully removed a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:331
 msgid "You have successfully removed yourself from a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:395
 #, c-format
 msgid "User %d needs authentication"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/buddy_opt.c:399
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Send"
 msgstr "Stuur"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:503
 msgid "QQid Error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:504
 msgid "Invalid QQid"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:120
+#: ../libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:122
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:123
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:123
+#: ../libpurple/protocols/qq/group_im.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:180
 #, c-format
 msgid "Reason: %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:130
-#: ../libgaim/protocols/qq/group_im.c:174
-#: ../libgaim/protocols/qq/group_im.c:214
-#: ../libgaim/protocols/qq/group_im.c:249
-#: ../libgaim/protocols/qq/group_im.c:283
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:130
+#: ../libpurple/protocols/qq/group_im.c:174
+#: ../libpurple/protocols/qq/group_im.c:214
+#: ../libpurple/protocols/qq/group_im.c:249
+#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:355
+#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:386
 msgid "QQ Qun Operation"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:133
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:87
+#: ../libpurple/protocols/qq/sys_msg.c:230
 msgid "Approve"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:171
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:212
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:248
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:282
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:283
 msgid "This group has been added to your buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:229
 msgid "You have successfully exited the group"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:253
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:254
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:325
 msgid "You inputted a group id outside the acceptable range"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:356
 msgid "Are you sure to exit this Qun?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:361
 msgid "Go ahead"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:84
 msgid "Do you wanna approve the request?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:230
 msgid "You have successfully modify Qun member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:300
 msgid "You have successfully modify Qun information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:387
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:389
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "Setup"
 msgstr ""
 
-#: ../libgaim/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:423
 msgid "System Message"
-msgstr ""
+msgstr "Stelselboodskap"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:567
 msgid "Server ACK"
 msgstr ""
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:567
 msgid "Send IM fail\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2375
+#: ../libpurple/protocols/yahoo/yahoo.c:2403
+#: ../libpurple/protocols/yahoo/yahoo.c:2510
+#: ../libpurple/protocols/yahoo/yahoo.c:2531
+#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Kan nie verbind nie."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Onbekend-%d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
-msgstr ""
+msgstr "%s-adres"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
-msgstr "Vlak "
+msgstr "Vlak"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
-msgstr ""
+msgstr "QQ: Beskikaar"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
-msgstr ""
+msgstr "QQ: Weg"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
-msgstr ""
+msgstr "QQ: Onsigbaar"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
-msgstr ""
+msgstr "QQ: Aflyn"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
-msgstr ""
+msgstr "Ongeldige naam"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:456
 msgid "Login Information"
-msgstr ""
+msgstr "Aanmeldinligting"
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
-msgstr ""
+msgstr "Verander wagwoord"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr ""
 
@@ -11628,273 +7915,274 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
 msgid "QQ Protocol\tPlugin"
-msgstr ""
+msgstr "QQ-protokol-\tinprop"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:740
 msgid "Login in TCP"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:743
 msgid "Login Hidden"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
-msgstr ""
+msgstr "Verbinding gewyer"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
-msgstr ""
+msgstr "Sokfout"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
-msgstr ""
+msgstr "%d het die oordrag van %s gekanselleer"
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "Verbinding verloor"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:103
 msgid "Do you wanna add this buddy?"
 msgstr ""
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:158
 msgid "Would like to add him?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:164
 #, c-format
 msgid "%s has added you [%s]"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:222
+#: ../libpurple/protocols/qq/sys_msg.c:222
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Would you like to add him?"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
+#, fuzzy
 msgid "Connected"
-msgstr ""
+msgstr "Verbind"
 
-#: ../libgaim/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr ""
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3724
 msgid "Unable to connect to host"
-msgstr ""
+msgstr "Kon nie aan gasheer verbind nie"
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
-msgstr ""
+msgstr "Kan nie boodskap stuur nie: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2960
 msgid "Place Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
-msgstr ""
+msgstr "Lêeroordrag"
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4144
 msgid "Supports"
 msgstr "Ondersteun"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4118
 msgid "External User"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11902,150 +8190,154 @@ msgid ""
 "this user to."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3492
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3582
+#: ../libpurple/protocols/sametime/sametime.c:3561
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3566
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+msgid "Topic:"
+msgstr "Onderwerp:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3635
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3640
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4134
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4136
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4300
+#: ../libpurple/protocols/sametime/sametime.c:5495
 msgid "User Name"
 msgstr "Gebruikernaam"
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4303
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4327
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4328
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4333
 msgid "Select User"
 msgstr "Kies gebruiker"
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4417
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4419
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4424
 msgid "Unable to add user"
-msgstr ""
+msgstr "Kan nie gebruiker byvoeg nie"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5010
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5145
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5150
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5153
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5208
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5247
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5300
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5433
 msgid "Unable to add group"
-msgstr ""
+msgstr "Kan nie groep byvoeg nie"
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5379
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5380
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12053,37 +8345,37 @@ msgid ""
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5385
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5429
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5470
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5471
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5519
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5520
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12091,113 +8383,124 @@ msgid ""
 "buttons below."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "Soekresultate"
+
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "No matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5553
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5594
 msgid "Search for a user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5595
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5598
 msgid "User Search"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "User Search..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5719
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5729
 msgid "Hide client identity"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:420
+#: ../libpurple/protocols/silc/buddy.c:545
+#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12205,308 +8508,342 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:387
+#: ../libpurple/protocols/silc/buddy.c:422
+#: ../libpurple/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:512
+#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
-msgstr ""
+msgstr "Kry publieke sleutel"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:634
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
-msgstr ""
+msgstr "Gebruikerinligting"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kon nie gebruikerinligting kry nie"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "Voer _in..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Kies die regte gebruiker"
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Maak my wakker"
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktief"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Gelukkig"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Ongelukkig"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Kwaad"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Skaam"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Onoorwinlik"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Verlief"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Vaak"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Verveeld"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Opgewonde"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Besorgd"
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Bui"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Voorkeurtaal"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Toestel"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Tydsone"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografiese ligging"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Kry publieke sleutel..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1670
+#: ../libpurple/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Teken op witbord"
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanaal %s bestaan nie in die netwerk nie"
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Kanaalinligting"
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan nie kanaaninligting kry nie"
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr ""
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Open publieke sleutel..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12515,317 +8852,333 @@ msgid ""
 "able to join."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:421
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:459
+#: ../libpurple/protocols/silc/chat.c:460
+#: ../libpurple/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Voeg by / verwyder"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Groepnaam"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:582
+#: ../libpurple/protocols/silc/ops.c:1909
+#: ../libpurple/protocols/silc/silc.c:938
 msgid "Passphrase"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Gebruikerlimiet"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Uitnodigings"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Bannelinge"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Stel gebruikerlimiet"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1294
+#: ../libpurple/protocols/silc/silc.c:1146
 msgid "Call Command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1294
+#: ../libpurple/protocols/silc/silc.c:1146
 msgid "Cannot call command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1295
+#: ../libpurple/protocols/silc/silc.c:1147
 msgid "Unknown command"
-msgstr ""
+msgstr "Onbekende opdrag"
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Beveiligde lêeroordrag"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Fout tydens lêeroordrag"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Toestemming gewyer"
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Lêeroordrag reeds begin"
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan nie lêer stuur nie"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
+#, fuzzy
 msgid "You have been killed by %s (%s)"
-msgstr ""
+msgstr "U is uitgeskop deur %s: (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
+#, fuzzy
 msgid "Killed by %s (%s)"
-msgstr ""
+msgstr "Uitgeskop deur %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Persoonlike inligting"
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Verjaardag"
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:931
 msgid "Organization"
 msgstr "Organisasie"
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Eenheid"
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Sluit by geselskap aan"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Regte naam"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Statusteks"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Meer..."
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:997
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan nie onderwerp stel nie"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
-msgstr ""
+msgstr "Verandering van bynaam het misluk"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Kamerlys"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan nie kamerlys kry nie"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
-msgstr ""
+msgstr "Geen publieke sleutel is ontvang nie"
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Bedienerinligting"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan nie bedienerinligting kry nie"
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Bedienerstatistiek"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan nie bedienerstatistiek kry nie"
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "Geen bedienerstatistiek beskikbaar nie"
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12845,113 +9198,115 @@ msgid ""
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netwerk statistiek"
 
-#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1723
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "Hervat sessie"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1910
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1957
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1959
 msgid "Failure: Incorrect signature"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12960,325 +9315,341 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Bekyk..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "Verbinding het misluk"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "Onvoldoende geheue"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr "Naamloos Niemand"
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr ""
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+msgid "Normal"
+msgstr "Normaal"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr "Verlief"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr "Videokonferensie"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "U huidige status"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr "Aanlyndienste"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr "U VCard-lêer"
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/silc.c:739
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:1424
 msgid "Message of the Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:779
 msgid "No Message of the Day available"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:1419
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:947
 msgid "Create New SILC Key Pair"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:831
+#, fuzzy
 msgid "Passphrases do not match"
-msgstr ""
+msgstr "Wagwoorde stem nie ooreen nie."
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:875
 msgid "Key Pair Generation failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:914
 msgid "Key length"
 msgstr "Sleutellengte"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:916
 msgid "Public key file"
 msgstr "Publiekesleutellêer"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:918
 msgid "Private key file"
 msgstr "Privateesleutellêer"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:941
 msgid "Passphrase (retype)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Generate Key Pair"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:992
 msgid "Online Status"
 msgstr "Aanlynstatus"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1001
 msgid "View Message of the Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1005
 msgid "Create SILC Key Pair..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1104
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1295
 msgid "Topic too long"
 msgstr "Onderwerp te lank"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1376
 msgid "You must specify a nick"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1478
 #, c-format
 msgid "channel %s not found"
 msgstr "kanaal %s nie gevind nie"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1483
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaalmodusse vir %s: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "geen kanaalmodusse is gestel op %s nie"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1498
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1534
+#: ../libpurple/protocols/silc/silc.c:1528
 #, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr ""
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Onbekende opdrag: %s, (moontlik 'n kliëntfout)"
 
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1591
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1595
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1599
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1604
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1608
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1612
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1620
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1624
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1628
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1632
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
+msgstr "quit [boodskap]:  Sluit verbinding met bediener, met 'n opsionele boodskap"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1636
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1642
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1646
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1650
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1654
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1658
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1662
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1666
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1670
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1674
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1678
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1682
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1686
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1690
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1694
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1699
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1703
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13293,111 +9664,116 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1814
 msgid "SILC Protocol Plugin"
-msgstr ""
+msgstr "SILC-protokolinprop"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1816
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+msgid "Network"
+msgstr "Netwerk"
+
+#: ../libpurple/protocols/silc/silc.c:1853
 msgid "Public Key file"
 msgstr "Publiekesleutellêer"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1857
 msgid "Private Key file"
 msgstr "Privatesleutellêer"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1867
 msgid "Cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "HMAC"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1880
 msgid "Public key authentication"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1883
 msgid "Reject watching by other users"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1886
 msgid "Block invites"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1889
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1892
 msgid "Reject online status attribute requests"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Gebruikernaam: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-pos: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr ""
+msgstr "Gasheernaam: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisasie: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr ""
+msgstr "Algoritme: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -13405,79 +9781,80 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Publiekesleutelinligting"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferensie"
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "Rekenaar"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "Terminaal"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Witbord"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libgaim/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Kon nie skryf nie"
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "Kon nie verbind nie"
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1516
+#: ../libpurple/protocols/simple/simple.c:1558
+#: ../libpurple/protocols/simple/simple.c:1571
+#: ../libpurple/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 
@@ -13489,245 +9866,236 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1845
 msgid "Use UDP"
-msgstr ""
+msgstr "Gebruik UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "Gebruik instaanbediener"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "Instaanbediener"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Verbinding na %s het misluk"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Aanmelding: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
-msgstr ""
+msgstr "Kan nie lêer %s skryf nie."
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
-msgstr ""
+msgstr "Kan nie lêer %s lees nie."
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr ""
+msgstr "Boodskap te lank, laaste %s grepe afgekap."
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nie tans aanmeld nie."
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
+msgstr "'n Boodskap is laat val, u oorskry die bediener se spoedgrens."
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Geselsie in %s is nie beskikbaar nie."
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "U stuur te vinnig boodskappe aan %s."
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr ""
+msgstr "U het 'n kitsboodskap vanaf %s gemis omdat dit te groot was."
 
-#: ../libgaim/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
+msgstr "U het 'n kitsboodskap vanaf %s gemis omdat dit te vinnig gestuur is."
 
-#: ../libgaim/protocols/toc/toc.c:518
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Mislukking."
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
-msgstr ""
+msgstr "Te veel wat pas."
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
-msgstr ""
+msgstr "Gidsdiens is tydelik nie beskikbaar nie."
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Sleutelwoord geïgnoreer."
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Geen sleutelwoorde."
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
-msgstr ""
+msgstr "Gebruiker het geen gidsinliging nie."
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Land nie ondersteun nie."
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Onbekende mislukking: %s."
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
-msgstr ""
+msgstr "Verkeerde skermnaam of wagwoord."
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Die diens is tydelik nie beskikbaar nie."
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:558
+#: ../libpurple/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
+"U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
+"weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr ""
+msgstr "'n Onbekende aanmeldfout het voorgekom: %s."
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Ongeldige groepnaam"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Verbinding gesluit"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Wag vir antwoord..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Wagwoord suksesvol verander"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr ""
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "_Groep:"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Kry gidsinligting"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Stel gidsinligting"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:2095
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - Stoor as..."
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Stoor as..."
 
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/toc/toc.c:2236
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vra dat u hulle 'n lêer stuur"
@@ -13742,213 +10110,206 @@ msgstr "%s vra dat u hulle 'n lêer stuur"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolinprop"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:805
 msgid "Your Yahoo! message did not get sent."
 msgstr "U Yahoo!-boodskap is nie gestuur nie."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr ""
+#: ../libpurple/protocols/yahoo/yahoo.c:875
+#, fuzzy, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s wil aan u 'n lêer stuur"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "Authorization denied message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1064
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1821
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 msgid "Ignore buddy?"
 msgstr "Ignoreer vriend?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2007
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2461
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2485
+#: ../libpurple/protocols/yahoo/yahoo.c:2664
+#: ../libpurple/protocols/yahoo/yahoo.c:2768
+#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3486
 msgid "Not at Home"
 msgstr "Nie tuis nie"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3489
 msgid "Not at Desk"
 msgstr "Nie by die lessenaar nie"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Not in Office"
 msgstr "Nie op kantoor nie"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
 msgid "On Vacation"
 msgstr "Op vakansie"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Stepped Out"
 msgstr "Uit"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
+#: ../libpurple/protocols/yahoo/yahoo.c:3015
 msgid "Not on server list"
 msgstr "Nie op bedienerlys nie"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3032
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
 msgid "Appear Online"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3035
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3053
 msgid "Presence"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3105
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#, fuzzy
 msgid "Join in Chat"
-msgstr ""
+msgstr "Sluit by gesprek aan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Initiate Conference"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3187
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#: ../libpurple/protocols/yahoo/yahoo.c:3225
 msgid "Active which ID?"
 msgstr "Aktiveer watter ID?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
 msgid "Join who in chat?"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
 msgid "Activate ID..."
 msgstr "Aktiveer ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
 msgid "Join User in Chat..."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3755
+msgid "You have just sent a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3814
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13962,345 +10323,346 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4023
+#: ../libpurple/protocols/yahoo/yahoo.c:4025
 msgid "Yahoo Protocol Plugin"
-msgstr ""
+msgstr "Inprop vir die Yahoo-protokol"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4045
 msgid "Pager server"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4051
 msgid "Pager port"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "File transfer server"
 msgstr "Lêeroordragbediener"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4057
 msgid "Japan file transfer server"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4060
 msgid "File transfer port"
-msgstr ""
+msgstr "Lêeroordragpoort"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4063
 msgid "Chat room locale"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4066
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Chat room list URL"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Yahoo Chat server"
 msgstr "Yahoo-geselsbediener"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Yahoo Chat port"
-msgstr ""
+msgstr "Yahoo-geselspoort"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Uitnodiging van die hand gewys"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
-msgstr ""
+msgstr "Aansluit by geselsie het misluk"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Onbekende kamer"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Miskien is die kamer vol"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Nie beskikbaar nie"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr "Stemme"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr "Webkameras"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "Gebruikerkamers"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr ""
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
 msgid "Write Error"
 msgstr "Skryffout"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profiel"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Stokperdjies"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Jongste nuus"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Tuisblad"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Laaste opdatering"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Gebruikerinligting vir %s nie beskikbaar nie"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "Die gebruiker se profiel is leeg."
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
 "%s"
-msgstr ""
+msgstr "Verbinding met bediener verloor\n"
+"%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1203
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1209
 msgid "Hidden or not logged-in"
 msgstr "Versteek of nie aangemeld nie"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1211
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1546
-#: ../libgaim/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1545
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
 msgid "Anyone"
 msgstr "Enigeen"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2353
 msgid "_Class:"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2689
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2694
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2699
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -14314,111 +10676,112 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2939
+#: ../libpurple/protocols/zephyr/zephyr.c:2941
 msgid "Zephyr Protocol Plugin"
-msgstr ""
+msgstr "Inprop vir die Zephyr-protokol"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2960
 msgid "Use tzc"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2963
 msgid "tzc command"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2966
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2969
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Realm"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Exposure"
 msgstr ""
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
-msgstr ""
+msgstr "Kan nie sok skep nie:\n"
+"%s"
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 
-#: ../libgaim/proxy.c:984
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libgaim/proxy.c:1676
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
 msgstr ""
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 msgid "_No"
 msgstr "_Nee"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1360
 msgid "_Accept"
 msgstr "_Aanvaar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Ek's nie hier op die oomblik nie"
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:526
 msgid "saved statuses"
-msgstr ""
+msgstr "gestoorde statusse"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s staan nou bekend as %s.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:670
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14427,156 +10790,4350 @@ msgstr ""
 "%s het %s uitgenooi na geselskamer %s:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:675
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr ""
+msgstr "%s het %s na die geselskamer %s uitgenooi\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:679
 msgid "Accept chat invitation?"
 msgstr "Aanvaar geselsuitnodiging?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr ""
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:156
 msgid "Unavailable"
 msgstr "Nie beskikbaar"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
-msgstr ""
+msgstr "%s het van status %s na %s verander"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s is nou %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s is nie meer %s nie"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s het ledig geraak"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s het besig geword"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s het ledig geword"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s het besig geword"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2442
 #, c-format
 msgid "Error Reading %s"
-msgstr ""
+msgstr "Fout met lees van %s"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2443
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2906
 msgid "Calculating..."
 msgstr "Bereken..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2909
 msgid "Unknown."
-msgstr ""
+msgstr "Onbekend."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:2935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekonde"
 msgstr[1] "%d sekondes"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:2947
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dae"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:2955
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d uur"
 msgstr[1] "%s, %d ure"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:2961
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d ure"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:2969
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuut"
 msgstr[1] "%s, %d minute"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:2975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minute"
 
-#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
+#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan nie verbind aan %s nie"
 
-#: ../libgaim/util.c:3292
+#: ../libpurple/util.c:3368
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libgaim/util.c:3327
+#: ../libpurple/util.c:3403
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3434
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3459
 #, c-format
 msgid "Unable to connect to %s: %s"
+msgstr "Kan nie verbind aan %s nie: %s"
+
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Internetboodskapper"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin Internetboodskapper"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Stuur kitsboodskappe oor veelvoudige protokolle"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Oriëntasie"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Die oriëntasie van die laai."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:390
+msgid "Login Options"
+msgstr "Aanmeldkeuses"
+
+#: ../pidgin/gtkaccount.c:492
+msgid "Local alias:"
+msgstr "Plaaslike alias:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:554
+msgid "User Options"
+msgstr "Gebruikerkeuses"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:572
+msgid "Use this buddy icon for this account:"
+msgstr "Gebruik hierdie vriendikoon vir hierdie rekening:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:684
+#, c-format
+msgid "%s Options"
+msgstr "%s-keuses"
+
+#: ../pidgin/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "Gebruik GNOME se instaaninstellings"
+
+#: ../pidgin/gtkaccount.c:882
+msgid "Use Global Proxy Settings"
+msgstr "Gebruik globale instaaninstellings"
+
+#: ../pidgin/gtkaccount.c:888
+msgid "No Proxy"
+msgstr "Geen instaanbediener"
+
+#: ../pidgin/gtkaccount.c:894
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:900
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:906
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "Gebruik omgewinginstellings"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:951
+msgid "If you look real closely"
+msgstr "As mens stip kyk,"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:954
+msgid "you can see the butterflies mating"
+msgstr "kan mens skoenlappers sien paar"
+
+#: ../pidgin/gtkaccount.c:975
+msgid "Proxy Options"
+msgstr "Instaankeuses"
+
+#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "Instaan_tipes:"
+
+#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Gasheer:"
+
+#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "_Poort:"
+
+#: ../pidgin/gtkaccount.c:1010
+msgid "_Username:"
+msgstr "_Gebruikernaam:"
+
+#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "_Wagwoord:"
+
+#: ../pidgin/gtkaccount.c:1428
+msgid "Add Account"
+msgstr "Voeg rekening by"
+
+#: ../pidgin/gtkaccount.c:1452
+msgid "_Basic"
+msgstr "_Eenvoudig"
+
+#: ../pidgin/gtkaccount.c:1463
+msgid "_Advanced"
+msgstr "_Gevorderd"
+
+#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+msgid "Enabled"
+msgstr "Geaktiveer"
+
+#: ../pidgin/gtkaccount.c:1961
+msgid "Protocol"
+msgstr "Protokol"
+
+#: ../pidgin/gtkaccount.c:2144
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>Welkom by %s!</span>\n"
+"\n"
+""
+"Daar is nog geen kletsrekeninge opgestel nie. Om met %s te kan verbind, "
+"druk op die <b>Voeg by</b>-knoppie hier onder en stel die eerste rekening "
+""
+"op. Indien u %s vir verskeie rekeninge wil gebruik, druk weer <b>Voeg by</"
+"b> om elkeen op te stel.\n"
+"\n"
+"U kan na hierdie venster terugkeer in die Vriendelys-venster by <b>Rekeninge-"
+">Voeg by / wysig</b> om rekeninge by te voeg, te wysig of te verwyder."
+
+#: ../pidgin/gtkblist.c:704
+msgid "Join a Chat"
+msgstr "Sluit by gesprek aan"
+
+#: ../pidgin/gtkblist.c:725
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Gee asb. die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
+
+#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "_Rekening:"
+
+#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Blokkeer"
+
+#: ../pidgin/gtkblist.c:1010
+msgid "Un_block"
 msgstr ""
 
+#: ../pidgin/gtkblist.c:1061
+msgid "Get _Info"
+msgstr "_Inligting"
+
+#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+msgid "I_M"
+msgstr "_Kitsklets"
+
+#: ../pidgin/gtkblist.c:1070
+msgid "_Send File"
+msgstr "_Stuur lêer"
+
+#: ../pidgin/gtkblist.c:1077
+msgid "Add Buddy _Pounce"
+msgstr "Voeg vriend_wag by"
+
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
+#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+msgid "View _Log"
+msgstr "Bekyk _staaflêer"
+
+#: ../pidgin/gtkblist.c:1097
+msgid "Alias..."
+msgstr "Alias..."
+
+#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1213
+msgid "_Alias..."
+msgstr "_Alias..."
+
+#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
+#: ../pidgin/gtkblist.c:1215
+msgid "_Remove"
+msgstr "_Verwyder"
+
+#: ../pidgin/gtkblist.c:1155
+msgid "Add a _Buddy"
+msgstr "Voeg 'n _vriend by"
+
+#: ../pidgin/gtkblist.c:1157
+msgid "Add a C_hat"
+msgstr "Voeg 'n _gesprek by"
+
+#: ../pidgin/gtkblist.c:1160
+msgid "_Delete Group"
+msgstr "_Vee groep uit"
+
+#: ../pidgin/gtkblist.c:1162
+msgid "_Rename"
+msgstr "_Hernoem"
+
+#. join button
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+msgid "_Join"
+msgstr "_Sluit aan"
+
+#: ../pidgin/gtkblist.c:1182
+msgid "Auto-Join"
+msgstr "Outoaansluit"
+
+#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+msgid "_Collapse"
+msgstr "_Vou toe"
+
+#: ../pidgin/gtkblist.c:1248
+msgid "_Expand"
+msgstr "_Vou oop"
+
+#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
+#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+msgid "/Tools/Mute Sounds"
+msgstr "Demp klanke"
+
+#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
+#: ../pidgin/gtkpounce.c:421
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2757
+msgid "/_Buddies"
+msgstr "/_Vriende"
+
+#: ../pidgin/gtkblist.c:2758
+msgid "/Buddies/New Instant _Message..."
+msgstr "Nuwe _kitsboodskap..."
+
+#: ../pidgin/gtkblist.c:2759
+msgid "/Buddies/Join a _Chat..."
+msgstr "Sluit by _geselsie aan..."
+
+#: ../pidgin/gtkblist.c:2760
+msgid "/Buddies/Get User _Info..."
+msgstr "Kry gebruiker_inligting..."
+
+#: ../pidgin/gtkblist.c:2761
+msgid "/Buddies/View User _Log..."
+msgstr "Bekyk gebruiker se staaf_lêer..."
+
+#: ../pidgin/gtkblist.c:2763
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "Wys a_flynvriende"
+
+#: ../pidgin/gtkblist.c:2764
+msgid "/Buddies/Show _Empty Groups"
+msgstr "Wys _leë groepe"
+
+#: ../pidgin/gtkblist.c:2765
+msgid "/Buddies/Show Buddy _Details"
+msgstr "Wys vriend_detail"
+
+#: ../pidgin/gtkblist.c:2766
+msgid "/Buddies/Show Idle _Times"
+msgstr "Wys ledige _tye"
+
+#: ../pidgin/gtkblist.c:2767
+msgid "/Buddies/_Sort Buddies"
+msgstr "_Sorteer vriende"
+
+#: ../pidgin/gtkblist.c:2769
+msgid "/Buddies/_Add Buddy..."
+msgstr "Voeg _vriend by..."
+
+#: ../pidgin/gtkblist.c:2770
+msgid "/Buddies/Add C_hat..."
+msgstr "Voeg gese_lsie by..."
+
+#: ../pidgin/gtkblist.c:2771
+msgid "/Buddies/Add _Group..."
+msgstr "Voeg _groep by..."
+
+#: ../pidgin/gtkblist.c:2773
+msgid "/Buddies/_Quit"
+msgstr "_Sluit af"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2776
+msgid "/_Accounts"
+msgstr "/_Rekeninge"
+
+#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+msgid "/Accounts/Add\\/Edit"
+msgstr "Voeg by \\/ wysig"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2780
+msgid "/_Tools"
+msgstr "/_Gereedskap"
+
+#: ../pidgin/gtkblist.c:2781
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Gereedskap/Vriend_wagte"
+
+#: ../pidgin/gtkblist.c:2782
+msgid "/Tools/Plu_gins"
+msgstr "/Gereedskap/_Inproppe"
+
+#: ../pidgin/gtkblist.c:2783
+msgid "/Tools/Pr_eferences"
+msgstr "/Gereedskap/_Voorkeure"
+
+#: ../pidgin/gtkblist.c:2784
+msgid "/Tools/Pr_ivacy"
+msgstr "/Gereedskap/_Privaatheid"
+
+#: ../pidgin/gtkblist.c:2786
+msgid "/Tools/_File Transfers"
+msgstr "/Gereedskap/_Lêeroordragte"
+
+#: ../pidgin/gtkblist.c:2787
+msgid "/Tools/R_oom List"
+msgstr "/Gereedskap/_Kamerlys"
+
+#: ../pidgin/gtkblist.c:2788
+msgid "/Tools/System _Log"
+msgstr "Stelselstaaf_lêer"
+
+#: ../pidgin/gtkblist.c:2790
+msgid "/Tools/Mute _Sounds"
+msgstr "Demp _klanke"
+
+#. Help
+#: ../pidgin/gtkblist.c:2793
+msgid "/_Help"
+msgstr "/_Hulp"
+
+#: ../pidgin/gtkblist.c:2794
+msgid "/Help/Online _Help"
+msgstr "/Hulp/_Hulp aanlyn"
+
+#: ../pidgin/gtkblist.c:2795
+msgid "/Help/_Debug Window"
+msgstr "_Ontfoutvenster"
+
+#: ../pidgin/gtkblist.c:2796
+msgid "/Help/_About"
+msgstr "/Hulp/_Aangaande"
+
+#: ../pidgin/gtkblist.c:2824
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Rekening:</b> %s"
+
+#: ../pidgin/gtkblist.c:2902
+msgid "Buddy Alias"
+msgstr "Vriendalias"
+
+#: ../pidgin/gtkblist.c:2923
+msgid "Logged In"
+msgstr "Aangemeld"
+
+#: ../pidgin/gtkblist.c:2969
+msgid "Last Seen"
+msgstr "Laas gesien"
+
+#: ../pidgin/gtkblist.c:2989
+msgid "Spooky"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2991
+msgid "Awesome"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2993
+msgid "Rockin'"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3318
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Ledig %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3320
+#, c-format
+msgid "Idle %dm"
+msgstr "Ledig %dm"
+
+#: ../pidgin/gtkblist.c:3457
+msgid "/Buddies/New Instant Message..."
+msgstr "Nuwe kitsboodskap..."
+
+#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+msgid "/Buddies/Join a Chat..."
+msgstr "Sluit by geselskap aan..."
+
+#: ../pidgin/gtkblist.c:3459
+msgid "/Buddies/Get User Info..."
+msgstr "Kry gebruikerinligting..."
+
+#: ../pidgin/gtkblist.c:3460
+msgid "/Buddies/Add Buddy..."
+msgstr "Voeg vriend by..."
+
+#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+msgid "/Buddies/Add Chat..."
+msgstr "Voeg geselsie by..."
+
+#: ../pidgin/gtkblist.c:3462
+msgid "/Buddies/Add Group..."
+msgstr "Voeg groep by..."
+
+#: ../pidgin/gtkblist.c:3497
+msgid "/Tools/Buddy Pounces"
+msgstr "Vriendwagte"
+
+#: ../pidgin/gtkblist.c:3500
+msgid "/Tools/Privacy"
+msgstr "Privaatheid"
+
+#: ../pidgin/gtkblist.c:3503
+msgid "/Tools/Room List"
+msgstr "Kamerlys"
+
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d ongelese boodskap van %s\n"
+msgstr[1] "%d ongelese boodskappe van %s\n"
+
+#: ../pidgin/gtkblist.c:3677
+msgid "Manually"
+msgstr "Handmatig"
+
+#: ../pidgin/gtkblist.c:3679
+msgid "Alphabetically"
+msgstr "Alfabeties"
+
+#: ../pidgin/gtkblist.c:3680
+msgid "By status"
+msgstr "Volgens status"
+
+#: ../pidgin/gtkblist.c:3681
+msgid "By log size"
+msgstr "Volgens staaflêergrootte"
+
+#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s afgesny"
+
+#: ../pidgin/gtkblist.c:3892
+msgid "Re-enable Account"
+msgstr "Heraktiveer rekening"
+
+#: ../pidgin/gtkblist.c:3913
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s afgesny: %s</span>"
+
+#: ../pidgin/gtkblist.c:4066
+msgid "<b>Username:</b>"
+msgstr "<b>Gebruikernaam:</b>"
+
+#: ../pidgin/gtkblist.c:4073
+msgid "<b>Password:</b>"
+msgstr "<b>Wagwoord:</b>"
+
+#: ../pidgin/gtkblist.c:4084
+msgid "_Login"
+msgstr "_Meld aan"
+
+#: ../pidgin/gtkblist.c:4169
+msgid "/Accounts"
+msgstr "/Rekeninge"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4183
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>Welkom by %s!</span>\n"
+"\n"
+"Daar is geen rekeninge geaktiveer nie. Aktiveer die kletsrekeninge by die "
+"<b>Rekeninge</b>-venster by <b>Rekeninge->Voeg by / wysig</b>. Sodra "
+"rekeninge geaktiveer is, kan mens aanmeld, mens se status stel en met "
+"vriende gesels."
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4425
+msgid "/Buddies/Show Offline Buddies"
+msgstr "Wys aflynvriende"
+
+#: ../pidgin/gtkblist.c:4428
+msgid "/Buddies/Show Empty Groups"
+msgstr "Wys leë groepe"
+
+#: ../pidgin/gtkblist.c:4434
+msgid "/Buddies/Show Buddy Details"
+msgstr "Wys vrienddetail"
+
+#: ../pidgin/gtkblist.c:4437
+msgid "/Buddies/Show Idle Times"
+msgstr "Wys ledige tye"
+
+#: ../pidgin/gtkblist.c:5271
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Gee asb. die skermnaam van die persoon wat by die vriendelys gevoeg word. U "
+"kan 'n alias of bynaam vir die vriend gebruik as u wil.  Die alias sal in "
+"die plek van die skermnaam gebruik word wanneer moontlik.\n"
+
+#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Groep:"
+
+#: ../pidgin/gtkblist.c:5590
+msgid "This protocol does not support chat rooms."
+msgstr "Hierdie protokol ondersteun nie gesprekkamers nie."
+
+#: ../pidgin/gtkblist.c:5606
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"U is nie tans aangemeld met enige protokol met geselskapfasiliteit nie."
+
+#: ../pidgin/gtkblist.c:5647
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Gee asb. 'n alias en die geskikte inligting oor die geselsie wat u by die "
+"vriendelys wil voeg.\n"
+
+#: ../pidgin/gtkblist.c:5730
+msgid "Please enter the name of the group to be added."
+msgstr "Gee asb. die naam van die groep om by te voeg."
+
+#: ../pidgin/gtkblist.c:6364
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Rekeninge/"
+
+#: ../pidgin/gtkblist.c:6388
+msgid "_Edit Account"
+msgstr "_Wysig rekening"
+
+#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+msgid "No actions available"
+msgstr "Geen aksies beskikbaar nie"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "_Disable"
+msgstr "_Deaktiveer"
+
+#: ../pidgin/gtkblist.c:6421
+msgid "Enable Account"
+msgstr "Aktiveer rekening"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Rekeninge/Aktiveer rekening"
+
+#: ../pidgin/gtkblist.c:6476
+msgid "/Tools"
+msgstr "Gereedskap"
+
+#: ../pidgin/gtkblist.c:6546
+msgid "/Buddies/Sort Buddies"
+msgstr "Sorteer vriende"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"%s sal eers weer probeer verbind nadat u die fout reggemaak het en die "
+"rekening geheraktiveer het."
+
+#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "Daardie vriend is nie op die selfde protokol as hierdie geselskap nie."
+
+#: ../pidgin/gtkconv.c:802
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"U is nie tans aangemeld met 'n rekening wat daardie vriend kan nooi nie."
+
+#: ../pidgin/gtkconv.c:855
+msgid "Invite Buddy Into Chat Room"
+msgstr "Nooi vriend na geselskamer"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:885
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Gee asb. die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
+"uitnodigingsboodskap."
+
+#: ../pidgin/gtkconv.c:906
+msgid "_Buddy:"
+msgstr "_Vriend:"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
+msgid "_Message:"
+msgstr "_Boodskap:"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Kan nie lêer oopmaak nie."
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Gesprek met %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "Stoor gesprek"
+
+#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+msgid "Find"
+msgstr "Soek"
+
+#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_Soek vir:"
+
+#: ../pidgin/gtkconv.c:1338
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Boekstawing het begin. Boodskappe in hierdie gesprek sal van nou af "
+"geboekstaaf word."
+
+#: ../pidgin/gtkconv.c:1346
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Boekstawing gestop. Boodskappe in hierdie gesprek sal van nou af nie "
+"geboekstaaf word nie."
+
+#: ../pidgin/gtkconv.c:1614
+msgid "Un-Ignore"
+msgstr "On-ignoreer"
+
+#: ../pidgin/gtkconv.c:1617
+msgid "Ignore"
+msgstr "Ignoreer"
+
+#: ../pidgin/gtkconv.c:1637
+msgid "Get Away Message"
+msgstr "Kry Weg-boodskap"
+
+#: ../pidgin/gtkconv.c:1660
+msgid "Last said"
+msgstr "Laaste gesê"
+
+#: ../pidgin/gtkconv.c:2495
+msgid "Unable to save icon file to disk."
+msgstr "Kan nie ikoonlêer op skyf stoor nie."
+
+#: ../pidgin/gtkconv.c:2565
+msgid "Save Icon"
+msgstr "Stoor ikoon"
+
+#: ../pidgin/gtkconv.c:2614
+msgid "Animate"
+msgstr "Animeer"
+
+#: ../pidgin/gtkconv.c:2619
+msgid "Hide Icon"
+msgstr "Versteek ikoon"
+
+#: ../pidgin/gtkconv.c:2622
+msgid "Save Icon As..."
+msgstr "Stoor ikoon as..."
+
+#: ../pidgin/gtkconv.c:2626
+msgid "Set Custom Icon..."
+msgstr "Stel eie ikoon..."
+
+#: ../pidgin/gtkconv.c:2633
+msgid "Remove Custom Icon"
+msgstr "Verwyder eie ikoon"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2774
+msgid "/_Conversation"
+msgstr "/_Gesprek"
+
+#: ../pidgin/gtkconv.c:2776
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Gesprek/Nuwe _kitsboodskap..."
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/_Find..."
+msgstr "/Gesprek/_Vind..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/View _Log"
+msgstr "Bekyk staaf_lêer"
+
+#: ../pidgin/gtkconv.c:2784
+msgid "/Conversation/_Save As..."
+msgstr "/Gesprek/_Stoor as..."
+
+#: ../pidgin/gtkconv.c:2786
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "Maak gesprekvenster skoo_n"
+
+#: ../pidgin/gtkconv.c:2790
+msgid "/Conversation/Se_nd File..."
+msgstr "/Gesprek/S_tuur lêer..."
+
+#: ../pidgin/gtkconv.c:2791
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Gesprek/Voeg vriend_wag by..."
+
+#: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/_Get Info"
+msgstr "/Gesprek/_Kry inligting"
+
+#: ../pidgin/gtkconv.c:2795
+msgid "/Conversation/In_vite..."
+msgstr "/Gesprek/_Nooi uit..."
+
+#: ../pidgin/gtkconv.c:2797
+msgid "/Conversation/M_ore"
+msgstr "/Gesprek/_Meer"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Conversation/Al_ias..."
+msgstr "/Gesprek/_Alias..."
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Conversation/_Block..."
+msgstr "_Blokkeer..."
+
+#: ../pidgin/gtkconv.c:2805
+msgid "/Conversation/_Unblock..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2807
+msgid "/Conversation/_Add..."
+msgstr "/Gesprek/_Voeg by..."
+
+#: ../pidgin/gtkconv.c:2809
+msgid "/Conversation/_Remove..."
+msgstr "/Gesprek/Ve_rwyder..."
+
+#: ../pidgin/gtkconv.c:2814
+msgid "/Conversation/_Close"
+msgstr "/Gesprek/Slui_t"
+
+#. Options
+#: ../pidgin/gtkconv.c:2818
+msgid "/_Options"
+msgstr "/_Keuses"
+
+#: ../pidgin/gtkconv.c:2819
+msgid "/Options/Enable _Logging"
+msgstr "/Keuses/Aktiveer _boekstawing"
+
+#: ../pidgin/gtkconv.c:2820
+msgid "/Options/Enable _Sounds"
+msgstr "/Keuses/Aktiveer _klanke"
+
+#: ../pidgin/gtkconv.c:2821
+msgid "/Options/Show Buddy _Icon"
+msgstr "Wys vriend_ikoon"
+
+#: ../pidgin/gtkconv.c:2823
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Keuses/Wys _formatteringgereedskap"
+
+#: ../pidgin/gtkconv.c:2824
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Keuses/Wys _tydstempels"
+
+#: ../pidgin/gtkconv.c:2899
+msgid "/Conversation/More"
+msgstr "/Gesprek/Meer"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+msgid "/Conversation"
+msgstr "/Gesprek"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/View Log"
+msgstr "/Gesprek/Bekyk staaflêer"
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Send File..."
+msgstr "/Gesprek/Stuur lêer..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Gesprek/Voeg vriendwag by..."
+
+#: ../pidgin/gtkconv.c:3000
+msgid "/Conversation/Get Info"
+msgstr "/Gesprek/Kry inligting"
+
+#: ../pidgin/gtkconv.c:3004
+msgid "/Conversation/Invite..."
+msgstr "/Gesprek/Nooi uit..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Conversation/Alias..."
+msgstr "/Gesprek/Alias..."
+
+#: ../pidgin/gtkconv.c:3014
+msgid "/Conversation/Block..."
+msgstr "/Gesprek/Blokkeer..."
+
+#: ../pidgin/gtkconv.c:3018
+msgid "/Conversation/Unblock..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3022
+msgid "/Conversation/Add..."
+msgstr "/Gesprek/Voeg by..."
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Conversation/Remove..."
+msgstr "/Gesprek/Verwyder..."
+
+#: ../pidgin/gtkconv.c:3030
+msgid "/Options/Enable Logging"
+msgstr "/Keuses/Aktiveer boekstawing"
+
+#: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Sounds"
+msgstr "/Keuses/Aktiveer klanke"
+
+#: ../pidgin/gtkconv.c:3046
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Keuses/Wys formatteringgereedskap"
+
+#: ../pidgin/gtkconv.c:3049
+msgid "/Options/Show Timestamps"
+msgstr "/Keuses/Wys tydstempels"
+
+#: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Buddy Icon"
+msgstr "Wys vriendikoon"
+
+#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+msgid "User is typing..."
+msgstr "Gebruiker tik..."
+
+#: ../pidgin/gtkconv.c:3176
+msgid "User has typed something and stopped"
+msgstr "Gebruiker het iets getik en gestop"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3358
+msgid "_Send To"
+msgstr "_Stuur na"
+
+#: ../pidgin/gtkconv.c:4065
+msgid "_Send"
+msgstr "_Stuur"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4213
+msgid "0 people in room"
+msgstr "0 mense in die kamer"
+
+#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d persoon in kamer"
+msgstr[1] "%d mense in kamer"
+
+#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+msgid "Typing"
+msgstr "Tik"
+
+#: ../pidgin/gtkconv.c:5986
+msgid "Stopped Typing"
+msgstr "Het opgehou tik"
+
+#: ../pidgin/gtkconv.c:5991
+msgid "Nick Said"
+msgstr "Bynaam genoem"
+
+#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "Ongelese boodskappe"
+
+#: ../pidgin/gtkconv.c:6001
+msgid "New Event"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:7122
+msgid "Confirm close"
+msgstr "Bevestig sluiting"
+
+#: ../pidgin/gtkconv.c:7154
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "U het ongelese boodskappe. Wil u definitief die venster toemaak?"
+
+#: ../pidgin/gtkconv.c:7689
+msgid "Close other tabs"
+msgstr "Sluit ander oortjies"
+
+#: ../pidgin/gtkconv.c:7695
+msgid "Close all tabs"
+msgstr "Sluit alle oortjies"
+
+#: ../pidgin/gtkconv.c:7703
+msgid "Detach this tab"
+msgstr "Maak hierdie oortjie los"
+
+#: ../pidgin/gtkconv.c:7709
+msgid "Close this tab"
+msgstr "Sluit hierdie oortjie"
+
+#: ../pidgin/gtkconv.c:8012
+msgid "Close conversation"
+msgstr "Sluit gesprek"
+
+#: ../pidgin/gtkconv.c:8476
+msgid "Last created window"
+msgstr "Laas geskepte venster"
+
+#: ../pidgin/gtkconv.c:8478
+msgid "Separate IM and Chat windows"
+msgstr "Aparte gesprek- en geselsvensters"
+
+#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Nuwe venster"
+
+#: ../pidgin/gtkconv.c:8482
+msgid "By group"
+msgstr "Volgens groep"
+
+#: ../pidgin/gtkconv.c:8484
+msgid "By account"
+msgstr "Volgens rekening"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Stoor ontfoutstaaflêer"
+
+#: ../pidgin/gtkdebug.c:594
+msgid "Invert"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:597
+msgid "Highlight matches"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "Slegs _ikoon"
+
+#: ../pidgin/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "Slegs _teks"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Beide ikoon en teks"
+
+#: ../pidgin/gtkdebug.c:802
+msgid "Filter"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:821
+msgid "Right click for more options."
+msgstr "Klik regs vir meer keuses."
+
+#: ../pidgin/gtkdebug.c:851
+msgid "Level "
+msgstr "Vlak "
+
+#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:860
+msgid "All"
+msgstr "Almal"
+
+#: ../pidgin/gtkdebug.c:861
+msgid "Misc"
+msgstr "Allerlei"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Warning"
+msgstr "Waarskuwing"
+
+#: ../pidgin/gtkdebug.c:864
+msgid "Error "
+msgstr "Fout "
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Fatale fout"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+msgid "lead developer"
+msgstr "hoofprogrammeerder"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+msgid "developer"
+msgstr "programmeerder"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "programmeerder en webmeester"
+
+#: ../pidgin/gtkdialogs.c:84
+msgid "support"
+msgstr "ondersteuning"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:107
+msgid "win32 port"
+msgstr "win32-weergawe"
+
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+msgid "maintainer"
+msgstr "onderhouer"
+
+#: ../pidgin/gtkdialogs.c:110
+msgid "libfaim maintainer"
+msgstr "libfaim-onderhouer"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:112
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:113
+msgid "Jabber developer"
+msgstr "Jabber-programmeerder"
+
+#: ../pidgin/gtkdialogs.c:114
+msgid "original author"
+msgstr "oorspronklike outeur"
+
+#: ../pidgin/gtkdialogs.c:121
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../pidgin/gtkdialogs.c:122
+msgid "Arabic"
+msgstr "Arabies"
+
+#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:205
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+msgid "Bengali"
+msgstr "Bengaals"
+
+#: ../pidgin/gtkdialogs.c:129
+msgid "Bosnian"
+msgstr "Bosnies"
+
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+msgid "Catalan"
+msgstr "Katalaans"
+
+#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+msgid "Valencian-Catalan"
+msgstr "Valensiese Katalaans"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+msgid "Czech"
+msgstr "Tsjeggies"
+
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+msgid "Danish"
+msgstr "Deens"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:209
+msgid "German"
+msgstr "Duits"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+msgid "Dzongkha"
+msgstr "Dzongkha"
+
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+msgid "Greek"
+msgstr "Grieks"
+
+#: ../pidgin/gtkdialogs.c:143
+msgid "Australian English"
+msgstr "Australiaanse Engels"
+
+#: ../pidgin/gtkdialogs.c:144
+msgid "Canadian English"
+msgstr "Kanadese Engels"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "British English"
+msgstr "Britse Engels"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
+msgid "Spanish"
+msgstr "Spaans"
+
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+msgid "Euskera(Basque)"
+msgstr "Baskies"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
+msgid "Persian"
+msgstr "Persies"
+
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+msgid "Finnish"
+msgstr "Fins"
+
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "French"
+msgstr "Frans"
+
+#: ../pidgin/gtkdialogs.c:155
+msgid "Galician"
+msgstr "Galisies"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+msgid "Gujarati"
+msgstr "Gujaraties"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+msgid "Hebrew"
+msgstr "Hebreeus"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../pidgin/gtkdialogs.c:160
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Indonesian"
+msgstr "Indonesies"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+msgid "Italian"
+msgstr "Italiaans"
+
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+msgid "Japanese"
+msgstr "Japannees"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Georgian"
+msgstr "Georgies"
+
+#: ../pidgin/gtkdialogs.c:165
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgid "Korean"
+msgstr "Koreaans"
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:169
+msgid "Kurdish"
+msgstr "Koerdies"
+
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+msgid "Lithuanian"
+msgstr "Litous"
+
+#: ../pidgin/gtkdialogs.c:171
+msgid "Macedonian"
+msgstr "Masedonies"
+
+#: ../pidgin/gtkdialogs.c:172
+msgid "Bokmål Norwegian"
+msgstr "Bokmål-Noorweegs"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Nepali"
+msgstr "Nepalees"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Dutch, Flemish"
+msgstr "Nederlands, Flaams"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Norwegian"
+msgstr "Noorweegs"
+
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgid "Polish"
+msgstr "Pools"
+
+#: ../pidgin/gtkdialogs.c:179
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Portuguese-Brazil"
+msgstr "Portugees-Brasilië"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Pashto"
+msgstr "Pasjtoe"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Romanian"
+msgstr "Romeens"
+
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+msgid "Russian"
+msgstr "Russies"
+
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+msgid "Slovak"
+msgstr "Slowaaks"
+
+#: ../pidgin/gtkdialogs.c:185
+msgid "Slovack"
+msgstr "Slowaaks"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+msgid "Slovenian"
+msgstr "Sloweens"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Albanian"
+msgstr "Albanees"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+msgid "Serbian"
+msgstr "Serwies"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: ../pidgin/gtkdialogs.c:191
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:192
+msgid "Telugu"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Thai"
+msgstr "Thai"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Turkish"
+msgstr "Turks"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Vietnamese"
+msgstr "Viëtnamees"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh en die Gnome-Vi-span"
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+msgid "Simplified Chinese"
+msgstr "Vereenvoudigde Sjinees"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:238
+msgid "Traditional Chinese"
+msgstr "Tradisionele Sjinees"
+
+#: ../pidgin/gtkdialogs.c:204
+msgid "Amharic"
+msgstr "Amharies"
+
+#: ../pidgin/gtkdialogs.c:323
+#, c-format
+msgid "About %s"
+msgstr "Omtrent %s"
+
+#: ../pidgin/gtkdialogs.c:359
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr ""
+"%s is 'n modulêre geselskliënt wat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
+"SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
+"Gadu, en QQ als gelyktydig kan gebruik.  Dit is geskryf met GTK+.<BR><BR>U "
+"mag die program aanpas en herversprei onderhewig aan die voorwaardes van die "
+"GPL (weergawe 2 of later).  'n Kopie van die GPL is bevat in die lêer "
+"'COPYING' wat saam met %s versprei word.  Die kopiereg van %s berus by "
+"sy bydraers.  Sien die lêer 'COPYRIGHT' vir die lys van bydraers.  Ons "
+"verskaf geen waarborg vir hierdie program nie.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:374
+#, fuzzy
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:377
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:383
+msgid "Current Developers"
+msgstr "Huidige programmeerders"
+
+#: ../pidgin/gtkdialogs.c:398
+msgid "Crazy Patch Writers"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:413
+msgid "Retired Developers"
+msgstr "Afgetrede programmeerders"
+
+#: ../pidgin/gtkdialogs.c:428
+msgid "Artists"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:443
+msgid "Current Translators"
+msgstr "Huidige vertalers"
+
+#: ../pidgin/gtkdialogs.c:463
+msgid "Past Translators"
+msgstr "Vorige vertalers"
+
+#: ../pidgin/gtkdialogs.c:481
+msgid "Debugging Information"
+msgstr "Ontfoutinligting"
+
+#: ../pidgin/gtkdialogs.c:855
+msgid "Get User Info"
+msgstr "Kry gebruikerinligting"
+
+#: ../pidgin/gtkdialogs.c:857
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Gee asb. die skermnaam of die alias van die persoon wie se inligting u wil "
+"sien."
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "Bekyk gebruikerstaaflêer"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Gee asb. die skermnaam of die alias van die persoon wie se staaflêer u wil "
+"sien."
+
+#: ../pidgin/gtkdialogs.c:967
+msgid "Alias Contact"
+msgstr "Aliaskontak"
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Enter an alias for this contact."
+msgstr "Gee 'n alias vir hierdie kontak."
+
+#: ../pidgin/gtkdialogs.c:988
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Gee 'n alias vir %s."
+
+#: ../pidgin/gtkdialogs.c:990
+msgid "Alias Buddy"
+msgstr "Aliasvriend"
+
+#: ../pidgin/gtkdialogs.c:1009
+msgid "Alias Chat"
+msgstr "Aliasgeselsie"
+
+#: ../pidgin/gtkdialogs.c:1010
+msgid "Enter an alias for this chat."
+msgstr "Gee 'n alias vir hierdie geselsie."
+
+#: ../pidgin/gtkdialogs.c:1047
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"U staan op die punt om die kontak wat %s en %d ander vriend bevat, uit die "
+"vriendelys te verwyder.  Wil u voortgaan?"
+msgstr[1] ""
+"U staan op die punt om die kontak wat %s en %d ander vriende bevat, uit die "
+"vriendelys te verwyder.  Wil u voortgaan?"
+
+#: ../pidgin/gtkdialogs.c:1055
+msgid "Remove Contact"
+msgstr "Verwyder kontak"
+
+#: ../pidgin/gtkdialogs.c:1056
+msgid "_Remove Contact"
+msgstr "_Verwyder kontak"
+
+#: ../pidgin/gtkdialogs.c:1086
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"U staan op die punt om die groep genaamd %s in die groep genaamd %s te "
+"smeld. Wil u voortgaan?"
+
+#: ../pidgin/gtkdialogs.c:1093
+msgid "Merge Groups"
+msgstr "Versmeld groepe"
+
+#: ../pidgin/gtkdialogs.c:1094
+msgid "_Merge Groups"
+msgstr "_Versmeld groepe"
+
+#: ../pidgin/gtkdialogs.c:1144
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"U staan op die punt om die groep %s en al sy lede uit die vriendelys te "
+"verwyder.  Wil u voortgaan?"
+
+#: ../pidgin/gtkdialogs.c:1147
+msgid "Remove Group"
+msgstr "Verwyder groep"
+
+#: ../pidgin/gtkdialogs.c:1148
+msgid "_Remove Group"
+msgstr "_Verwyder groep"
+
+#: ../pidgin/gtkdialogs.c:1181
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+"U staan op die punt om %s uit die vriendelys te verwyder.  Wil u voortgaan?"
+
+#: ../pidgin/gtkdialogs.c:1184
+msgid "Remove Buddy"
+msgstr "Verwyder vriend"
+
+#: ../pidgin/gtkdialogs.c:1185
+msgid "_Remove Buddy"
+msgstr "_Verwyder vriend"
+
+#: ../pidgin/gtkdialogs.c:1206
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"U gaan nou die geselsie %s uit die vriendelys verwyder.  Wil u voortgaan?"
+
+#: ../pidgin/gtkdialogs.c:1209
+msgid "Remove Chat"
+msgstr "Verwyder geselsie"
+
+#: ../pidgin/gtkdialogs.c:1210
+msgid "_Remove Chat"
+msgstr "_Verwyder geselsie"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr "Klik regs vir nog ongelese boodskappe...\n"
+
+#: ../pidgin/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "Verander status"
+
+#: ../pidgin/gtkdocklet.c:495
+msgid "Show Buddy List"
+msgstr "Wys vriendelys"
+
+#: ../pidgin/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "Nuwe boodskap..."
+
+#: ../pidgin/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "Demp klanke"
+
+#: ../pidgin/gtkdocklet.c:543
+msgid "Blink on new message"
+msgstr "Flikker met nuwe boodskap"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:554
+msgid "Quit"
+msgstr "Sluit af"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Nie begin nie"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Ontvang as:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Ontvang vanaf:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Stuur aan:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Stuur as:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "Daar is geen toepassing opgestel om hierdie lêertipe oop te maak nie."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "'n Fout het voorgekom met die oopmaak van die lêer."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr ""
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Fout met uitvoer van %s"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "Proses het foutkode %d teruggegee"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Lêernaam:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Plaaslike lêer:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Spoed:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Tyd verloop:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Oorblywende tyd:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "Sluit hierdie venster wanneer alle oordragte _klaar is"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "_Verwyder afgehandelde oordragte van lys"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "_Detail oor lêeroordrag"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+msgid "_Pause"
+msgstr "_Pouseer"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "_Hervat"
+
+#: ../pidgin/gtkimhtml.c:793
+msgid "Paste as Plain _Text"
+msgstr "Plak as gewone _teks"
+
+#: ../pidgin/gtkimhtml.c:810
+msgid "_Reset formatting"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "Hiperskakelkleur"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "Kleur om hiperskakels mee te teken."
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Kleur om hiperskakels mee te teken as die muis oor hulle is."
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "_Kopieer e-posadres"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "_Open skakel in blaaier"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "_Kopieer skakelligging"
+
+#: ../pidgin/gtkimhtml.c:3271
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Lêertipe nie herken nie</span>\n"
+"\n"
+"Val terug na verstek van PNG."
+
+#: ../pidgin/gtkimhtml.c:3274
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Lêertipe nie herken nie\n"
+"\n"
+"Val terug na verstek van PNG."
+
+#: ../pidgin/gtkimhtml.c:3287
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Fout met stoor van prentjie</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3290
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Fout met stoor van prentjie\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+msgid "Save Image"
+msgstr "Stoor prentjie"
+
+#: ../pidgin/gtkimhtml.c:3410
+msgid "_Save Image..."
+msgstr "_Stoor prentjie..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "Kies skriftipe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "Kies tekskleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "Kies agtergrondkleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "_Beskrywing"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Gee asb. die URL en die beskrywing van die skakel wat u wil invoeg. Die "
+"beskrywing is opsioneel."
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Gee asb. die URL van die skakel om in te sit."
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "Voeg skakel in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "_Voeg in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Stoor van prentjie het misluk: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Voeg prentjie in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Hierdie tema het geen gesiggies beskikbaar nie."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Glimlag!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Vetdruk"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Skuinsdruk"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Onderstreep"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Groter skrif"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Kleiner skrif"
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Skrif se voorgrondkleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Agtergrondkleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Voeg skakel in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Voeg prentjie in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Voeg gesiggie in"
+
+#: ../pidgin/gtklog.c:262
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr "Wil u definitief die wag op %s vir %s uitvee?"
+
+#: ../pidgin/gtklog.c:273
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "Wil u definitief die wag op %s vir %s uitvee?"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+"Wil u definitief die stelselstaaflêer wat %s begin het, permanent uitvee?"
+
+#: ../pidgin/gtklog.c:419
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Gesprek in %s op %s</span>"
+
+#: ../pidgin/gtklog.c:422
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
+
+#: ../pidgin/gtklog.c:469
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:516
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:520
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:523
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:527
+msgid "No logs were found"
+msgstr "Geen joernale gevind nie"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:542
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../pidgin/gtklog.c:606
+msgid "Total log size:"
+msgstr "Totale staaflêergrootte:"
+
+#: ../pidgin/gtklog.c:675
+#, c-format
+msgid "Conversations in %s"
+msgstr "Gesprekke in %s"
+
+#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#, c-format
+msgid "Conversations with %s"
+msgstr "Gesprekke met %s"
+
+#: ../pidgin/gtklog.c:760
+msgid "System Log"
+msgstr "Stelselstaaflêer"
+
+#: ../pidgin/gtkmain.c:364
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Probeer `%s -h' vir meer inligting.\n"
+
+#: ../pidgin/gtkmain.c:366
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Gebruik: %s [KEUSE]..."
+"\n"
+"\n"
+"  -c, --config=GIDS   gebruik GIDS vir konfigurasielêers\n"
+"  -d, --debug         skryf ontfoutboodskappe na stdout\n"
+"  -h, --help          vertoon hierdie hulp en sluit af\n"
+"  -n, --nologin       moenie outomaties anmeld nie\n"
+"  -l, --login[=NAAM]  meld outomaties aan (opsionele NAAM-argument "
+"spesifiseer\n"
+"                      rekening(e) om te gebruik, geskei met kommas)\n"
+"  -v, --version       wys die huidige weergawe en sluit af\n"
+
+#: ../pidgin/gtkmain.c:550
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the Pidgin\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "Open alle boodskappe"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "Sender"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s het %d nuwe boodskap."
+msgstr[1] "%s het %d nuwe boodskappe."
+
+#: ../pidgin/gtknotify.c:520
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] "<b>U het %d nuwe e-pos.</b>"
+msgstr[1] "<b>U het %d nuwe e-posse.</b>"
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Die blaaieropdrag \"%s\" is ongeldig."
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "Kan nie die URL oopmaak nie"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1065
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Die 'Handmatige' blaaier-opdrag is gekies, maar geen opdrag is gestel nie."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "Die volgende inproppe gaan ontlaai word."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Veelvuldige inproppe gaan ontlaai word."
+
+#: ../pidgin/gtkplugin.c:285
+msgid "Unload Plugins"
+msgstr "Ontlaai inproppe"
+
+#: ../pidgin/gtkplugin.c:397
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Geskryf deur:</span>\t%s\n"
+"<span weight=\"bold\">Webwerf:</span>\t\t%s\n"
+"<span weight=\"bold\">Lêernaam:</span>\t\t%s"
+
+#: ../pidgin/gtkplugin.c:407
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Fout: %s\n"
+"Kyk by die inprop se webwerf vir 'n opdatering.</span>"
+
+#: ../pidgin/gtkplugin.c:533
+msgid "Configure Pl_ugin"
+msgstr "Stel _inprop op"
+
+#: ../pidgin/gtkplugin.c:596
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Inpropdetail</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Kies 'n lêer"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:522
+msgid "Pounce on Whom"
+msgstr "Hou wie dop"
+
+#: ../pidgin/gtkpounce.c:549
+msgid "_Buddy name:"
+msgstr "_Vriendnaam:"
+
+#: ../pidgin/gtkpounce.c:583
+msgid "Si_gns on"
+msgstr "aa_nmeld"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Signs o_ff"
+msgstr "a_fmeld"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "_weggaan"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "ter_ugkeer"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "_ledig raak"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Is no longer i_dle"
+msgstr "nie meer l_edig is nie"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Starts _typing"
+msgstr "begin _tik"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "P_auses while typing"
+msgstr "w_ag tydens tik"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "Stops t_yping"
+msgstr "ophou ti_k"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Sends a _message"
+msgstr "'n _boodskap stuur"
+
+#: ../pidgin/gtkpounce.c:644
+msgid "Ope_n an IM window"
+msgstr "Ope_n 'n kletsvenster"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "_Pop up a notification"
+msgstr "Wys 'n boodskap_venster"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "Send a _message"
+msgstr "Stuur 'n _boodskap"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "E_xecute a command"
+msgstr "_Voer 'n opdrag uit"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "P_lay a sound"
+msgstr "Spee_l 'n klank"
+
+#: ../pidgin/gtkpounce.c:657
+msgid "Brows_e..."
+msgstr "_Blaai..."
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Br_owse..."
+msgstr "_Blaai..."
+
+#: ../pidgin/gtkpounce.c:660
+msgid "Pre_view"
+msgstr "_Voorskou"
+
+#: ../pidgin/gtkpounce.c:784
+msgid "P_ounce only when my status is not available"
+msgstr "_Reageer slegs wanneer my status nie beskikbaar is nie"
+
+#: ../pidgin/gtkpounce.c:789
+msgid "_Recurring"
+msgstr "_Herhalend"
+
+#: ../pidgin/gtkpounce.c:1243
+msgid "Pounce Target"
+msgstr "Dophou-teiken"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "Uitpak van gesiggie-tema het misluk."
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Kies 'n gesiggie-tema wat u wil gebruik vanuit die lys hier onder. Nuwe "
+"temas kan geïnstalleer word deur hulle te sleep en te los op die temalys."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Ikoon"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Stelsellaai-ikoon"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Wys ikoon in stelsellaai"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Altyd"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Met ongelese boodskappe"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Versteking van gesprekvenster"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Versteek nuwe gesprekke:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+msgid "When away"
+msgstr "Terwyl weg"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Oortjies"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Wys boodskappe en geselsies in _oortjies"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Wys 'n _sluitknoppie op oortjies"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Plasing:"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "Bo"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Onder"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "Links"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "Regs"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Vertikaal links"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Vertikaal regs"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "N_uwe gesprekke:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Wys _formattering op inkomende boodskappe"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Wys vriend_ikone"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Aktiveer _animasie van vriendikoon"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Laat weet vriende dat u vir hulle tik"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "Dui _spelfoute aan"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Gebruik gladde rol"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Verstekformattering"
+
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Dit is hoe die uitgaande boodskapteks sal vertoon wanneer u protokolle "
+"gebruik wat formattering ondersteun. :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "ST_UN-bediener:"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "_Outospeur IP-adres"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "Publieke _IP:"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "Poorte"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Spesifiseer self die omvang van poorte om op te luister"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "_Beginpoort:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "_Endpoort:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Instaanbediener"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "Geen instaanbediener"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Gebruiker:"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME se verstek"
+
+#: ../pidgin/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid "Manual"
+msgstr "Handmatig"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "Blaaierkeuse"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "_Blaaier:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "_Open skakel in:"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "Verstekblaaier"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "Bestaande venster"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "Nuwe oortjie"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Handmatig:\n"
+"(%s vir URL)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "Boekstaaf_formaat:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Boekstaaf alle k_itsboodskappe"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Boekstaaf alle g_eselsies"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Boekstaaf alle _statusveranderinge na die stelselstaaflêer"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Klankkeuse"
+
+#: ../pidgin/gtkprefs.c:1521
+msgid "Quietest"
+msgstr "Sagste"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "Sagter"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "Sag"
+
+#: ../pidgin/gtkprefs.c:1529
+msgid "Loud"
+msgstr "Hard"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Louder"
+msgstr "Harder"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Loudest"
+msgstr "Hardste"
+
+#: ../pidgin/gtkprefs.c:1596
+msgid "Sound Method"
+msgstr "Klankmetode"
+
+#: ../pidgin/gtkprefs.c:1597
+msgid "_Method:"
+msgstr "_Metode:"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "Console beep"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Automatic"
+msgstr "Outomaties"
+
+#: ../pidgin/gtkprefs.c:1604
+msgid "Command"
+msgstr "Opdrag"
+
+#: ../pidgin/gtkprefs.c:1605
+msgid "No sounds"
+msgstr "Geen klanke"
+
+#: ../pidgin/gtkprefs.c:1613
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Klank_opdrag:\n"
+"(%s vir lêernaam)"
+
+#: ../pidgin/gtkprefs.c:1639
+msgid "Sound Options"
+msgstr "Klankkeuses"
+
+#: ../pidgin/gtkprefs.c:1640
+msgid "Sounds when conversation has _focus"
+msgstr "Klanke terwyl gesprek in _fokus is"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "Aktiveer klanke:"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "Slegs indien beskikbaar"
+
+#: ../pidgin/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "Slegs indien nie beskikbaar nie"
+
+#: ../pidgin/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "Volume:"
+
+#: ../pidgin/gtkprefs.c:1681
+msgid "Sound Events"
+msgstr "Gebeurtenisklanke"
+
+#: ../pidgin/gtkprefs.c:1732
+msgid "Play"
+msgstr "Speel"
+
+#: ../pidgin/gtkprefs.c:1739
+msgid "Event"
+msgstr "Gebeurtenis"
+
+#: ../pidgin/gtkprefs.c:1758
+msgid "Test"
+msgstr "Toets"
+
+#: ../pidgin/gtkprefs.c:1762
+msgid "Reset"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1766
+msgid "Choose..."
+msgstr "Kies..."
+
+#: ../pidgin/gtkprefs.c:1809
+msgid "_Report idle time:"
+msgstr "_Raporteer ledige tyd:"
+
+#: ../pidgin/gtkprefs.c:1814
+msgid "Based on keyboard or mouse use"
+msgstr "Gebaseer op gebruik van sleutelbord en muis"
+
+#: ../pidgin/gtkprefs.c:1823
+msgid "_Auto-reply:"
+msgstr "_Outo-antwoord:"
+
+#: ../pidgin/gtkprefs.c:1827
+msgid "When both away and idle"
+msgstr "Terwyl weg en ledig"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1833
+msgid "Auto-away"
+msgstr "Outoweg"
+
+#: ../pidgin/gtkprefs.c:1835
+msgid "Change status when _idle"
+msgstr "Verander status terwyl _ledig"
+
+#: ../pidgin/gtkprefs.c:1839
+msgid "_Minutes before changing status:"
+msgstr "_Minute voor verandering van status:"
+
+#: ../pidgin/gtkprefs.c:1847
+msgid "Change _status to:"
+msgstr "Verander _status na:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1868
+msgid "Status at Startup"
+msgstr "Status by begin"
+
+#: ../pidgin/gtkprefs.c:1870
+msgid "Use status from last _exit at startup"
+msgstr "By begin, gebruik status van laaste _afsluiting"
+
+#: ../pidgin/gtkprefs.c:1876
+msgid "Status to a_pply at startup:"
+msgstr "Status om te ge_bruik by begin:"
+
+#: ../pidgin/gtkprefs.c:1914
+msgid "Interface"
+msgstr "Koppelvlak"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Smiley Themes"
+msgstr "Gesiggie-temas"
+
+#: ../pidgin/gtkprefs.c:1917
+msgid "Sounds"
+msgstr "Klanke"
+
+#: ../pidgin/gtkprefs.c:1923
+msgid "Browser"
+msgstr "Blaaier"
+
+#: ../pidgin/gtkprefs.c:1927
+msgid "Status / Idle"
+msgstr "Status / ledig"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Laat alle gebruikers toe om my te kontak"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Laat slegs die gebruikers op my vriendelys toe"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Laat slegs die gebruikers hier onder toe"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Blokkeer alle gebruikers"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Blokkeer slegs die gebruikers hier onder"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Privaatheid"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Veranderinge aan privaatheidinstellings is onmiddelik van toepassing."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Stel privaatheid vir:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+msgid "Permit User"
+msgstr "Laat gebruiker toe"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Tik 'n gebruiker wat u toelaat om u te kontak."
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "Tik asb. die naam van die gebruiker wat u wil hê moet u kan kontak."
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+msgid "_Permit"
+msgstr "_Laat toe"
+
+#: ../pidgin/gtkprivacy.c:570
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Laat %s toe om u te kontak?"
+
+#: ../pidgin/gtkprivacy.c:572
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Wil u definitief %s toelaat om u te kontak?"
+
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+msgid "Block User"
+msgstr "Blokkeer gebruiker"
+
+#: ../pidgin/gtkprivacy.c:600
+msgid "Type a user to block."
+msgstr "Tik 'n gebruiker om te blokkeer."
+
+#: ../pidgin/gtkprivacy.c:601
+msgid "Please enter the name of the user you wish to block."
+msgstr "Gee asb. die naam van die gebruiker wat u wil blokkeer."
+
+#: ../pidgin/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "Blokkeer %s?"
+
+#: ../pidgin/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Wil u definitief %s blokkeer?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Pas toe"
+
+#: ../pidgin/gtkrequest.c:1469
+msgid "That file already exists"
+msgstr "Daardie lêer bestaan reeds"
+
+#: ../pidgin/gtkrequest.c:1470
+msgid "Would you like to overwrite it?"
+msgstr "Wil u dit oorskryf?"
+
+#: ../pidgin/gtkrequest.c:1471
+msgid "Overwrite"
+msgstr "Oorskryf"
+
+#: ../pidgin/gtkrequest.c:1472
+msgid "Choose New Name"
+msgstr "Kies nuwe naam"
+
+#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+msgid "Select Folder..."
+msgstr "Kies gids..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Kamernommer"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "_Kry lys"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "_Voeg geselsie by"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Wil u definitief die gekose gestoorde statusse uitvee?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+msgid "_Use"
+msgstr "_Gebruik"
+
+#: ../pidgin/gtksavedstatuses.c:725
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Titel reeds in gebruik.  U moet 'n unieke titel kies."
+
+#: ../pidgin/gtksavedstatuses.c:913
+msgid "Different"
+msgstr "Anders"
+
+#: ../pidgin/gtksavedstatuses.c:1106
+msgid "_Title:"
+msgstr "_Titel:"
+
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+msgid "_Status:"
+msgstr "_Status:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1157
+msgid "Use a _different status for some accounts"
+msgstr "Gebruik 'n _ander status vir sekere rekenings"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1221
+msgid "Sa_ve & Use"
+msgstr "S_toor en gebruik"
+
+#: ../pidgin/gtksavedstatuses.c:1427
+#, c-format
+msgid "Status for %s"
+msgstr "Status vir %s"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Vriend meld aan"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Vriend meld af"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Boodskap ontvang"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Boodskapontvangs begin gesprek"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Boodskap gestuur"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Persoon kom geselskap binne"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Persoon verlaat geselskap"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "U praat in geselsie"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Ander praat in geselsie"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Iemand sê u skermnaam in 'n geselsie"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer-mislukking"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer kon nie begin nie."
+
+#: ../pidgin/gtkstatusbox.c:611
+msgid "Waiting for network connection"
+msgstr "Wag vir netwerkverbinding"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "Die volgende fout het voorgekom met die laai van %s: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "Laai van prentjie het misluk"
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Kan nie gids %s stuur nie."
+
+#: ../pidgin/gtkutils.c:1421
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+"%s kan nie 'n gids oordra nie. U sal elke lêer binne-in afsonderlik moet "
+"stuur."
+
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1467
+msgid "You have dragged an image"
+msgstr "U het 'n prentjie gesleep"
+
+#: ../pidgin/gtkutils.c:1454
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"U kan hierdie prentjie as 'n lêer oordra, in hierdie boodskap invoeg, of as "
+"die vriendikoon gebruik vir hierdie gebruiker."
+
+#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+msgid "Set as buddy icon"
+msgstr "Stel as vriendikoon"
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+msgid "Send image file"
+msgstr "Stuur die prentlêer"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+msgid "Insert in message"
+msgstr "Voeg in boodskap"
+
+#: ../pidgin/gtkutils.c:1463
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Wil u dit as die vriendikoon vir hierdie gebruiker stel?"
+
+#: ../pidgin/gtkutils.c:1468
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"U kan hierdie prentjie as 'n lêer oordra, in hierdie boodskap invoeg, of as "
+"die vriendikoon gebruik vir hierdie gebruiker."
+
+#: ../pidgin/gtkutils.c:1470
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"U kan hierdie prentjie in hierdie boodskap invoeg, of as die vriendikoon "
+"gebruik vir hierdie gebruiker."
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1524
+msgid "Cannot send launcher"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1524
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2291
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Lêer:</b> %s\n"
+"<b>Lêergroote:</b> %s\n"
+"<b>Prentgrootte:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2611
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "Die lêer '%s' is te groot vir %s.  Probeer asb. 'n kleiner prent.\n"
+
+#: ../pidgin/gtkutils.c:2613
+msgid "Icon Error"
+msgstr "Ikoonfout"
+
+#: ../pidgin/gtkutils.c:2614
+msgid "Could not set icon"
+msgstr "Kon nie ikoon stel nie"
+
+#: ../pidgin/gtkutils.c:2715
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Kon nie lêer '%s' oopmaak nie: %s"
+
+#: ../pidgin/gtkutils.c:2764
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Laai van beeld '%s' het misluk: rede onbekent, waarskynlik 'n korropte "
+"prentlêer"
+
+#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Stoor lêer"
+
+#: ../pidgin/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Kies kleur"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../pidgin/pidginstock.c:90
+msgid "Close _tabs"
+msgstr "Sluit _oortjies"
+
+#: ../pidgin/pidginstock.c:92
+msgid "_Get Info"
+msgstr "_Kry info"
+
+#: ../pidgin/pidginstock.c:93
+msgid "_Invite"
+msgstr "_Nooi uit"
+
+#: ../pidgin/pidginstock.c:94
+msgid "_Modify"
+msgstr "_Wysig"
+
+#: ../pidgin/pidginstock.c:95
+msgid "_Open Mail"
+msgstr "_Open pos"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Vertoon statistiek"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Antwoordwaarskynlikheid:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Statistiekopstelling"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+msgid "minutes"
+msgstr "minute"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "Drempel:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Vriend is ledig"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Vriend is weg"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Vriend is weg vir lank"
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Vriend is mobiel"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Vriend is aflyn"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Puntwaardes om te gebruik wanneer..."
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Die vriend met die <i>hoogste telling</i> is die vriend wat prioriteit sal "
+"hê in die kontak.\n"
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Gebruik die laaste vriend as tellings gelyk is"
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Puntwaardes om te gebruik vir rekening..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Kontakprioriteit"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Laat beheer van waardes toe wat geassosieer word met verskillende "
+"vriendstatusse."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Laat verandering van puntwaardes van ledig/weg/aflyn-statusse toe by "
+"kontakprioriteitberekenings."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Gesprekskleure"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Pasgemaakte kleure vir die gespreksvenster"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Foutboodskappe"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Stelselboodskappe"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Gestuurde boodskappe"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Ontvangde boodskappe"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Kies kleur vir %s"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Ignoreer inkomende formaat"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Pas toe in geselsies"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Pas toe in kitsboodskappe"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Volgens gesprektelling"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Gesprekplasing"
+
+#: ../pidgin/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Aantal gesprekke per venster"
+
+#: ../pidgin/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Aparte gesprek- en geselsvensters wanneer geplaas word volgens aantal"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "Gesprekplasing"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Ekstra keuses vir gesprekplasing."
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Beperk die aantal gesprekke per venster en skei moontlik gesprekke en "
+"geselsies"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gaiminc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin-demostrasie-inprop"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "'n Voorbeeldinprop wat dinge doen - sien die beskrywing."
+
+#. *  description
+#: ../pidgin/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Hierdie is 'n baie oulike inprop wat klomp dinge doen:\n"
+"- Dit sê wie die program geskryf het wanneer mens aanmeld\n"
+"- Dit keer alle teks agterstevoorom\n"
+"- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Muisgebaar-opstelling"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Middelmuisknoppie"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Regtermuisknoppie"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Wys gebare visueel"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Muisgebare"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Verskaf ondersteuning vir muisgebare"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Kitsboodskappe"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+"Kies 'n persoon van u adresboek hier onder, of voeg 'n nuwe persoon by."
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Nuwe persoon"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Kies vriend"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Kies 'n persoon van u adresboek om hierdie vriend by te voeg, of skep 'n "
+"nuwe persoon."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Gebruiker_detail"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "_Assosieer vriend"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "Kan nie e-pos stuur nie"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "Die evolution-programlêer is nie in die PATH gevind nie."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "Daar is nie 'n e-posadres vir hierdie vriend gevind nie."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "Voeg by adresboek"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "Stuur e-pos"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Opstelling van Evolution-integrasie"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Kies al die rekeninge waarvoor vriende outomaties bygevoeg moet word."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr "Evolution-integrasie"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:524
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr "Verskaf integrasie met Evolution."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Gee asb. die persoon se inligting hier onder."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Gee asb. die vriend se skermnaam en rekeningtipe hier onder."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Rekeningtipe:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Opsionele inligting:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Naam:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Van:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-pos:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK-seinetoets"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Toets om te sien of alle koppelvlakseine goed werk."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Geskiedenis"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Minimeer wanneer weg"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Minimeer die vriendelys en gesprekke wanneer u weggaan."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Poswagter"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Kyk vir nuwe pos plaaslik."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "Voeg 'n klein posbus by die vriendelys wat wys as mens nuwe pos het."
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Merkstreep"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Trek 'n streep om nuwe boodskappe in 'n gesprek aan te dui."
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "Gespre_kvensters"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "Gesel_svensters"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Daar was 'n konflik met die loop van die opdrag:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "Die volgende fout het voorgekom:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Pas toe"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr ""
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Slegs wanneer iemand u skermnaam noem"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "Ge_fokuste vensters"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Kennisgewingsmetodes"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "Voeg _string vooraan venstertitel:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "Voeg _aantal nuwe boodskappe in venstertitel in"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "Voeg aantal nuwe boodskappe in _X-eienskap in"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Stel vensterbvestuurder se \"_DRINGEND\"-wenk"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "_Lig geselsvenster"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Verwydering van kennisgewing"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "Verwyder wanneer gesprekvenster _fokus kry"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Verwyder wanneer gesprekvenster ge_klik word"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Verwyder wanneer daar in gesprekvenster ge_tik word"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Verwyder wanneer 'n _boodskap gestuur word"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "Verwyder met aktivering van gesprek_oortjie"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:895
+msgid "Message Notification"
+msgstr "Boodskapkennisgewing"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+"Verskaf 'n verskeidenheid maniere om te laat weet van ongelese boodskappe."
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Hiperskakelkleur"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Gesprekinskrywing"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "Gesprekgeskiedenis"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:322
+msgid "Select Color"
+msgstr "Kies kleur"
+
+#: ../pidgin/plugins/pidginrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Kies skriftipe vir %s"
+
+#: ../pidgin/plugins/pidginrc.c:398
+msgid "Select Interface Font"
+msgstr "Kies koppelvlakskrif"
+
+#: ../pidgin/plugins/pidginrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+-koppelvlakskrif"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+-tekskortpadtema"
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "Koppelvlakkleure"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "Skriftipes"
+
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "Gereedskap"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Skryf instellings na %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Lees gtkrc-lêers weer"
+
+#: ../pidgin/plugins/pidginrc.c:616
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+-temabeheer"
+
+#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Verskaf toegang tot algemeen gebruikte gtkrc-instellings."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "U gebruik %s weergawe %s.  Die huidige weergawe is %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Veranderinge:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr ""
+"U kan weergawe %s verkry vanaf:<br><a href=\"http://pidgin.im/"
+"\">http://pidgin.im</a>."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Nuwe weergawe beskikbaar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Vrystellingskennisgewings"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Kyk af en toe vir nuwe weergawes."
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Kyk van tyd tot tyd vir nuwe weergawes en laat weet die gebruiker met die "
+"veranderings."
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "Duplikaatverbetering"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "Die gespesifiseerde woord bestaan reeds in die verbeteringlys."
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "Teksvervangings"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "U tik"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "U stuur"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "Slegs heelwoorde"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "Kassensitief"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "Voeg 'n nuwe teksvervanging by"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "U _tik:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "U _stuur:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"Identies wat _kas betref (deaktiveer vir outomatiese hantering van "
+"hoofletters)"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "Vervang slegs _heelwoorde"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Algemene keuses vir teksvervanging"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "Aktiveer vervanging van laaste woord tydens stuur"
+
+#: ../pidgin/plugins/spellchk.c:2367
+msgid "Text replacement"
+msgstr "Teksvervanging"
+
+#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde reëls."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Vriendelint"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "'n Weergawe van die vriendelys wat horisontaal rol."
+
+#: ../pidgin/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "Vertoon tydstempels elke"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:195
+msgid "Timestamp"
+msgstr "Tydstempel"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "Vertoon iChat-tydstempels"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Vertoon iChat-tydstempels elke N minute."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Tydstempelformattering"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr "_Forseer (tradisionele %s-) 24-uur-tydformaat"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Wys datums in..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "_Gesprekke:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "Vir vertraagde boodskappe"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "Vir vertraagde boodskappe en in geselskappe"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "_Boodskapjoernale:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:144
+msgid "Message Timestamp Formats"
+msgstr "Boodskaptydstempelformate"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:147
+msgid "Customizes the message timestamp formats."
+msgstr "Pasgemaakte formate vir boodskaptydstempels."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:149
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Hierdie inprop laat die gebruiker toe om die formaat van tydstempels in "
+"gesprekke in joernale aan te pas."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Ondeursigtigheid:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Gesprekvensters"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_Gesrekvenster-deursigtigheid"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Verwyder gesprekvenster se deursigtigheid terwyl gefokus"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Altyd bo-op"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Vriendelysvenster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "_Vriendelysvenster se deursigtigheid"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Verwyder vriendelysvenster se deursigtigheid tydens fokus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Deursigtigheid"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Veranderbare deursigtigheid vir die vriendelys en geselsies."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+-weergawe"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Begin"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "_Begin %s met Windows-begin"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr ""
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "_Hou vriendelysvenster bo:"
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr "_Flits venster wanneer geselsboodskappe ontvang word"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
+msgid "Pidgwin Options"
+msgstr "Pidgin-keuses"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Options specific to Pidgin for Windows."
+msgstr "Keuses spesifiek aan Pidgin vir Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Rekening: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
+
+#~ msgid "Gaim Internet Messenger"
+#~ msgstr "Gaim Internetboodskapper"
+
+#~ msgid "/Conversation/Insert Lin_k..."
+#~ msgstr "/Gesprek/Voeg s_kakel in..."
+
+#~ msgid "/Conversation/Insert Imag_e..."
+#~ msgstr "/Gesprek/Voeg pr_entjie in..."
+
+#~ msgid "/Conversation/Insert Link..."
+#~ msgstr "/Gesprek/Voeg skakel in..."
+
+#~ msgid "/Conversation/Insert Image..."
+#~ msgstr "/Gesprek/Voeg prentjie in..."
+
+#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
+
+#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
+#~ msgstr "Gaim %s. Probeer `%s -h' vir meer inligting.\n"
+
+#~ msgid "WinGaim Options"
+#~ msgstr "WinGaim-keuses"
+
+#~ msgid ""
+#~ "%d buddy from group %s was not removed because it belongs to an account "
+#~ "which is disabled or offline.  This buddy and the group were not "
+#~ "removed.\n"
+#~ msgid_plural ""
+#~ "%d buddies from group %s were not removed because they belong to accounts "
+#~ "which are currently disabled or offline.  These buddies and the group "
+#~ "were not removed.\n"
+#~ msgstr[0] ""
+#~ "%d vriend van die groep %s is nie verwyder nie, want dit behoort aan 'n "
+#~ "rekening wat gedeaktiveer of aflyn is.  Hierdie vriend en die groep is "
+#~ "nie verwyder nie.\n"
+#~ msgstr[1] ""
+#~ "%d vriende van die groep %s is nie verwyder nie, want hulle behoort aan "
+#~ "'n rekening wat gedeaktiveer of aflyn is.  Hierdie vriende en die groep "
+#~ "is nie verwyder nie.\n"
+
+#~ msgid "Group not removed"
+#~ msgstr "Groep nie verwyder nie"
+
+#~ msgid "Old Gaim"
+#~ msgstr "Ou Gaim"
+
+#~ msgid "Gaim User"
+#~ msgstr "Gaim-gebruiker"
+
+#~ msgid "Format Screen Name..."
+#~ msgstr "Formatteer skermnaam..."
+
+#~ msgid "Gaim - Save As..."
+#~ msgstr "Gaim - Stoor as..."
+
 #~ msgid ""
 #~ "\n"
 #~ "Idle: %s"
diff --git a/po/ca.po b/po/ca.po
index 6553db0e02..aa2cc054c3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12686,8 +12686,8 @@ msgid ""
 msgstr "El %s és un client de missatgeria instantània modular, capaç d'utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programació GTK+.<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL (versió 2 o posterior). Hi ha una còpia de la GPL dins del fitxer 'COPYING' que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus col·laboradors. El fitxer 'COPYRIGHT' conté una llista completa de tots els contribuïdors. No us proporcionem cap mena de garantia amb aquest programa.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin a irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 a irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/de.po b/po/de.po
index a21186c635..be0b63d692 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12823,8 +12823,8 @@ msgstr ""
 "Programm.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:375
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin auf irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 auf irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:378
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/en_GB.po b/po/en_GB.po
index f288879e8b..fc805cc780 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12653,7 +12653,7 @@ msgstr ""
 "warranty for this program.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:375
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidwgin on irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:378
diff --git a/po/eo.po b/po/eo.po
index b1f2c42a51..a52db65a94 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -12278,8 +12278,8 @@ msgstr ""
 "garantion pri tiu programaro.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin ĉe irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ĉe irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/es.po b/po/es.po
index 9315096be7..f84131b497 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12820,9 +12820,9 @@ msgstr ""
 "contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> canal #pidgwin en irc.freenode.net<BR><BR>"
+"<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin-win32 en irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/fa.po b/po/fa.po
index 0c7524a575..6d883b4982 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -12566,8 +12566,8 @@ msgstr ""
 "در قبال این برنامه ارائه نمی‌کنیم."
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin در irc.freenode.net<BR><BR"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 در irc.freenode.net<BR><BR"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/fi.po b/po/fi.po
index 12d24b1dc9..55787d0933 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12697,9 +12697,9 @@ msgstr ""
 "anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #pidgwin palvelimella irc.freenode.net<BR><BR>"
+"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/fr.po b/po/fr.po
index 13eb75decb..d01a81e82a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12795,8 +12795,8 @@ msgstr ""
 "<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgwin sur irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgin-win32 sur irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/he.po b/po/he.po
index 02beecb1f0..00eb534dd1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12514,8 +12514,8 @@ msgstr ""
 "של התורמים. איננו מספקים שום אחריות לתוכנה זו.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin ב- irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ב- irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/hu.po b/po/hu.po
index 672bfa52f0..592c59cf4c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gaim 2.0-beta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 00:00-0500\n"
-"PO-Revision-Date: 2007-02-04 12:55+0100\n"
+"POT-Creation-Date: 2007-05-01 21:06+0200\n"
+"PO-Revision-Date: 2007-05-02 15:49+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -19,410 +19,480 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim azonnali üzenő"
+#: ../finch/finch.c:180
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Próbálja a \"%s -h\" parancsot további információkért.\n"
 
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Azonnali üzenetküldés"
+#: ../finch/finch.c:182
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Használat: %s [KAPCSOLÓ]...\n"
+"\n"
+"  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
+"  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
+"  -h, --help          ezen súgó megjelenítése és kilépés\n"
+"  -n, --nologin       ne jelentkezzen be automatikusan\n"
+"  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Azonnali üzenetek küldése több protokoll használatával"
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:689
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr "A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://developer.pidgin.im oldalon."
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:272
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1399
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1210
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Hiba"
 
-#: ../console/gntaccount.c:119
+#: ../finch/gntaccount.c:119
 msgid "Account was not added"
 msgstr "A fiók nem lett felvéve"
 
-#: ../console/gntaccount.c:120
+#: ../finch/gntaccount.c:120
 msgid "Screenname of an account must be non-empty."
 msgstr "Fiók megjelenő neve nem lehet üres."
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
 msgid "New mail notifications"
 msgstr "Értesítések új levélre"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
 msgid "Remember password"
 msgstr "Emlékezzen a jelszóra"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
+#: ../pidgin/gtkblist.c:3948
 msgid "Modify Account"
 msgstr "Fiók módosítása"
 
-#: ../console/gntaccount.c:474
+#: ../finch/gntaccount.c:474
 msgid "New Account"
 msgstr "Új fiók"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5357
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Felhasználónév:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5378
+#: ../pidgin/gtkblist.c:5741
 msgid "Alias:"
 msgstr "Álnév:"
 
+#. Cancel button
 #. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:313
-#: ../console/gntblist.c:380 ../console/gntblist.c:413
-#: ../console/gntblist.c:737 ../console/gntblist.c:906
-#: ../console/gntblist.c:997 ../console/gntblist.c:2021
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
-#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
-#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
-#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
-#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
-#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1761
-#: ../libgaim/protocols/jabber/buddy.c:1795
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:1365
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
-#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
-#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
-#: ../libgaim/protocols/oscar/oscar.c:6043
-#: ../libgaim/protocols/oscar/peer.c:1021
-#: ../libgaim/protocols/qq/buddy_info.c:484
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
-#: ../libgaim/protocols/qq/group_join.c:138
-#: ../libgaim/protocols/qq/group_join.c:359
-#: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
-#: ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:3410
-#: ../libgaim/protocols/sametime/sametime.c:3495
-#: ../libgaim/protocols/sametime/sametime.c:3665
-#: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5498
-#: ../libgaim/protocols/sametime/sametime.c:5622
-#: ../libgaim/protocols/silc/buddy.c:467
-#: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:961
-#: ../libgaim/protocols/yahoo/yahoo.c:3208
-#: ../libgaim/protocols/yahoo/yahoo.c:3217
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
+#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Mégsem"
 
+#. Save button
 #. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
-#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Mentés"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Biztos, hogy törölni akarja %s fiókot?"
 
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
+#: ../finch/gntaccount.c:614
 msgid "Delete Account"
 msgstr "Fiók törlése"
 
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:335
+#. Delete button
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:539
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: ../console/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "A következő lista fiókjait engedélyezheti/tilthatja le."
 
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:313 ../console/gntblist.c:380
-#: ../console/gntblist.c:413 ../console/gntnotify.c:309
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
-#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
-#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:5497
-#: ../libgaim/protocols/silc/chat.c:596
+#. Add button
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
+#: ../pidgin/gtkblist.c:5796 ../pidgin/gtkconv.c:1633
+#: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: ../console/gntaccount.c:677
+#. Modify button
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Módosítás"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s felvette %s partnert %s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
 msgid "Add buddy to your list?"
 msgstr "Felveszi a partnert a partnerlistájára?"
 
-#: ../console/gntblist.c:264
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
+
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+msgid "Authorize buddy?"
+msgstr "Engedélyezi a partnert?"
+
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+msgid "Authorize"
+msgstr "Engedélyezés"
+
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+msgid "Deny"
+msgstr "Elutasítás"
+
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "Meg kell adnia a partner megjelenő nevét."
 
-#: ../console/gntblist.c:266
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "Meg kell adnia egy csoportot."
 
-#: ../console/gntblist.c:268
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "Ki kell választania egy fiókot."
 
-#: ../console/gntblist.c:272
+#: ../finch/gntblist.c:286
 msgid "Error adding buddy"
 msgstr "Hiba a partner hozzáadásakor"
 
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
+#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Felhasználónév"
 
-#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
-#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1207
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Álnév"
 
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
 msgid "Group"
 msgstr "Csoport"
 
-#: ../console/gntblist.c:306 ../console/gntblist.c:363
-#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
-#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
-#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2946 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Fiók"
 
-#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
-#: ../libgaim/protocols/silc/buddy.c:736
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/buddy.c:1075
-#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3122
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5311
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Partner felvétele"
 
-#: ../console/gntblist.c:312
+#: ../finch/gntblist.c:327
 msgid "Please enter buddy information."
 msgstr "Adja meg a partnerinformációkat."
 
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Csevegések"
 
 #. Extract their Name and put it in
-#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:792
-#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
-#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Név"
 
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5687
 msgid "Add Chat"
 msgstr "Csevegés hozzáadása"
 
-#: ../console/gntblist.c:379
+#: ../finch/gntblist.c:398
 msgid "You can edit more information from the context menu later."
 msgstr "Később a helyi menüből további információkat is módosíthat."
 
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
 msgid "Error adding group"
 msgstr "Hiba a csoport hozzáadásakor"
 
-#: ../console/gntblist.c:391
+#: ../finch/gntblist.c:412
 msgid "You must give a name for the group to add."
 msgstr "Meg kell adnia a felvenni kívánt csoport nevét."
 
-#: ../console/gntblist.c:404
+#: ../finch/gntblist.c:425
 msgid "A group with the name already exists."
 msgstr "Ilyen nevű csoport már létezik."
 
-#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
-#: ../libgaim/protocols/sametime/sametime.c:5408
-#: ../libgaim/protocols/sametime/sametime.c:5495
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5793
 msgid "Add Group"
 msgstr "Csoport felvétele"
 
-#: ../console/gntblist.c:411
+#: ../finch/gntblist.c:432
 msgid "Enter the name of the group"
 msgstr "Adja meg a csoport nevét"
 
-#: ../console/gntblist.c:736
+#: ../finch/gntblist.c:761
 msgid "Edit Chat"
 msgstr "Csevegés szerkesztése"
 
-#: ../console/gntblist.c:736
+#: ../finch/gntblist.c:761
 msgid "Please Update the necessary fields."
 msgstr "Frissítse a szükséges mezőket."
 
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: ../console/gntblist.c:751
+#: ../finch/gntblist.c:778
 msgid "Auto-join"
 msgstr "Automatikus csatlakozás"
 
-#: ../console/gntblist.c:760
+#: ../finch/gntblist.c:787
 msgid "Edit Settings"
 msgstr "Beállítások szerkesztése"
 
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Információ lekérése"
 
-#: ../console/gntblist.c:811
+#: ../finch/gntblist.c:855
 msgid "Add Buddy Pounce"
 msgstr "Partnerfigyelmeztetés felvétele"
 
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: ../console/gntblist.c:822
+#: ../finch/gntblist.c:866
 msgid "View Log"
 msgstr "Napló megtekintése"
 
-#: ../console/gntblist.c:902
+#: ../finch/gntblist.c:947
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Kérem adja meg új  %snevét"
 
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: ../console/gntblist.c:904
+#: ../finch/gntblist.c:950
 msgid "Enter empty string to reset the name."
 msgstr "A név visszaállításához üres karakterláncot adjon meg."
 
-#: ../console/gntblist.c:977
+#: ../finch/gntblist.c:1026
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "A kapcsolat eltávolítása a kapcsolat partnereit is eltávolítja"
 
-#: ../console/gntblist.c:985
+#: ../finch/gntblist.c:1034
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "A csoport eltávolítása a csoportban található partnereket is eltávolítja"
 
-#: ../console/gntblist.c:990
+#: ../finch/gntblist.c:1039
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Biztos, hogy törölni akarja a következőt: %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
+#: ../finch/gntblist.c:1042
 msgid "Confirm Remove"
 msgstr "Eltávolítás jóváhagyása"
 
-#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
-#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. Buddy List
-#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4190
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Partnerlista"
 
-#: ../console/gntblist.c:1123
+#: ../finch/gntblist.c:1200
 msgid "Place tagged"
 msgstr "Hely megcímkézve"
 
-#: ../console/gntblist.c:1128
+#: ../finch/gntblist.c:1205
 msgid "Toggle Tag"
 msgstr "Címke átváltása"
 
 #. General
-#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:814
-#: ../libgaim/protocols/jabber/buddy.c:1562
-#: ../libgaim/protocols/jabber/buddy.c:1744
-#: ../libgaim/protocols/jabber/jabber.c:802
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2970
 msgid "Nickname"
 msgstr "Becenév"
 
 #. Idle stuff
-#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
-#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:645
-#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2860
-#: ../libgaim/protocols/oscar/oscar.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:2876
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2990
+#: ../pidgin/gtkblist.c:3379 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "Inaktív"
 
-#: ../console/gntblist.c:1270
+#: ../finch/gntblist.c:1347
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -431,12 +501,12 @@ msgstr ""
 "Elérhető: %d\n"
 "Összesen: %d"
 
-#: ../console/gntblist.c:1279
+#: ../finch/gntblist.c:1356
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Fiók: %s (%s)"
 
-#: ../console/gntblist.c:1291
+#: ../finch/gntblist.c:1368
 #, c-format
 msgid ""
 "\n"
@@ -445,93 +515,100 @@ msgstr ""
 "\n"
 "Utoljára látszott: %s"
 
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
+#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Új..."
 
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
+#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:488
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Mentett..."
 
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
+#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:540 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
+#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
 msgid "_Name"
 msgstr "_Név"
 
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Account"
 msgstr "_Fiók"
 
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
+#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
 msgid "New Instant Message"
 msgstr "Új azonnali üzenet"
 
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
+#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek üzenni szeretne."
 
-#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
-#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
-#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
-#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
-#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
-#: ../libgaim/protocols/yahoo/yahoo.c:3207
-#: ../libgaim/protocols/yahoo/yahoo.c:3216
+#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Rendben"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
+#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../console/gntblist.c:2045
+#: ../finch/gntblist.c:2162
 msgid "Send IM..."
 msgstr "Üzenet küldése..."
 
-#: ../console/gntblist.c:2049
+#: ../finch/gntblist.c:2166
 msgid "Toggle offline buddies"
 msgstr "Offline partnerek be/ki"
 
-#: ../console/gntblist.c:2053
+#: ../finch/gntblist.c:2172
 msgid "Sort by status"
 msgstr "Állapot szerint"
 
-#: ../console/gntblist.c:2057
+#: ../finch/gntblist.c:2176
 msgid "Sort alphabetically"
 msgstr "ABC sorrend"
 
-#: ../console/gntblist.c:2061
+#: ../finch/gntblist.c:2180
 msgid "Sort by log size"
 msgstr "Naplóméret szerint"
 
-#: ../console/gntconn.c:36
+#: ../finch/gntconn.c:38
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../console/gntconn.c:39
+#: ../finch/gntconn.c:41
 #, c-format
 msgid "%s disconnected."
 msgstr "%s kapcsolata megszakadt."
 
-#: ../console/gntconn.c:40
+#: ../finch/gntconn.c:42
 #, c-format
 msgid ""
 "%s was disconnected due to the following error:\n"
@@ -540,52 +617,57 @@ msgstr ""
 "%s kapcsolata megszakadt a következő hiba miatt:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3944
 msgid "Connection Error"
 msgstr "Kapcsolódási hiba"
 
-#: ../console/gntconv.c:102
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3949
+msgid "Connect"
+msgstr "Kapcsolódás"
+
+#: ../finch/gntconv.c:103
 msgid "No such command."
 msgstr "Nincs ilyen parancs."
 
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a "
 "parancsnak."
 
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
 msgid "Your command failed for an unknown reason."
 msgstr "A parancs végrehajtása ismeretlen ok miatt sikertelen."
 
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
 msgid "That command only works in chats, not IMs."
 msgstr "Ez a parancs csak csevegéskor működik, azonnali üzeneteknél nem."
 
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
 msgid "That command only works in IMs, not chats."
 msgstr "Ez a parancs csak azonnali üzeneteknél működik, csevegéskor nem."
 
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
 msgid "That command doesn't work on this protocol."
 msgstr "Ez a parancs nem működik ezzel a protokollal."
 
-#: ../console/gntconv.c:130
+#: ../finch/gntconv.c:131
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "A parancsok még nem támogatottak. Az üzenet NEM lett elküldve."
 
-#: ../console/gntconv.c:232
+#: ../finch/gntconv.c:217
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:255
+#: ../finch/gntconv.c:240
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
 #, c-format
 msgid ""
 "\n"
@@ -594,24 +676,24 @@ msgstr ""
 "\n"
 "%s gépel..."
 
-#: ../console/gntconv.c:399
+#: ../finch/gntconv.c:390
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATIKUS VÁLASZ> "
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:501
+#: ../finch/gntconv.c:492
 msgid "List of users:\n"
 msgstr "Felhasználólista:\n"
 
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
 msgid "Supported debug options are:  version"
-msgstr "A támogatott hibakereső opciók:  version"
+msgstr "A támogatott hibakeresési parancsok:  version"
 
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
 msgid "No such command (in this context)."
 msgstr "Nincs ilyen parancs (ebben a kontextusban)."
 
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -620,59 +702,59 @@ msgstr ""
 "megtekintéséhez.\n"
 "Ebben a kontextusban a következő parancsok állnak rendelkezésre:\n"
 
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;üzenet&gt;: Üzenet küldése, mintha nem használná a parancsot."
 
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy "
 "csevegésnek."
 
-#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;opció&gt;: Különböző hibakereső információk küldése a jelenlegi "
+"debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a jelenlegi "
 "társalgásba."
 
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Törli a társalgás előzményeit."
 
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;parancs&gt;: Egy adott parancs súgója."
 
-#: ../console/gntconv.c:719
+#: ../finch/gntconv.c:710
 msgid "plugins: Show the plugins window."
 msgstr "plugins: A bővítmények ablak megjelenítése."
 
-#: ../console/gntconv.c:722
+#: ../finch/gntconv.c:713
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: A partnerlista megjelenítése."
 
-#: ../console/gntconv.c:725
+#: ../finch/gntconv.c:716
 msgid "accounts: Show the accounts window."
 msgstr "accounts: A fiókok ablak megjelenítése."
 
-#: ../console/gntconv.c:728
+#: ../finch/gntconv.c:719
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: A hibakereső ablak megjelenítése."
 
-#: ../console/gntconv.c:731
+#: ../finch/gntconv.c:722
 msgid "prefs: Show the preference window."
 msgstr "prefs: A beállítások ablak megjelenítése."
 
-#: ../console/gntconv.c:734
+#: ../finch/gntconv.c:725
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: A mentett állapotok ablak megjelenítése."
 
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
 msgid "Debug Window"
 msgstr "Hibakereső ablak"
 
@@ -680,113 +762,180 @@ msgstr "Hibakereső ablak"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
 msgid "Clear"
 msgstr "Törlés"
 
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
 msgid "Timestamps"
 msgstr "Időbélyegek"
 
-#: ../console/gntgaim.c:227
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
-msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Próbálja a \"%s -h\" parancsot további információkért.\n"
+msgid "File Transfers - %d%% of %d files"
+msgstr "Fájlátvitelek - %2$d fájl %1$d százaléka"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "Fájlátvitel"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "Folyamat"
 
-#: ../console/gntgaim.c:229
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Fájlnév"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Méret"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "Sebesség"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Hátralévő"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1201
+#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:802
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:2650
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3034
+#: ../pidgin/gtkblist.c:3047 ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+msgid "Status"
+msgstr "Állapot"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Ezen ablak bezárása az összes átvitel befejeződésekor"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Befejezett átvitelek törlése"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Leállítás"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Bezárás"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "Várakozás az átvitel indulására"
+
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "Megszakítva"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "Sikertelen"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
 #, c-format
-msgid ""
-"%s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s\n"
-"Használat: %s [KAPCSOLÓ]...\n"
-"\n"
-"  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
-"  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
-"  -h, --help          ezen súgó megjelenítése és kilépés\n"
-"  -n, --nologin       ne jelentkezzen be automatikusan\n"
-"  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
+msgid "%.2f KB/s"
+msgstr "%.2f KB/mp"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "Befejeződött"
 
-#: ../console/gntnotify.c:146
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "Átvitel"
+
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "E-mailek"
 
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
 msgid "You have mail!"
 msgstr "Levele érkezett!"
 
-#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "Feladó"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Tárgy"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "Bezárás"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) %d új üzenetet kapott."
 msgstr[1] "%s (%s) %d új üzenetet kapott."
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Új e-mail"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "%s információi"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "Partnerinformáció"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "Folytatás"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "Információ"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "Azonnali üzenet"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(nincs)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -803,291 +952,458 @@ msgstr ""
 "Weboldal: %s\n"
 "Fájlnév: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "A bővítményt be kell tölteni, mielőtt beállíthatná."
 
-#: ../console/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../console/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "Még kell ezzel csinálni valamit."
-
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr "A bővítménynek nincsenek beállításai."
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
 msgstr "A következő lista bővítményeit töltheti be vagy távolíthatja el."
 
-#: ../console/gntplugin.c:264
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "Bővítmény beállítása"
 
-#: ../console/gntprefs.c:122
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:541 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+msgid "Please enter a buddy to pounce."
+msgstr "Adjon meg egy figyelendő partnert."
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "New Buddy Pounce"
+msgstr "Új partnerfigyelmeztetés"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "Edit Buddy Pounce"
+msgstr "Partnerfigyelmeztetés szerkesztése"
+
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "Kinél figyelmeztet"
+
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5405
+#: ../pidgin/gtkblist.c:5721
+msgid "Account:"
+msgstr "Fiók:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Partner neve:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+msgid "Pounce When Buddy..."
+msgstr "Figyelmeztetés, ha a partner..."
+
+#: ../finch/gntpounce.c:373
+msgid "Signs on"
+msgstr "Bejelentkezik"
+
+#: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "Kijelentkezik"
+
+#: ../finch/gntpounce.c:375
+msgid "Goes away"
+msgstr "A partner elmegy"
+
+#: ../finch/gntpounce.c:376
+msgid "Returns from away"
+msgstr "Visszatér távollétből"
+
+#: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "Inaktív lesz"
+
+#: ../finch/gntpounce.c:378
+msgid "Is no longer idle"
+msgstr "Már nem inaktív"
+
+#: ../finch/gntpounce.c:379
+msgid "Starts typing"
+msgstr "Elkezd gépelni"
+
+#: ../finch/gntpounce.c:380
+msgid "Pauses while typing"
+msgstr "Felfüggeszti a gépelést"
+
+#: ../finch/gntpounce.c:381
+msgid "Stops typing"
+msgstr "Abbahagyja a gépelést"
+
+#: ../finch/gntpounce.c:382
+msgid "Sends a message"
+msgstr "Üzenetet küld"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+msgid "Action"
+msgstr "Művelet"
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Azonnali üzenőablak megnyitása"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Értesítés megjelenítése"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Üzenet küldése"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Parancs végrehajtása"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Hang lejátszása"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Csak akkor figyelmeztet, ha az állapotom nem érhető el"
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+msgid "Recurring"
+msgstr "Ismétlődő"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Biztos, hogy törölni akarja %s figyelmeztetését a következőnek: %s?"
+
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+msgid "Buddy Pounces"
+msgstr "Partnerfigyelmeztetések"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s gépelni kezdett Önnek (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s szünetet tart az Önnek gépelés közben (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s belépett (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s inaktív állapota megszűnt (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s visszatért (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s abbahagyta a gépelést (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s kilépett (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s állapota inaktív (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s távol van. (%s)"
+
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s egy üzenetet küldött. (%s)"
+
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+msgid "Unknown pounce event. Please report this!"
+msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!"
+
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+msgid "From last sent message"
+msgstr "Utolsó elküldött üzenettől"
+
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Soha"
+
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "Inaktivitási idők megjelenítése"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "Kilépett partnerek megjelenítése"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "Időbélyegek"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "Partnerek figyelmeztetése, ha nekik gépel"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "Naplóformátum"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "Üzenetek naplózása"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "Csevegések naplózása"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "Állapotváltozások naplózása"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Társalgások"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Naplózás"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Beállítások"
-
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "Még nincs megvalósítva."
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
+msgid "Save File..."
+msgstr "Fájl mentése..."
+
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
+msgid "Open File..."
+msgstr "Fájl megnyitása..."
+
+#: ../finch/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Biztos, hogy törölni akarja a következőt: \"%s\"?"
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:138
 msgid "Delete Status"
 msgstr "Állapot törlése"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:931
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Beosztás"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Típus"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1227
-#: ../libgaim/protocols/jabber/jabber.c:1237
-#: ../libgaim/protocols/jabber/jabber.c:1247
-#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/jabber/jabber.c:1267
-#: ../libgaim/protocols/jabber/jabber.c:1279
-#: ../libgaim/protocols/novell/novell.c:2873
-#: ../libgaim/protocols/novell/novell.c:2976
-#: ../libgaim/protocols/novell/novell.c:2982
-#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/oscar/oscar.c:5501
-#: ../libgaim/protocols/oscar/oscar.c:5729
-#: ../libgaim/protocols/oscar/oscar.c:5741
-#: ../libgaim/protocols/oscar/oscar.c:5754
-#: ../libgaim/protocols/oscar/oscar.c:5761
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1233
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5463
+#: ../libpurple/protocols/oscar/oscar.c:5681
+#: ../libpurple/protocols/oscar/oscar.c:5695
+#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Üzenet"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Használat"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Érvénytelen cím"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "Az állapot címét töltse ki."
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Cím kettőzése"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Adjon meg másik címet az állapothoz."
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Alállapot"
 
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
-msgid "Account:"
-msgstr "Fiók:"
-
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Állapot:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Üzenet:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Állapot szerkesztése"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:674
-#: ../libgaim/protocols/jabber/jabber.c:1195
-#: ../libgaim/protocols/msn/msn.c:547
-#: ../libgaim/protocols/novell/novell.c:2870
-#: ../libgaim/protocols/oscar/oscar.c:800
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:2655
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Állapot"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Eltérő állapot használata a következő fiókokhoz"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Mentés és használat"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:83
 msgid "Statuses"
 msgstr "Állapotok"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "Vágólap bővítmény"
+
+#: ../finch/plugins/gntclipboard.c:152
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr "A gnt vágólap tartalmának megváltozásakor a tartalom elérhetővé válik az X által, ha lehetséges."
+
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s belépett"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s kilépett"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s egy üzenetet küldött"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s kimondta az Ön nevét itt: %s"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s egy üzenetet küldött itt: %s"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "Partner be-/kilép"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "Üzenetet kap"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "Valaki beszél egy csevegésben"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "Valaki csevegés közben leírja az Ön nevét"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr "Értesítsen egy kenyérpirítóval ha:"
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr "Csipogjon is!"
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr "SÜRGŐS állapot beállítása a terminálablakhoz."
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-#, fuzzy
-msgid "Toaster plugin for Gaim-Text."
-msgstr "Kenyérpirító bővítmény a Gaim-Texthez."
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+msgid "Toaster plugin"
+msgstr "Kenyérpirító bővítmény"
 
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Társalgás %s partnerrel ekkor: %s:</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Az előzmények bővítmény megköveteli a naplózást"
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1099,15 +1415,15 @@ msgstr ""
 "Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok "
 "előzményeit is aktiválja."
 
-#: ../console/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt előzmények"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1115,4621 +1431,216 @@ msgstr ""
 "Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az "
 "aktuális társalgásba."
 
-#: ../console/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Szövegrészlet keresése a naplóban."
 
-#: ../console/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr "Lastlog bővítmény a gaim-texthez."
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Tájolás"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "A tálca tájolása."
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "Ál_név"
-
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "_Csatlakozás"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "_Lapok bezárása"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "Ü_zenet"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "Információ le_kérése"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "Meg_hívás"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "_Módosítás"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "_Levél megnyitása"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Szünet"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "Bejelentkezés beállításai"
-
-#: ../gtk/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "Helyi álnév:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:554
-msgid "User Options"
-msgstr "Felhasználói beállítások"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr "Ezen partnerikon használata a fiókhoz:"
-
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:684
-#, c-format
-msgid "%s Options"
-msgstr "%s beállításai"
-
-#: ../gtk/gtkaccount.c:881
-msgid "Use GNOME Proxy Settings"
-msgstr "GNOME proxybeállítások használata"
-
-#: ../gtk/gtkaccount.c:882
-msgid "Use Global Proxy Settings"
-msgstr "Globális proxybeállítások használata"
-
-#: ../gtk/gtkaccount.c:888
-msgid "No Proxy"
-msgstr "Nincs Proxy"
-
-#: ../gtk/gtkaccount.c:894
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:900
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:906
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "Környezeti beállítások használata"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:951
-msgid "If you look real closely"
-msgstr "ha igazán közelről nézi"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:954
-msgid "you can see the butterflies mating"
-msgstr "láthatja a pillangók nászát"
-
-#: ../gtk/gtkaccount.c:975
-msgid "Proxy Options"
-msgstr "Proxy beállításai"
-
-#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "Proxy _típusa:"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_Gépnév:"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "_Felhasználó:"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "Jel_szó:"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "Fiók hozzáadása"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "_Alap"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "_Haladó"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
-msgid "Register"
-msgstr "Regisztráció"
-
-#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: ../gtk/gtkaccount.c:1961
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../gtk/gtkaccount.c:2133
-msgid ""
-"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-"<span size='larger' weight='bold'>Üdvözli a Gaim!</span>\n"
-"\n"
-"Nincsenek beállítva azonnali üzenő fiókjai. A Gaim használatának megkezdéséhez kattintson "
-"az alábbi <b>Hozzáadás</b> gombra és állítsa be első fiókját. Ha azt szeretné "
-"hogy a Gaim több fiókhoz csatlakozzon, kattintson újra a <b>Hozzáadás</b> gombra és állítsa be mindet.\n"
-"\n"
-"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, szerkesztéséhez vagy eltávolításához."
-
-#: ../gtk/gtkaccount.c:2483
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
-
-#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
-msgid "Authorize buddy?"
-msgstr "Engedélyezi a partnert?"
-
-#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
-msgid "Authorize"
-msgstr "Engedélyezés"
-
-#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
-msgid "Deny"
-msgstr "Elutasítás"
-
-#: ../gtk/gtkblist.c:709
-msgid "Join a Chat"
-msgstr "Csatlakozás egy csevegéshez"
-
-#: ../gtk/gtkblist.c:730
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez "
-"csatlakozni kíván.\n"
-
-#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
-msgid "_Account:"
-msgstr "F_iók:"
-
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "Blo_kkolás"
-
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr "Bl_okkolás megszüntetése"
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "_Info"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "_Fájl küldése"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr "_Partnerfigyelmeztetés felvétele"
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "Nap_ló megtekintése"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "Álnév..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "Ál_név..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "_Eltávolítás"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "P_artner felvétele"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "_Csevegés felvétele"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "_Csoport törlése"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "Á_tnevezés"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "Automatikus csatlakozás"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr "Összecs_ukás"
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr "_Kibontás"
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "/Eszközök/Hangok némítása"
-
-#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
-"partnert."
-
-#. Buddies menu
-#: ../gtk/gtkblist.c:2567
-msgid "/_Buddies"
-msgstr "/_Partnerek"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Partnerek/Új azonnal_i üzenet..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Partnerek/_Csatlakozás csevegéshez..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/Partnerek/_Felhasználó adatainak lekérése..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/Partnerek/Felhasználó _naplójának lekérése..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Partnerek/Ki_lépett partnerek megjelenítése"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Partnerek/Ür_es csoportok megjelenítése"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Partnerek/_Partner részleteinek megjelenítése"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Partnerek/Inaktív i_dők megjelenítése"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Partnerek/Part_nerek rendezése"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Partnerek/_Partner felvétele..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/Partnerek/Cse_vegés felvétele..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/Partnerek/C_soport felvétele..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/Partnerek/_Kilépés"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/_Fiókok"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Fiókok/Hozzáadás\\/Szerkesztés"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/_Eszközök"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Eszközök/_Partnerfigyelmeztetések"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/Eszközök/Bő_vítmények"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/Eszközök/_Beállítások"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/Eszközök/Ma_gánszféra"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/Eszközök/_Fájlátvitelek"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/Eszközök/_Szobalista"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/Eszközök/_Rendszernapló"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/Eszközök/_Hangok némítása"
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/_Súgó"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/Súgó/Online _súgó"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/Súgó/_Hibakereső ablak"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/Súgó/_Névjegy"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Fiók:</b> %s"
-
-#: ../gtk/gtkblist.c:2722
-msgid "Buddy Alias"
-msgstr "Partnerálnév"
-
-#: ../gtk/gtkblist.c:2743
-msgid "Logged In"
-msgstr "Bejelentkezve"
-
-#: ../gtk/gtkblist.c:2789
-msgid "Last Seen"
-msgstr "Utoljára látszott"
-
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1401
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
-#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
-#: ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Kilépett"
-
-#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "Leírás"
-
-#: ../gtk/gtkblist.c:2809
-msgid "Spooky"
-msgstr "Idegroncs"
-
-#: ../gtk/gtkblist.c:2811
-msgid "Awesome"
-msgstr "Szuper"
-
-#: ../gtk/gtkblist.c:2813
-msgid "Rockin'"
-msgstr "Király"
-
-#: ../gtk/gtkblist.c:3302
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Inaktív (%d ó %02d p)"
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "Inaktív (%d p)"
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "/Partnerek/Új azonnali üzenet..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/Partnerek/Csatlakozás csevegéshez..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/Partnerek/Felhasználó adatainak lekérése..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/Partnerek/Partner felvétele..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/Partnerek/Csevegés felvétele..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/Partnerek/Csoport felvétele..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/Eszközök/Partnerfigyelmeztetések"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/Eszközök/Magánszféra"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/Eszközök/Szobalista"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d olvasatlan üzenet %s partnertől\n"
-msgstr[1] "%d olvasatlan üzenet %s partnertől\n"
-
-#: ../gtk/gtkblist.c:3654
-msgid "Manually"
-msgstr "Kézi"
-
-#: ../gtk/gtkblist.c:3656
-msgid "Alphabetically"
-msgstr "ABC sorrend"
-
-#: ../gtk/gtkblist.c:3657
-msgid "By status"
-msgstr "Állapot szerint"
-
-#: ../gtk/gtkblist.c:3658
-msgid "By log size"
-msgstr "Napló mérete szerint"
-
-#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "%s bontotta a kapcsolatot"
-
-#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
-msgid "Connect"
-msgstr "Kapcsolódás"
-
-#: ../gtk/gtkblist.c:3869
-msgid "Re-enable Account"
-msgstr "Fiók újraengedélyezése"
-
-#: ../gtk/gtkblist.c:3890
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s bontotta a kapcsolatot: %s</span>"
-
-#: ../gtk/gtkblist.c:4027
-msgid "<b>Username:</b>"
-msgstr "<b>Felhasználónév:</b>"
-
-#: ../gtk/gtkblist.c:4034
-msgid "<b>Password:</b>"
-msgstr "<b>Jelszó:</b>"
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "Lastlog bővítmény."
 
-#: ../gtk/gtkblist.c:4045
-msgid "_Login"
-msgstr "_Bejelentkezés"
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/Fiókok"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-"<span size='larger' weight='bold'>Üdvözli a Gaim!</span>\n"
-"\n"
-"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát és cseveghet barátaival."
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Partnerek/Kilépett partnerek megjelenítése"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Partnerek/Üres csoportok megjelenítése"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Partnerek/Partner részleteinek megjelenítése"
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/Partnerek/Inaktivitási idők megjelenítése"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "Partnerek"
-
-#: ../gtk/gtkblist.c:5207
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat "
-"egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett "
-"kerül megjelenítésre, amennyiben az lehetséges.\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Csoport:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas "
-"lenne."
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni "
-"kívánt csevegésről.\n"
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "Kérem adja meg a felvenni kívánt csoport nevét."
-
-#: ../gtk/gtkblist.c:6299
-msgid "<GaimMain>/Accounts/"
-msgstr "<GaimMain>/Fiókok/"
-
-#: ../gtk/gtkblist.c:6324
-msgid "_Edit Account"
-msgstr "_Fiók szerkesztése"
-
-#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr "Nem állnak rendelkezésre műveletek"
-
-#: ../gtk/gtkblist.c:6371
-msgid "_Disable"
-msgstr "_Tiltás"
-
-#: ../gtk/gtkblist.c:6383
-msgid "Enable Account"
-msgstr "Fiók engedélyezése"
-
-#: ../gtk/gtkblist.c:6389
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr "<GaimMain>/Fiókok/Fiók engedélyezése"
-
-#: ../gtk/gtkblist.c:6438
-msgid "/Tools"
-msgstr "/Eszközök"
-
-#: ../gtk/gtkblist.c:6508
-msgid "/Buddies/Sort Buddies"
-msgstr "/Partnerek/Partnerek rendezése"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"A Gaim nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a "
-"hibát és nem engedélyezi újra a fiókot."
-
-#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "A partner nem ugyanazt a protokollt használja, mint ez a csevegés"
-
-#: ../gtk/gtkconv.c:786
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
-"partnert."
-
-#: ../gtk/gtkconv.c:839
-msgid "Invite Buddy Into Chat Room"
-msgstr "Partner meghívása a csevegőszobába"
-
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:869
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
-"tetszőleges meghívóüzenettel együtt."
-
-#: ../gtk/gtkconv.c:890
-msgid "_Buddy:"
-msgstr "_Partner:"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "Ü_zenet:"
-
-#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "Nem lehet megnyitni a fájlt."
-
-#: ../gtk/gtkconv.c:973
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Társalgás %s partnerrel</h1>\n"
-
-#: ../gtk/gtkconv.c:997
-msgid "Save Conversation"
-msgstr "Társalgás mentése"
-
-#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "Keresés"
-
-#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "Kere_sés:"
-
-#: ../gtk/gtkconv.c:1341
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
-
-#: ../gtk/gtkconv.c:1349
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
-
-#: ../gtk/gtkconv.c:1617
-msgid "Un-Ignore"
-msgstr "Mellőzés visszavonása"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Ignore"
-msgstr "Mellőzés"
-
-#: ../gtk/gtkconv.c:1640
-msgid "Get Away Message"
-msgstr "Távollét üzenet lekérdezése"
-
-#: ../gtk/gtkconv.c:1663
-msgid "Last said"
-msgstr "Utoljára ezt mondta"
-
-#: ../gtk/gtkconv.c:2428
-msgid "Unable to save icon file to disk."
-msgstr "Nem menthető lemezre az ikonfájl."
-
-#: ../gtk/gtkconv.c:2498
-msgid "Save Icon"
-msgstr "Ikon mentése"
-
-#: ../gtk/gtkconv.c:2547
-msgid "Animate"
-msgstr "Animálás"
-
-#: ../gtk/gtkconv.c:2552
-msgid "Hide Icon"
-msgstr "Ikon elrejtése"
-
-#: ../gtk/gtkconv.c:2555
-msgid "Save Icon As..."
-msgstr "Ikon mentése másként..."
-
-#: ../gtk/gtkconv.c:2559
-msgid "Set Custom Icon..."
-msgstr "Egyéni ikon beállítása..."
-
-#: ../gtk/gtkconv.c:2566
-msgid "Remove Custom Icon"
-msgstr "Egyéni ikon eltávolítása"
-
-#. Conversation menu
-#: ../gtk/gtkconv.c:2707
-msgid "/_Conversation"
-msgstr "/_Társalgás"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Társalgás/Új azonnali ü_zenet..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/Társalgás/Ker_esés..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/Társalgás/Nap_ló megtekintése"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/Társalgás/_Mentés másként..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Társalgás/Elő_zmények törlése"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/Társalgás/Fájl kül_dése..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/Társalgás/_Információ lekérése"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/Társalgás/Me_ghívás..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/Társalgás/_Több"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/Társalgás/Ál_név..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/Társalgás/_Tiltás..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/Társalgás/_Hozzáadás..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/Társalgás/_Eltávolítás..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Társalgás/Hi_vatkozás beszúrása..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Társalgás/_Kép beszúrása..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/Társalgás/_Bezárás"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/_Beállítások"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/Beállítások/_Naplózás engedélyezése"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/Beállítások/_Hangok engedélyezése"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Beállítások/_Partnerikonok megjelenítése"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Beállítások/_Formázás eszköztárak mutatása"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Beállítások/I_dőbélyegek mutatása"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/Társalgás/Több"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/Társalgás"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/Társalgás/Napló megtekintése"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/Társalgás/Fájl küldése..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Társalgás/Partnerfigyelmeztetés felvétele..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/Társalgás/Információ lekérése"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/Társalgás/Meghívás..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/Társalgás/Álnév..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/Társalgás/Tiltás..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/Társalgás/Hozzáadás..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/Társalgás/Eltávolítás..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/Társalgás/Hivatkozás beszúrása..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/Társalgás/Kép beszúrása..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/Beállítások/Naplózás engedélyezése"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/Beállítások/Hangok engedélyezése"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Beállítások/Formázás eszköztárak mutatása"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/Beállítások/Időbélyegek mutatása"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/Beállítások/Partnerikon megjelenítése"
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "A felhasználó gépel..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "A felhasználó gépelt valamit és megállt"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "_Küldés mint"
-
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "_Küldés"
-
-#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
-msgid "Topic:"
-msgstr "Téma:"
-
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4115
-msgid "0 people in room"
-msgstr "0 személy tartózkodik a szobában"
-
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d személy van a szobában"
-msgstr[1] "%d személy van a szobában"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Gépel"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "Abbahagyta a gépelést"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr "Becenév kimondva"
-
-#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "Olvasatlan üzenetek"
-
-#: ../gtk/gtkconv.c:5876
-msgid "New Event"
-msgstr "Új esemény"
-
-#: ../gtk/gtkconv.c:6997
-msgid "Confirm close"
-msgstr "Bezárás jóváhagyása"
-
-#: ../gtk/gtkconv.c:7029
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Olvasatlan üzenetei vannak. Biztos, hogy bezárja az ablakot?"
-
-#: ../gtk/gtkconv.c:7564
-msgid "Close other tabs"
-msgstr "Más lapok bezárása"
-
-#: ../gtk/gtkconv.c:7570
-msgid "Close all tabs"
-msgstr "Minden lap bezárása"
-
-#: ../gtk/gtkconv.c:7578
-msgid "Detach this tab"
-msgstr "Ezen lap leválasztása"
-
-#: ../gtk/gtkconv.c:7584
-msgid "Close this tab"
-msgstr "Ezen lap bezárása"
-
-#: ../gtk/gtkconv.c:7855
-msgid "Close conversation"
-msgstr "Társalgás bezárása"
-
-#: ../gtk/gtkconv.c:8319
-msgid "Last created window"
-msgstr "Utoljára létrehozott ablak"
-
-#: ../gtk/gtkconv.c:8321
-msgid "Separate IM and Chat windows"
-msgstr "Üzenő- és csevegőablakok elkülönítése"
-
-#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
-msgid "New window"
-msgstr "Új ablak"
-
-#: ../gtk/gtkconv.c:8325
-msgid "By group"
-msgstr "Csoport szerint"
-
-#: ../gtk/gtkconv.c:8327
-msgid "By account"
-msgstr "Fiók szerint"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "Hibakereső napló mentése"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr "Invertálás"
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr "Találatok kiemelése"
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "Csak i_kon"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "Csak s_zöveg"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "Ik_on és szöveg"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr "Szűrő"
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "Kattintson a jobb egérgombbal további beállításokért."
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "Szint: "
-
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr "Válassza ki a hibakeresési szűrő szintjét."
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "Minden"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "Egyéb"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "Hiba "
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "Végzetes hiba"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "vezető fejlesztő"
-
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
-msgid "developer"
-msgstr "fejlesztő"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "fejlesztő és webmester"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "támogató"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "támogató/QA"
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "win32 portolás"
-
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "karbantartó"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "libfaim karbantartó"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker és kijelölt vezető"
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber fejlesztő"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "eredeti szerző"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Arab"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "Bolgár"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Bengáli"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Bosnyák"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "Katalán"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Valenciai katalán"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "Cseh"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Dán"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "Német"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr "Dzongkha"
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "Görög"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "Ausztrál angol"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "Kanadai angol"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "Brit angol"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "Eszperantó"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "Spanyol"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "Baszk"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "Perzsa"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "Finn"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "Francia"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "Galíciai"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "Gudzsarati"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "Héber"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "Magyar"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "Olasz"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "Japán"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "Grúz"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "Koreai"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr "Kurd"
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "Litván"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "Macedón"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "Nepáli"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "Holland, flamand"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Norvég"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "Lengyel"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "Portugál"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "Brazil portugál"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "Román"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "Orosz"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "Szerb"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "Szlovák"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "Szlovén"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "Albán"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "Svéd"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "Tamil"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "Thai"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "Török"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "Vietnami"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh és a Gnome-Vi csapat"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "Egyszerűsített kínai"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "Hagyományos kínai"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr "Amhara"
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "A Gaim névjegye"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"A Gaim egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
-"SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"Gadu-Gadu és QQ protokollok egyidejű használatának képességével. A Gtk+ "
-"használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot "
-"terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában "
-"foglaltak alapján. A GPL egy példánya megtalálható a Gaimmal terjesztett "
-"\"COPYING\" fájlban. A Gaim szerzői jogait a közreműködők birtokolják, ezek "
-"teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk "
-"garanciát.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim az irc.freenode.net címen<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim az irc.freenode.net címen<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:359
-msgid "Current Developers"
-msgstr "Jelenlegi fejlesztők"
-
-#: ../gtk/gtkdialogs.c:374
-msgid "Crazy Patch Writers"
-msgstr "Őrült patch szerzők"
-
-#: ../gtk/gtkdialogs.c:389
-msgid "Retired Developers"
-msgstr "Visszavonult fejlesztők"
-
-#: ../gtk/gtkdialogs.c:404
-msgid "Current Translators"
-msgstr "Jelenlegi fordítók"
-
-#: ../gtk/gtkdialogs.c:424
-msgid "Past Translators"
-msgstr "Korábbi fordítók"
-
-#: ../gtk/gtkdialogs.c:442
-msgid "Debugging Information"
-msgstr "Hibakeresési információk"
-
-#: ../gtk/gtkdialogs.c:816
-msgid "Get User Info"
-msgstr "Felhasználó adatainak lekérése"
-
-#: ../gtk/gtkdialogs.c:818
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg "
-"szeretné tekinteni."
-
-#: ../gtk/gtkdialogs.c:907
-msgid "View User Log"
-msgstr "Felhasználó naplójának lekérése"
-
-#: ../gtk/gtkdialogs.c:909
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg "
-"szeretné tekinteni."
-
-#: ../gtk/gtkdialogs.c:928
-msgid "Alias Contact"
-msgstr "Kapcsolat álneve"
-
-#: ../gtk/gtkdialogs.c:929
-msgid "Enter an alias for this contact."
-msgstr "Adjon meg egy álnevet ehhez a kapcsolathoz."
-
-#: ../gtk/gtkdialogs.c:949
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Adjon meg egy álnevet %s számára."
-
-#: ../gtk/gtkdialogs.c:951
-msgid "Alias Buddy"
-msgstr "Partner álneve"
-
-#: ../gtk/gtkdialogs.c:970
-msgid "Alias Chat"
-msgstr "Csevegés álneve"
-
-#: ../gtk/gtkdialogs.c:971
-msgid "Enter an alias for this chat."
-msgstr "Adjon meg egy álnevet ehhez a csevegéshez."
-
-#: ../gtk/gtkdialogs.c:1008
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-msgstr[1] ""
-"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "Kapcsolat eltávolítása"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "_Kapcsolat eltávolítása"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. "
-"Folytatni akarja?"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "Csoportok összefésülése"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "_Csoportok összefésülése"
-
-#: ../gtk/gtkdialogs.c:1105
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"A(z) %s csoport és annak összes tagja eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-
-#: ../gtk/gtkdialogs.c:1108
-msgid "Remove Group"
-msgstr "Csoport törlése"
-
-#: ../gtk/gtkdialogs.c:1109
-msgid "_Remove Group"
-msgstr "_Csoport eltávolítása"
-
-#: ../gtk/gtkdialogs.c:1142
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "%s eltávolítására készül a partnerlistájáról. Folytatni akarja?"
-
-#: ../gtk/gtkdialogs.c:1145
-msgid "Remove Buddy"
-msgstr "Partner törlése"
-
-#: ../gtk/gtkdialogs.c:1146
-msgid "_Remove Buddy"
-msgstr "Partner _törlése"
-
-#: ../gtk/gtkdialogs.c:1167
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
-
-#: ../gtk/gtkdialogs.c:1170
-msgid "Remove Chat"
-msgstr "Csevegés eltávolítása"
-
-#: ../gtk/gtkdialogs.c:1171
-msgid "_Remove Chat"
-msgstr "_Csevegés eltávolítása"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "Állapot megváltoztatása"
-
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2851
-#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
-msgid "Available"
-msgstr "Elérhető"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:226
-#: ../libgaim/protocols/jabber/buddy.c:1407
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4498
-#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3353
-#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
-msgid "Away"
-msgstr "Távol"
-
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
-#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
-#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "Láthatatlan"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr "Partnerlista mutatása"
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "Új üzenet..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "Hangok némítása"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr "Villogjon új üzenetkor"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/gtkdocklet.c:567
-msgid "Quit"
-msgstr "Kilépés"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/mp"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "Nem indult el"
-
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:1397
-#: ../libgaim/protocols/jabber/buddy.c:1414
-#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
-msgid "Finished"
-msgstr "Befejeződött"
-
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
-msgid "Canceled"
-msgstr "Megszakítva"
-
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "Várakozás az átvitel indulására"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Fájlátvitelek - %2$d fájl %1$d százaléka"
-
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "Fájlátvitel"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Fogadás mint:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Fogadás partnertől:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>Küldés partnernek:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>Küldés mint:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr "Nincs alkalmazás beállítva az ilyen típusú fájlok megnyitására."
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "Hiba történt a fájl megnyitása közben."
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Hiba %s indításakor: %s"
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr "Hiba %s futtatásakor"
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr "A folyamat a következő hibakóddal tért vissza: %d"
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "Folyamat"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "Fájlnév"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "Méret"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "Hátralévő"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "Fájlnév:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "Helyi fájl:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "Sebesség:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "Eltelt idő:"
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "Hátralévő idő:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "Ezen _ablak bezárása az összes átvitel befejeződésekor"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "B_efejezett átvitelek törlése"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "Fájlát_vitel részletei"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_Folytatás"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "Sikertelen"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Beillesztés egyszerű szö_vegként"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "F_ormázás törlése"
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "Hiperhivatkozás színe"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "Hiperhivatkozások rajzolásához használt szín."
-
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr "Hiperhivatkozás előfényszíne"
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Hiperhivatkozások rajzolásához használt szín, amikor az egér rájuk mutat."
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "E-mail cím _másolása"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "Hivatk_ozás megnyitása böngészőben"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "_Hivatkozás helyének másolása"
-
-#: ../gtk/gtkimhtml.c:3271
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Ismeretlen fájltípus</span>\n"
-"\n"
-"Alapértelmezett PNG használata."
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Ismeretlen fájltípus\n"
-"\n"
-"Alapértelmezett PNG használata."
-
-#: ../gtk/gtkimhtml.c:3287
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Hiba a kép mentése közben</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Hiba a kép mentése közben\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "Kép mentése"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "Kép menté_se..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Betűkészlet kiválasztása"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Szöveg színének kiválasztása"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Háttérszín kiválasztása"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Leírás"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás "
-"opcionális."
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét."
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Hivatkozás beszúrása"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Beszúrás"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "A kép tárolása nem sikerült: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Kép beszúrása"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Ehhez a témához nem állnak rendelkezésre hangulatjelek."
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Hangulatjel választása"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "Félkövér"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "Dőlt"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "Aláhúzott"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Nagyobb betűméret"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Kisebb betűméret"
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Betűkészlet"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Betűszín"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Háttérszín"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Formázás törlése"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Hivatkozás beszúrása"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Kép beszúrása"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Hangulatjel beszúrása"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Társalgás itt: %s, ekkor: %s</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Társalgás ezzel: %s, ekkor: %s</"
-"span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes "
-"állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali "
-"üzenet naplózása\" tulajdonság be van állítva."
-
-#: ../gtk/gtklog.c:338
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása"
-"\" tulajdonság be van állítva."
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Nem találhatók naplók"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr "A _naplómappa böngészése"
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Teljes naplóméret:"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "Társalgások ezen: %s"
-
-#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "Társalgások a következővel: %s"
-
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "Rendszernapló"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Próbálja a \"%s -h\" parancsot további információkért.\n"
-
-#: ../gtk/gtkmain.c:346
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Használat: %s [KAPCSOLÓ]...\n"
-"\n"
-"  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
-"  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
-"  -h, --help          ezen súgó megjelenítése és kilépés\n"
-"  -n, --nologin       ne jelentkezzen be automatikusan\n"
-"  -l, --login[=NÉV]   automatikus bejelentkezés (a NÉV paraméter megadja a\n"
-"                      használandó fiókok vesszőkkel tagolt listáját)\n"
-"  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-"A Gaim összeomlott és megpróbált kiírni egy magfájlt.\n"
-"Ez a szoftver és nem az Ön hibája miatt történt.\n"
-"\n"
-"Ha ismételten elő tudja állítani az összeomlást, akkor\n"
-"értesítse a Gaim fejlesztőit a következő címen:\n"
-"%sbug.php\n"
-"\n"
-"Győződjön meg róla, hogy megadta, mit csinált az összeomlás előtt,\n"
-"és küldje be a visszakövetésből származó magfájlt. Ha nem tudja, hogyan\n"
-"szerezze be a visszakövetést, akkor olvassa el a következő címen található\n"
-"utasításokat:\n"
-"%sgdb.php\n"
-"\n"
-"Ha további segítségre van szüksége, akkor küldjön AIM üzenetet\n"
-"SeanEgn-nak vagy LSchiere-nek. Sean és Luke kapcsolatinformációi más\n"
-"protokollokhoz elérhetők a következő oldalon:\n"
-"%scontactinfo.php\n"
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "Összes üzenet megnyitása"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Levele érkezett!</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "Feladó"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s %d új üzenetet kapott."
-msgstr[1] "%s %d új üzenetet kapott."
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>%d új e-mailje érkezett.</b>"
-msgstr[1] "<b>%d új e-mailje érkezett.</b>"
-
-#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
-msgid "Search Results"
-msgstr "A keresés eredménye"
-
-#: ../gtk/gtknotify.c:899
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "A(z) \"%s\" böngészőparancs érvénytelen."
-
-#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
-#: ../gtk/gtknotify.c:1054
-msgid "Unable to open URL"
-msgstr "Az URL megnyitása sikertelen"
-
-#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Hiba \"%s\" indításakor: %s"
-
-#: ../gtk/gtknotify.c:1055
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "A \"Kézi\" böngészőparancsot választotta, de nem adott meg parancsot."
-
-#: ../gtk/gtkplugin.c:264
-msgid "The following plugins will be unloaded."
-msgstr "A következő bővítmények lesznek eltávolítva."
-
-#: ../gtk/gtkplugin.c:283
-msgid "Multiple plugins will be unloaded."
-msgstr "Több bővítmény lesz eltávolítva."
-
-#: ../gtk/gtkplugin.c:285
-msgid "Unload Plugins"
-msgstr "Bővítmények eltávolítása"
-
-#: ../gtk/gtkplugin.c:397
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Írta:</span>\t%s\n"
-"<span weight=\"bold\">Webcím:</span>\t\t%s\n"
-"<span weight=\"bold\">Fájlnév:</span>\t\t%s"
-
-#: ../gtk/gtkplugin.c:407
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Hiba: %s\n"
-"Keressen frissítést a bővítmény webhelyén.</span>"
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "Bő_vítmény beállítása"
-
-#: ../gtk/gtkplugin.c:596
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Bővítmény részletei</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "Fájl kiválasztása"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "Adjon meg egy figyelendő partnert."
-
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr "Új partnerfigyelmeztetés"
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr "Partnerfigyelmeztetés szerkesztése"
-
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr "Kinél figyelmeztet"
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "_Partner neve:"
-
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "Figyelmeztetés, ha a partner..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "Be_jelentkezik"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "_Kijelentkezik"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "A partner _elmegy"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "Visszaté_r távollétből"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "_Inaktív lesz"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "_Már nem inaktív"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "Elkez_d gépelni"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "_Felfüggeszti a gépelést"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "_Abbahagyja a gépelést"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "Ü_zenetet küld"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "Művelet"
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "Azonnali üzenőablak _megnyitása"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "Értesítés _megjelenítése"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Ü_zenet küldése"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "Paran_cs végrehajtása"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "Hang _lejátszása"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "_Tallózás..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "_Tallózás..."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "_Előnézet"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "_Csak akkor figyelmeztet, ha az állapotom nem érhető el"
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "_Ismétlődő"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Biztos, hogy törölni akarja %s figyelmeztetését a következőnek: %s?"
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr "Figyelmeztetés címzettje"
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "Ismétlődő"
-
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "Partnerfigyelmeztetések"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s gépelni kezdett Önnek (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "%s szünetet tart az Önnek gépelés közben (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s belépett (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s inaktív állapota megszűnt (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s visszatért (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s abbahagyta a gépelést (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s kilépett (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s állapota inaktív (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s távol van. (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s egy üzenetet küldött. (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!"
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
-"témák a témalistába dobással telepíthetők."
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Ikon"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Rendszertálca-ikon"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "_Rendszertálca-ikon megjelenítése:"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "Mindig"
-
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
-#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
-#: ../libgaim/plugins/autoreply.c:360
-msgid "Never"
-msgstr "Soha"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "Olvasatlan üzenetek esetén"
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "Társalgási ablak elrejtése"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "Új társal_gások elrejtése:"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
-msgid "When away"
-msgstr "Ha távol vagyok"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Lapok"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Üzenetek és csevegések megjelenítése _lapokkal ellátott ablakokban"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "_Bezárás gomb megjelenítése a lapokon"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Elhelyezés:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "Felül"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "Alul"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "Bal oldalon"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "Jobb oldalon"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "Balra függőlegesen"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "Jobbra függőlegesen"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "Új _társalgások:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "_Formázás mutatása bejövő üzeneteknél"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "_Partnerikonok megjelenítése"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "Partnerikon-a_nimáció engedélyezése"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "Partnerek figyelmez_tetése, ha nekik gépel"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "_Helytelenül írt szavak kiemelése"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Finom görgetés használata"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "_Villanjon az ablak új üzenetek fogadásakor"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "Alapértelmezett formázás"
-
-#: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, "
-"amelyek támogatják a formázást. :)"
-
-#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3701
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP cím"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN kiszolgáló:"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Például: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "_IP cím automatikus felismerése"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "_Nyilvános IP:"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "Portok"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "A figyelendő porttartomány _kézi megadása"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "_Első port:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "_Utolsó port:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Proxy-kiszolgáló"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "Nincs Proxy"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Felhasználó:"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Opera"
-msgstr "Opera"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "GNOME Default"
-msgstr "GNOME alapértelmezés"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../gtk/gtkprefs.c:1225
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1234
-msgid "Manual"
-msgstr "Egyéni"
-
-#: ../gtk/gtkprefs.c:1287
-msgid "Browser Selection"
-msgstr "Böngészőválasztás"
-
-#: ../gtk/gtkprefs.c:1291
-msgid "_Browser:"
-msgstr "_Böngésző:"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "Hivatk_ozás megnyitása:"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Browser default"
-msgstr "Alapértelmezett böngésző"
-
-#: ../gtk/gtkprefs.c:1302
-msgid "Existing window"
-msgstr "Létező ablak"
-
-#: ../gtk/gtkprefs.c:1304
-msgid "New tab"
-msgstr "Új lap"
-
-#: ../gtk/gtkprefs.c:1318
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Kézi:\n"
-"(%s az URL-hez)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "Napló_formátum:"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "Összes azonnali üzenet na_plózása"
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr "Összes _csevegés naplózása"
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr "Összes állapot_változás naplózása a rendszernaplóba"
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "Hang kiválasztása"
-
-#: ../gtk/gtkprefs.c:1521
-msgid "Quietest"
-msgstr "Leghalkabb"
-
-#: ../gtk/gtkprefs.c:1523
-msgid "Quieter"
-msgstr "Halkabb"
-
-#: ../gtk/gtkprefs.c:1525
-msgid "Quiet"
-msgstr "Halk"
-
-#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normál"
-
-#: ../gtk/gtkprefs.c:1529
-msgid "Loud"
-msgstr "Hangos"
-
-#: ../gtk/gtkprefs.c:1531
-msgid "Louder"
-msgstr "Hangosabb"
-
-#: ../gtk/gtkprefs.c:1533
-msgid "Loudest"
-msgstr "Leghangosabb"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Hangrendszer"
-
-#: ../gtk/gtkprefs.c:1597
-msgid "_Method:"
-msgstr "Hang_rendszer kiválasztása:"
-
-#: ../gtk/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Rendszer-hangszóró"
-
-#: ../gtk/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "Automatikus"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "Command"
-msgstr "Parancs"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "No sounds"
-msgstr "Nincsenek hangok"
-
-#: ../gtk/gtkprefs.c:1613
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Hanglejátszó _parancs:\n"
-"(%s fájlnév megadásához)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Hangbeállítások"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr "Hangok lejátszása, ha a társalgás ablaka a_ktív"
-
-#: ../gtk/gtkprefs.c:1642
-msgid "Enable sounds:"
-msgstr "Hangok engedélyezése:"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "Csak ha elérhető"
-
-#: ../gtk/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "Csak ha nem érhető el"
-
-#: ../gtk/gtkprefs.c:1653
-msgid "Volume:"
-msgstr "Hangerő:"
-
-#: ../gtk/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "Hangesemények"
-
-#: ../gtk/gtkprefs.c:1732
-msgid "Play"
-msgstr "Lejátszás"
-
-#: ../gtk/gtkprefs.c:1739
-msgid "Event"
-msgstr "Esemény"
-
-#: ../gtk/gtkprefs.c:1758
-msgid "Test"
-msgstr "Teszt"
-
-#: ../gtk/gtkprefs.c:1762
-msgid "Reset"
-msgstr "Visszaállítás"
-
-#: ../gtk/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Kiválasztás..."
-
-#: ../gtk/gtkprefs.c:1809
-msgid "_Report idle time:"
-msgstr "_Inaktivitás idejének jelentése:"
-
-#: ../gtk/gtkprefs.c:1812
-msgid "From last sent message"
-msgstr "Utolsó elküldött üzenettől"
-
-#: ../gtk/gtkprefs.c:1814
-msgid "Based on keyboard or mouse use"
-msgstr "Billentyűzet vagy egér használata alapján"
-
-#: ../gtk/gtkprefs.c:1823
-msgid "_Auto-reply:"
-msgstr "_Automatikus válasz:"
-
-#: ../gtk/gtkprefs.c:1827
-msgid "When both away and idle"
-msgstr "Ha távol van és inaktív"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1833
-msgid "Auto-away"
-msgstr "Automatikus távollét"
-
-#: ../gtk/gtkprefs.c:1835
-msgid "Change status when _idle"
-msgstr "Állapot módosítása, _ha inaktív"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "Állapot módosítása ennyi _perc után:"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "Állap_ot megváltoztatása a következőre:"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1868
-msgid "Status at Startup"
-msgstr "Állapot induláskor"
-
-#: ../gtk/gtkprefs.c:1870
-msgid "Use status from last _exit at startup"
-msgstr "Az utolsó kilé_péskor érvényes állapot használata induláskor"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "In_dításkor alkalmazandó állapot:"
-
-#: ../gtk/gtkprefs.c:1914
-msgid "Interface"
-msgstr "Felület"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Smiley Themes"
-msgstr "Hangulatjel-témák"
-
-#: ../gtk/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Hangok"
-
-#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "Hálózat"
-
-#: ../gtk/gtkprefs.c:1923
-msgid "Browser"
-msgstr "Böngésző"
-
-#: ../gtk/gtkprefs.c:1927
-msgid "Status / Idle"
-msgstr "Állapot / Inaktív"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Mindenki kapcsolatba léphet velem"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Csak a partnerlistán szereplő felhasználók"
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Csak az alábbi felhasználók:"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Az összes felhasználó letiltása"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Csak a következő felhasználók letiltása:"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Magánszféra"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "A magánszféra beállításainak módosításai azonnal életbe lépnek."
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "Magánszféra beállításai ehhez:"
-
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "Felhasználó engedélyezése"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "Adjon meg egy felhasználót, aki kapcsolatba léphet Önnel."
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy "
-"kapcsolatba lépjen Önnel."
-
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Engedélyezés"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Megengedi, hogy %s kapcsolatba lépjen Önnel?"
-
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Biztosan megengedi, hogy %s kapcsolatba lépjen Önnel?"
-
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "Felhasználó tiltása"
-
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Adjon meg egy letiltandó felhasználót."
-
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Adja meg a letiltani kívánt felhasználó nevét."
-
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "Letiltja a következőt: %s?"
-
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Biztosan le akarja tiltani %s felhasználót?"
-
-#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
-#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "Igen"
-
-#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
-#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-msgid "No"
-msgstr "Nem"
-
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "Alkalmazás"
-
-#: ../gtk/gtkrequest.c:1469
-msgid "That file already exists"
-msgstr "Ez a fájl már létezik"
-
-#: ../gtk/gtkrequest.c:1470
-msgid "Would you like to overwrite it?"
-msgstr "Szeretné felülírni?"
-
-#: ../gtk/gtkrequest.c:1471
-msgid "Overwrite"
-msgstr "Felülírás"
-
-#: ../gtk/gtkrequest.c:1472
-msgid "Choose New Name"
-msgstr "Válasszon új nevet"
-
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
-msgid "Save File..."
-msgstr "Fájl mentése..."
-
-#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
-msgid "Open File..."
-msgstr "Fájl megnyitása..."
-
-#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
-msgid "Select Folder..."
-msgstr "Válasszon mappát..."
-
-#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
-msgid "_Add"
-msgstr "Hozzá_adás"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "Szobalista"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "Lista _lekérése"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "Cse_vegés hozzáadása"
-
-#: ../gtk/gtksavedstatuses.c:331
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Biztos, hogy törölni akarja a kijelölt mentett állapotokat?"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
-msgid "_Use"
-msgstr "_Használat"
-
-#: ../gtk/gtksavedstatuses.c:725
-msgid "Title already in use.  You must choose a unique title."
-msgstr "A megszólítás már használatban van. Használjon egyedi megszólítást."
-
-#: ../gtk/gtksavedstatuses.c:913
-msgid "Different"
-msgstr "Eltérő"
-
-#: ../gtk/gtksavedstatuses.c:1106
-msgid "_Title:"
-msgstr "_Megszólítás:"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "Áll_apot:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "_Eltérő állapot használata egyes fiókokhoz"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "Menté_s és használat"
-
-#: ../gtk/gtksavedstatuses.c:1427
-#, c-format
-msgid "Status for %s"
-msgstr "%s állapota"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Partner belép"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Partner kilép"
-
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "Üzenet fogadása"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Társalgás kezdetét jelző üzenet"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "Üzenet elküldve"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Egy személy csatlakozik a csevegéshez"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Egy személy elhagyja a csevegést"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Ön beszél a csevegésben"
-
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Mások beszélnek a csevegésben"
-
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Valaki csevegés közben leírja az Ön felhasználónevét"
-
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer hiba"
-
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "A GStreamer inicializálása meghiúsult."
-
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1021
-#: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2183
-#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
-#: ../libgaim/protocols/sametime/sametime.c:3742
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1621
-msgid "Connecting"
-msgstr "Kapcsolódás"
-
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "Várakozás a hálózati kapcsolatra"
-
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "A következő hiba történt %s betöltése közben: %s"
-
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "A kép betöltése meghiúsult"
-
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "A(z) %s mappa nem küldhető el."
-
-#: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"A Gaim nem képes egy mappát átvinni. Az általa tartalmazott fájlokat "
-"egyenként kell elküldenie."
-
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "Egy képet húzott be"
-
-#: ../gtk/gtkutils.c:1441
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy "
-"használhatja ezen felhasználó partnerikonjaként."
-
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr "Beállítás partnerikonként"
-
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "Képfájl küldése"
-
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "Beszúrás az üzenetbe"
-
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Be kívánja állítani partnerikonként ehhez a felhasználóhoz?"
-
-#: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy "
-"használhatja ezen felhasználó partnerikonjaként."
-
-#: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
-"partnerikonjaként."
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../gtk/gtkutils.c:1511
-msgid "Cannot send launcher"
-msgstr "Az indítóikon nem küldhető el"
-
-#: ../gtk/gtkutils.c:1511
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
-"objektumot akarta elküldeni az indítóikon helyett."
-
-#: ../gtk/gtkutils.c:2343
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Fájl:</b> %s\n"
-"<b>Fájlméret:</b> %s\n"
-"<b>Képméret:</b> %dx%d"
-
-#. Label
-#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
-#: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:618
-msgid "Buddy Icon"
-msgstr "Partnerikon"
-
-#: ../gtk/gtkutils.c:2653
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "A(z) \"%s\" fájl túl nagy a következőhöz: %s. Próbálkozzon kisebb képpel.\n"
-
-#: ../gtk/gtkutils.c:2655
-msgid "Icon Error"
-msgstr "Ikonhiba"
-
-#: ../gtk/gtkutils.c:2656
-msgid "Could not set icon"
-msgstr "Az ikon beállítása meghiúsult"
-
-#: ../gtk/gtkutils.c:2757
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nem sikerült megnyitni a(z) \"%s\" fájlt: %s"
-
-#: ../gtk/gtkutils.c:2806
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült "
-"a képfájl"
-
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "Fájl mentése"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "Szín kiválasztása"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "Statisztikák megjelenítése"
-
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "Válasz valószínűsége:"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "Statisztika beállítása"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr "Legnagyobb válasz-időkorlát:"
-
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
-msgid "minutes"
-msgstr "perc"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr "Legnagyobb utoljára-látszott különbség:"
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "Küszöb:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/cap/cap.c:931
-msgid "Contact Availability Prediction"
-msgstr "Partnerelérhetőség-előrejelzés"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr "Partnerelérhetőség-előrejelző bővítmény."
-
-#. *  summary
-#: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"A partnerelérhetőség bővítmény statisztikai információk megjelenítésére "
-"szolgál a felhasználó partnerlistáján található partnerekről."
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "A partner inaktív"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "A partner távol"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "A partner \"nincs a gépnél\""
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "A partner mozog"
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "A partner offline"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Pontértékek használata, ha..."
-
-#: ../gtk/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog "
-"rendelkezni a kapcsolatban.\n"
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Az utolsó partner használata, ha a pontszámok azonosak"
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Fiókhoz használandó pontértékek..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Kapcsolat prioritása"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
-"beállítását."
-
-#. *< description
-#: ../gtk/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó "
-"pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
-
-#: ../gtk/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Társalgás színei"
-
-#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "A társalgási ablak színeinek testreszabása"
-
-#: ../gtk/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Hibaüzenetek"
-
-#: ../gtk/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "Kiemelt üzenetek"
-
-#: ../gtk/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "Rendszerüzenetek"
-
-#: ../gtk/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Elküldött üzenetek"
-
-#: ../gtk/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Fogadott üzenetek"
-
-#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Válassza ki %s színét"
-
-#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1532
-msgid "General"
-msgstr "Általános"
-
-#: ../gtk/plugins/convcolors.c:301
-msgid "Ignore incoming format"
-msgstr "Bejövő formázás figyelmen kívül hagyása"
-
-#: ../gtk/plugins/convcolors.c:302
-msgid "Apply in Chats"
-msgstr "Alkalmazás csevegésekben"
-
-#: ../gtk/plugins/convcolors.c:303
-msgid "Apply in IMs"
-msgstr "Alkalmazás üzenetváltásokban"
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Társalgások száma szerint"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Társalgás elhelyezése"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Társalgások száma ablakonként"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Azonnali üzenő- és csevegőablakok elkülönítése szám szerinti elhelyezésnél"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "Bővített elhelyezés"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Társalgások elhelyezésének beállításai."
-
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali "
-"üzenetek és csevegés elkülönítése"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim demóbővítmény"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Példa bővítmény, ami csinál valamit - nézze meg a leírást."
-
-#. *  description
-#: ../gtk/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Ez egy igen hasznos bővítmény, ami sok mindent csinál:\n"
-"- Megmondja, ki írta a programot amikor belép\n"
-"- Visszafordít minden bejövő szöveget\n"
-"- Üzenetet küld a partnerlistán lévő partnereinek, amikor belépnek"
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Kurzor színe"
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Másodlagos kurzor színe"
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hiperhivatkozás színe"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView kiterjesztő mérete"
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView vízszintes elválasztás"
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Társalgás beviteli mező"
-
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Társalgások előzményei"
-
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Naplómegjelenítő"
-
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Kérdés párbeszédablak"
-
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Figyelmeztetés párbeszédablak"
-
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView behúzási kiterjesztők"
-
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "Válasszon színt"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "Válassza ki %s betűkészletét"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "Válassza ki a felület betűkészletét"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
-msgstr "GTK+ felület betűkészlete"
-
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ szöveges gyorsbillentyű téma"
-
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Felület színei"
-
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "Felöleti elemek méretei"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Betűkészletek"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Eszközök"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Beállítások kiírása ide: %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "A gtkrc fájlok újraolvasása"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ témavezérlés"
-
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Hozzáférést biztosít az általánosan használt gtkrc beállításokhoz."
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Egérgesztusok beállítása"
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Középső egérgomb"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Jobb egérgomb"
-
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "Gesztusok _vizuális megjelenítése"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Egérgesztusok"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Egérgesztusok támogatása"
-
-#. *  description
-#: ../gtk/plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"Egérgesztusok támogatása társalgási ablakokban.\n"
-"A középső gomb lenyomva tartásával elvégezhető műveletek:\n"
-"\n"
-"Lefelé húz és jobbra mozgat: zárja a társalgást.\n"
-"Felfelé húz és balra mozgat: az előző társalgásra vált.\n"
-"Felfelé húz és jobbra mozgat: a következő társalgásra vált."
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Azonnali üzenetküldés"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Jelöljön ki egy személyt a címjegyzékéből vagy adjon hozzá egy újat."
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1760
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
-#: ../libgaim/protocols/qq/sys_msg.c:250
-#: ../libgaim/protocols/sametime/sametime.c:5621
-msgid "Search"
-msgstr "Keresés"
-
-#. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
-#: ../gtk/plugins/gevolution/assoc-buddy.c:469
-#: ../gtk/plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Új személy"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "Partner kiválasztása"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek "
-"vagy hozzon létre egy újat."
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "F_elhasználó részletei"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "_Partner összerendelése"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1162
-msgid "None"
-msgstr "Nincs"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Nem küldhető e-mail"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-"Az evolution végrehajtható állomány nem található a PATH változóban megadott "
-"útvonalon."
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr "Nem található e-mail cím ehhez a partnerhez."
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "Hozzáadás a címjegyzékhez"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "E-mail küldése"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Evolution integráció beállítása"
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá "
-"kell rendelni."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Evolution integráció"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Integrációt biztosít az Evolutionnel."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Kérem adja meg alább a személy adatait."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Kérem adja meg a partner felhasználónevét és fiókjának típusát."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Fiók típusa:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Opcionális információk:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Utónév:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Vezetéknév:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK szignálteszt"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Ellenőrzés, hogy minden felületi szignál megfelelően működik-e."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "Előzmények"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Ikonállapot távollét esetén"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Levélfigyelő"
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Új helyi levél érkezését ellenőrzi."
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Kis dobozt ad a partnerlistához, amely megjelenik új levél érkezésekor."
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Jelölő vonal"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Vonal húzása a társalgás új üzeneteinek jelzése érdekében."
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "Jelölő vonal húzása a következőkben:"
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "_IM ablakok"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "_Csevegőablakok"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson "
-"az MM ikonra."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "A zenei üzenetküldő munkamenet megerősítve."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "Zenei üzenetküldés"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Ütközés történt a következő parancs futtatása közben:"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "Hiba a szerkesztő futtatása közben"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "A következő hiba történt:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "Zenei üzenetküldés beállítása"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "Kottaszerkesztő útvonala"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Alkalmaz"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Zenei üzenetküldő bővítmény együttműködő zeneszerzéshez."
-
-#. *  summary
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
-"felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
-
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:670
-msgid "Notify For"
-msgstr "Figyelmeztetés"
-
-#: ../gtk/plugins/notify.c:689
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Csak ha valaki kimondja az Ön felhasználónevét"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "_Fókuszban lévő ablakok"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "Értesítési módok"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "_Szöveg beszúrása az ablak címe elé:"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "Új üzenetek számának _beszúrása az ablak címébe"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "Új üzenetek számának beszúrása az _X tulajdonságba"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "\"_SÜRGŐS\" tipp beállítása az ablakkezelő számára"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "_Társalgási ablak előtérbe hozása"
-
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:767
-msgid "Notification Removal"
-msgstr "Értesítés eltávolítása"
-
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:772
-msgid "Remove when conversation window _gains focus"
-msgstr "Eltávolítás, mikor a társalgás ablaka _aktívvá válik"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "Eltávolítás a tá_rsalgás ablakára kattintáskor"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "Eltávolítás a _társalgás ablakában történő gépeléskor"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "Eltávolítás, mikor egy ü_zenet elküldésre kerül"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "Eltávolítás a társalgás lapjára _váltáskor"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "Üzenetértesítés"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "Nyers"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára."
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, "
-"MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a "
-"hibakereső ablakot."
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "A Gaim %s verzióját használja. A jelenleg legfrissebb verzió %s.<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Változások naplója:</b>\n"
-"%s<br><br>"
-
-#: ../gtk/plugins/relnot.c:80
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"A(z) %s verzióhoz hozzájuthat a:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a> címről."
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "Új verzió érhető el"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Kiadásértesítés"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Rendszeresen ellenőrzi az új programverziók megjelenését."
-
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának "
-"segítségével értesíti a felhasználót."
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "Kettőzés javítása"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "A megadott szó már létezik a javítási listában."
-
-#: ../gtk/plugins/spellchk.c:2180
-msgid "Text Replacements"
-msgstr "Szövegek cseréje"
-
-#: ../gtk/plugins/spellchk.c:2203
-msgid "You type"
-msgstr "Ezt írja"
-
-#: ../gtk/plugins/spellchk.c:2217
-msgid "You send"
-msgstr "Ezt küldi"
-
-#: ../gtk/plugins/spellchk.c:2231
-msgid "Whole words only"
-msgstr "Csak teljes szavak"
-
-#: ../gtk/plugins/spellchk.c:2243
-msgid "Case sensitive"
-msgstr "Kis- és nagybetű"
-
-#: ../gtk/plugins/spellchk.c:2269
-msgid "Add a new text replacement"
-msgstr "Új szöveghelyettesítés felvétele"
-
-#: ../gtk/plugins/spellchk.c:2285
-msgid "You _type:"
-msgstr "Ezt ír_ja:"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "Ezt _küldi:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2314
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus "
-"kezeléséhez)"
-
-#: ../gtk/plugins/spellchk.c:2316
-msgid "Only replace _whole words"
-msgstr "_Csak teljes szavak cseréje"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "Szövegcsere általános beállításai"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "Az utolsó szó helyettesítésének engedélyezése küldéskor"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "Szöveg cseréje"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
-"kimenő üzenetekben."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Partnerfigyelő"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Vízszintesen gördülő partnerlista."
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "Időbélyegek megjelenítése minden"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "Időbélyeg"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "iChat-stílusú időbélyeg megjelenítése"
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "iChat stílusú időbélyegek megjelenítése minden N percben."
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Időpecsét formátumbeállításai"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "(hagyományos Gaim) 24 órás i_dőformátum kényszerítése"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Dátumok megjelenítése"
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "_Társalgások:"
-
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Késleltetett üzenetekhez"
-
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Késleltetett üzenetekhez és csevegésekhez"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Ü_zenetnaplók:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Üzenet időpecsét-formátumok"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Az üzenet időpecsét-formátumok testreszabása."
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
-"naplóüzenetek időpecsét-formátumainak testreszabását."
-
-#: ../gtk/plugins/xmppconsole.c:665
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Kijelentkezve.</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/xmppconsole.c:745 ../gtk/plugins/xmppconsole.c:841
-#: ../gtk/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "XMPP konzol"
-
-#: ../gtk/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "Fiók: "
-
-#: ../gtk/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Nincs csatlakoztatva az XMPP-hez</font>"
-
-#: ../gtk/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/> mondat beszúrása."
-
-#: ../gtk/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> mondat beszúrása."
-
-#: ../gtk/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "<message/> mondat beszúrása."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr "Nyers XMPP mondatok küldése és fogadása."
-
-#. *  description
-#: ../gtk/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez hasznos."
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Átlátszatlanság:"
-
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "IM társalgási ablakok"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_IM ablak átlátszósága"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "C_súszka mutatása az IM ablakban"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "IM ablak átlátszóságának eltávolítása, ha fókuszt kap"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Mindig legfelül"
-
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Partnerlista-ablak"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "_Partnerlista-ablak átlátszósága"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Partnerlista-ablak átlátszóságának eltávolítása, ha fókuszt kap"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Átlátszóság"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Változtatható átlátszóság a partnerlistához és a társalgásokhoz."
-
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a "
-"társalgás és a partnerlista ablakában.\n"
-"\n"
-"* Megjegyzés: A bővítményhez Win2000 vagy újabb szükséges."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ runtime verzió"
-
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "Indítás"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr "A Gaim indítá_sa a Windows indulásakor"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr "_Dokkolható partnerlista"
-
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "_Partnerlista-ablak mindig felül:"
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
-msgstr "Csak ha dokkolt"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr "_Villogtassa az ablakot új csevegésüzenetek fogadásakor"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "WinGaim opciók"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "A Windowsos Gaimra jellemző opciók."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr ""
-"A windowsos Gaimra jellemző beállításokat biztosít, mint például a "
-"partnerlista dokkolása."
-
-#: ../libgaim/account.c:769
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "fiókok"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "A bejelentkezéshez jelszó szükséges."
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Adja meg a jelszót %s (%s) számára"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Adja meg a jelszót"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Jelszó mentése"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Hiányzó protokollbővítmény a következőhöz: %s"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1317
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "New passwords do not match."
 msgstr "Az új jelszavak nem egyeznek."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Minden mezőt töltsön ki."
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Eredeti jelszó"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Új jelszó"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Új jelszó (még egyszer)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "%s jelszavának megváltoztatása"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Kérem adja meg a jelenlegi jelszavát és az új jelszót."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Felhasználó-információk megváltoztatása %s számára"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Felhasználói adatok beállítása"
 
-#: ../libgaim/blist.c:548
-msgid "buddy list"
-msgstr "partnerlista"
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Ismeretlen"
 
-#: ../libgaim/blist.c:1919
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d partner nem lett eltávolítva a(z) %s csoportból, mert fiókja le van "
-"tiltva vagy nem jelentkezett be. Ez a partner és a csoport nem lettek "
-"eltávolítva.\n"
-msgstr[1] ""
-"%d partner nem lett eltávolítva a(z) %s csoportból, mert fiókja le van "
-"tiltva vagy nem jelentkezett be. Ez a partner és a csoport nem lettek "
-"eltávolítva.\n"
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5201 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Partnerek"
 
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "A csoport nem lett eltávolítva"
+#: ../libpurple/blist.c:550
+msgid "buddy list"
+msgstr "partnerlista"
 
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Regisztrációs hiba"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s belépett"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s kilépett"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Ismeretlen hiba"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "Nem küldhető üzenet: az üzenet túl nagy."
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nem küldhető üzenet a következőnek: %s."
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr "Az üzenet túl nagy."
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr "Az üzenetet nem lehet elküldeni."
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1160
 msgid "Send Message"
 msgstr "Üzenet küldése"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1163
 msgid "_Send Message"
 msgstr "Üzenet kül_dése"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belépett a szobába."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] belépett a szobába."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ezentúl %s néven szerepel"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentúl %s néven szerepel"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1767
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobát."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobát (%s)."
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Névtelen"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nem hozható létre kapcsolat: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "A név lekérése nem sikerült: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "A szolgáltatásnév lekérése nem sikerült: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "A Purple D-BUS kiszolgálója nem fut az alábbi okok miatt"
+
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Névtelen"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "Nem lehet létrehozni új feloldófolyamatot\n"
 
-#: ../libgaim/dnsquery.c:496
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr "Nem küldhető üzenet a feloldó folyamatnak\n"
 
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -5738,13 +1649,13 @@ msgstr ""
 "Hiba %s feloldásakor:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Hiba %s feloldásakor: %d"
 
-#: ../libgaim/dnsquery.c:554
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -5753,20 +1664,20 @@ msgstr ""
 "Hiba a feloldó folyamatból olvasás közben:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:558
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr "Fájl vége jel érkezett a feloldó folyamatból olvasás közben"
 
-#: ../libgaim/dnsquery.c:735
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "Szálelőállítási hiba: %s"
+msgstr "Szál-előállítási hiba: %s"
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
-#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5775,7 +1686,7 @@ msgstr ""
 "Hiba %s olvasásakor: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5784,7 +1695,7 @@ msgstr ""
 "Hiba %s írásakor: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5793,39 +1704,39 @@ msgstr ""
 "Hiba %s elérésekor: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:248
 msgid "Directory is not writable."
 msgstr "A könyvtár nem írható."
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 bájt hosszúságú fájl nem küldhető."
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:273
 msgid "Cannot send a directory."
 msgstr "Könyvtár nem küldhető."
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:282
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nem szabályos fájl. A felülírása gyáva módon visszautasítva.\n"
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s a következőt akarja küldeni: %s (%s)"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s egy fájlt akar küldeni"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Elfogadja a fájlküldési kérelmet a következőtől: %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5836,133 +1747,133 @@ msgstr ""
 "Távoli kiszolgáló: %s\n"
 "Távoli port: %d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s felajánlja %s fájl elküldését"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s érvénytelen fájlnév.\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s elküldésének felajánlása %s részére"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s átvitelének megkezdése a következőtől: %s"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "%s fájl átvitele befejeződött"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Megszakította %s átvitelét"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "Fájlátvitel megszakítva"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s megszakította %s átvitelét"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s megszakította a fájlátvitelt"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "A fájlátvitel %s partnerhez félbeszakadt."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "A fájlátvitel %s partnertől félbeszakadt."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Parancs futtatása terminálban"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Az \"aim\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "A \"gg\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Az \"icq\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Az \"irc\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Az \"msnim\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "A \"sip\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Az \"xmpp\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Az \"ymsgr\" URL címek kezelésére használt parancs, ha engedélyezve van."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "\"aim\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "\"icq\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "\"irc\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "\"msnim\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "\"sip\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "\"xmpp\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "\"ymsgr\" URL címek kezelője"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -5970,7 +1881,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
 "\"aim\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -5978,7 +1889,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
 "\"gg\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -5986,7 +1897,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
 "\"icq\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -5994,7 +1905,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
 "\"irc\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -6002,7 +1913,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
 "\"msnim\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -6010,7 +1921,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
 "\"sip\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -6018,7 +1929,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
 "\"xmpp\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -6026,7 +1937,7 @@ msgstr ""
 "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
 "\"ymsgr\" URL címeket."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -6034,63 +1945,63 @@ msgstr ""
 "Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak "
 "terminálban kell futnia."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "A megadott parancs kezelje-e az \"aim\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "A megadott parancs kezelje-e a \"gg\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "A megadott parancs kezelje-e az \"icq\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "A megadott parancs kezelje-e az \"irc\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "A megadott parancs kezelje-e az \"msnim\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "A megadott parancs kezelje-e a \"sip\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "A megadott parancs kezelje-e az \"xmpp\" URL címeket"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "A megadott parancs kezelje-e az \"ymsgr\" URL címeket"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">A naplózónak nincsen olvasás funkciója</font></b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "Egyszerű szöveg"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Régi Gaim"
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr "Régi egyszerű formátum"
 
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:732
 msgid "Logging of this conversation failed."
 msgstr "Ezen társalgás naplózása meghiúsult."
 
-#: ../libgaim/log.c:1041
+#: ../libpurple/log.c:1175
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
+#: ../libpurple/log.c:1251
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6099,7 +2010,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
 "VÁLASZ&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6108,137 +2019,135 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
 "VÁLASZ&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>A naplófájl útvonala nem található!</b></font>"
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>A fájl olvasása sikertelen: %s</b></font>"
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS VÁLASZ>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "Ismeretlen hiba"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "A(z) %s-t használja, de a bővítmény a következőt igényli: %s."
+msgstr "A(z) %s programot használja, de a bővítmény a következőt igényli: %s."
+
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr "A bővítmény nem adott meg azonosítót."
 
-#: ../libgaim/plugin.c:434
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "A bővítmény típusa nem egyezik: %d (szükséges: %d"
 
-#: ../libgaim/plugin.c:451
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Az ABI verziója nem egyezik: %d.%d.x (szükséges: %d.%d.x)"
 
-#: ../libgaim/plugin.c:468
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "A bővítmény nem valósítja meg az összes kívánt függvényt"
 
-#: ../libgaim/plugin.c:533
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
 
-#: ../libgaim/plugin.c:538
-msgid "Gaim encountered errors loading the plugin."
-msgstr "A Gaim hibát észlelt a bővítmény betöltése közben."
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "A bővítmény nem tölthető be"
 
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "A szükséges %s bővítményt nem sikerült betölteni."
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr "A Gaim nem tudta betölteni a bővítményt."
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "A bővítménye nem tölthető be."
 
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "A függő %s bővítmény eltávolítása meghiúsult."
 
-#: ../libgaim/plugin.c:669
-msgid "Gaim encountered errors unloading the plugin."
-msgstr "A Gaim hibát észlelt a bővítmény eltávolítása közben."
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "Hiba történt a bővítmény eltávolítása közben."
 
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Automatikus elfogadás"
 
-#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Fájlküldési kérések automatikus elfogadása kijelölt felhasználóktól."
 
-#: ../libgaim/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a következőtől: \"%s\"."
+msgstr ""
+"\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a "
+"következőtől: \"%s\"."
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Automatikus elfogadás kész"
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Ha fájlküldési kérés érkezik a következőtől: %s"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Automatikus elfogadás beállításai"
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
-#: ../libgaim/protocols/oscar/oscar.c:2234
-#: ../libgaim/protocols/oscar/oscar.c:2280
-#: ../libgaim/protocols/oscar/oscar.c:5838
-#: ../libgaim/protocols/oscar/oscar.c:5890
-#: ../libgaim/protocols/oscar/oscar.c:6068
-#: ../libgaim/protocols/oscar/oscar.c:6124
-#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "Mé_gsem"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Kérdezzen"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Automatikus elfogadás"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Automatikus visszautasítás"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Fájlátvitelek automatikus elfogadása..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -6246,146 +2155,56 @@ msgstr ""
 "A fájlok mentési útvonala\n"
 "(Teljes elérési utat adjon meg)"
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatikus visszautasítás a partnerlistán nem szereplő felhasználóktól"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel befejeződésekor\n"
+"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel "
+"befejeződésekor\n"
 "(csak ha nem társalog a küldővel)"
 
-#: ../libgaim/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Automatikus válasz"
-
-#: ../libgaim/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Automatikus válasz az összes protokollhoz"
-
-#: ../libgaim/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr "Ez a bővítmény lehetővé teszi automatikus válaszüzenet beállítását tetszőleges protokollhoz. A bővítmény beállításai párbeszédablakból beállíthatja a globális automatikus válaszüzenetet. Automatikus válaszüzenet beállításához egy adott partnerhez, kattintson a jobb egérgombbal a partnerre a partnerlistában. Automatikus válasz beállításához egy adott fiókhoz, nyissa meg a Fiók módosítása párbeszédablak Haladó lapját."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Automatikus válaszüzenet beállítása a következőhöz: %s"
-
-#: ../libgaim/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Automatikus válaszüzenet beállítása"
-
-#: ../libgaim/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr "A következő üzenet kerül elküldésre a partnernek amikor az üzenetet küld és az automatikus válasz engedélyezve van."
-
-#: ../libgaim/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Automatikus _válaszüzenet beállítása"
-
-#: ../libgaim/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Automatikus válaszüzenet"
-
-#: ../libgaim/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Automatikus válaszüzenet küldése ha"
-
-#: ../libgaim/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "A fiókom állapota \"_távol\""
-
-#: ../libgaim/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "A fiókom állapota \"i_naktív\""
-
-#: ../libgaim/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "_Automatikus válasz"
-
-#: ../libgaim/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Állapotüzenet"
-
-#: ../libgaim/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Automatikus válasz állapotüzenettel"
-
-#: ../libgaim/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Mindig, ha van állapotüzenet"
-
-#: ../libgaim/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Csak ha nincs automatikus válaszüzenet"
-
-#: ../libgaim/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Késleltetés az automatikus válaszüzenetek között"
-
-#: ../libgaim/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Legkisebb késleltetés (perc)"
-
-#: ../libgaim/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Automatikus válaszüzenetek küldése"
-
-#: ../libgaim/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "Leg_feljebb ennyiszer"
-
-#: ../libgaim/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "Jelenleg nem vagyok elérhető. Hagyjon üzenetet, amint lehet visszatérek."
-
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Notes"
 msgstr "Megjegyzések"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Írja be alább a jegyzetet..."
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "Jegyzetek szerkesztése..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Partnerjegyzetek"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr "Jegyzetek tárolása adott partnerekről."
 
-#. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő partnerekhez."
+msgstr ""
+"Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő "
+"partnerekhez."
 
 #. *< type
 #. *< ui_requirement
@@ -6393,7 +2212,7 @@ msgstr "Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szer
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Titkosítóteszt"
 
@@ -6401,9 +2220,9 @@ msgstr "Titkosítóteszt"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Teszteli a Gaimmal érkező titkosítókat."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Teszteli a libpurple beépített titkosítóit."
 
 #. *< type
 #. *< ui_requirement
@@ -6411,7 +2230,7 @@ msgstr "Teszteli a Gaimmal érkező titkosítókat."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus példa"
 
@@ -6419,7 +2238,8 @@ msgstr "DBus példa"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus példabővítmény"
 
@@ -6429,58 +2249,58 @@ msgstr "DBus példabővítmény"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim fájlvezérlés"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Fájlvezérlés"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Lehetőséget nyújt a Gaim irányítására fájlban megadott parancsokkal."
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "Lehetőséget nyújt fájlban megadott parancsokkal történő irányításra."
 
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Perc"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Inaktív idő szerkesztése"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Fiók inaktivitási idejének beállítása"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Beállítás"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Egyik fiókja sem inaktív."
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Fiók inaktivitási idejének visszaállítása"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Visszaállítás"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Inaktivitási idő beállítása minden fiókhoz"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inaktivitási idő törlése az összes inaktív fiókhoz"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Saját kezűleg állíthatja be, meddig volt inaktív az állapota"
 
@@ -6490,19 +2310,19 @@ msgstr "Saját kezűleg állíthatja be, meddig volt inaktív az állapota"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC tesztkliens"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Bővítmények IPC támogatásának tesztelése kliensként."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
+#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -6516,118 +2336,160 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC tesztkiszolgáló"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Bővítmények IPC támogatásának tesztelése kiszolgálóként."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az "
 "IPC parancsokat."
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "Belépés/kilépés rejtésének beállítása"
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "Szoba legkisebb mérete"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr "Felhasználó inaktivitási időtartama (perc)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr "Belépés/kilépés rejtése"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr "Elrejti a fölösleges belépés/kilépés üzeneteket."
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:275
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr "Ez a bővítmény elrejti a belépés/kilépés üzeneteket nagy szobákban, a társalgásban aktívan résztvevő felhasználók kivételével."
+
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "A felhasználó nem érhető el."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Automatikus válasz elküldve:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s kilépett."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "Lehet, hogy néhány üzenet nem kézbesíthető."
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Megszakadt a kapcsolat a kiszolgálóval."
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "Jelenleg nincs csatlakozva. Nem fogadhat üzeneteket, amíg nem jelentkezik be."
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Az üzenet nem küldhető el, mivel a maximális hossz el lett érve."
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "Az üzenet nem küldhető el."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Tűz"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Általános naplóolvasás beállítása"
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Gyors méretszámítások"
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr "Névheurisztika használata"
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Naplókönyvtár"
 
@@ -6637,19 +2499,19 @@ msgstr "Naplókönyvtár"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Naplómegjelenítő"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Felveszi más azonnali üzenő ügyfelek naplóit a naplómegjelenítőbe."
+msgstr "Felveszi más azonnaliüzenő-kliensek naplóit a naplómegjelenítőbe."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6663,12 +2525,12 @@ msgstr ""
 "FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran "
 "összeomolhat. Csak saját felelősségére használja!"
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono bővítménybetöltő"
 
-#: ../libgaim/plugins/mono/loader/mono.c:215
-#: ../libgaim/plugins/mono/loader/mono.c:216
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr ".NET bővítményeket tölt be a Mono segítségével."
 
@@ -6681,57 +2543,86 @@ msgstr ".NET bővítményeket tölt be a Mono segítségével."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Új sor"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "A megjelenített üzenet elé egy új sort szúr be."
 
-#. *  summary
-#: ../libgaim/plugins/newline.c:71
+#. *< summary
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
-msgstr "Új sort szúr be az üzenetek elé, így az üzenet további része a felhasználónév alatt jelenik meg a társalgás ablakában."
+msgstr ""
+"Új sort szúr be az üzenetek elé, így az üzenet további része a "
+"felhasználónév alatt jelenik meg a társalgás ablakában."
 
-#: ../libgaim/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline üzenetek emulációja"
 
-#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként."
 
-#: ../libgaim/plugins/offlinemsg.c:95
+#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
+msgstr ""
+"A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a "
+"Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
 
-#: ../libgaim/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
-msgstr "\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb bejelentkezik?"
+msgstr ""
+"\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket "
+"figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb "
+"bejelentkezik?"
 
-#: ../libgaim/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Offline üzenet"
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/törölheti"
+msgstr ""
+"A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/"
+"törölheti"
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Igen"
+
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Nem"
+
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Offline üzenetek mentése figyelmeztetésben"
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne kérdezzen. Mindig mentsen figyelmeztetésben."
 
@@ -6741,26 +2632,26 @@ msgstr "Ne kérdezzen. Mindig mentsen figyelmeztetésben."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:596
 msgid "Perl Plugin Loader"
 msgstr "Perl bővítménybetöltő"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:598 ../libpurple/plugins/perl/perl.c:599
 msgid "Provides support for loading perl plugins."
 msgstr "Perl bővítmények betöltését támogatja."
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Szellemmód"
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Szellemmód bejövő kapcsolathoz"
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -6769,23 +2660,23 @@ msgstr ""
 "üzenetüket írni.  Ez az AIM, ICQ, Jabber, Sametime és Yahoo! protokollokkal "
 "működik."
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Zavart érez az erőben..."
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Csak a partnerlistán szereplő felhasználók számára"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Letiltás, ha távol van"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Értesítő üzenet megjelenítése társalgások közben"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Szellemmódú társalgások előtérbe hozása"
 
@@ -6795,7 +2686,7 @@ msgstr "Szellemmódú társalgások előtérbe hozása"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Szignálok tesztelése"
 
@@ -6803,7 +2694,8 @@ msgstr "Szignálok tesztelése"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Ellenőrzi, hogy minden szignál megfelelően működik-e."
 
@@ -6813,7 +2705,7 @@ msgstr "Ellenőrzi, hogy minden szignál megfelelően működik-e."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Egyszerű bővítmény"
 
@@ -6821,7 +2713,7 @@ msgstr "Egyszerű bővítmény"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tesztek, hogy a legtöbb dolog működik-e."
 
@@ -6831,7 +2723,7 @@ msgstr "Tesztek, hogy a legtöbb dolog működik-e."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6839,7 +2731,7 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Burkot biztosít az SSL-t támogató könyvtárakhoz."
 
@@ -6849,7 +2741,7 @@ msgstr "Burkot biztosít az SSL-t támogató könyvtárakhoz."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6857,8 +2749,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL támogatást biztosít a GNUTLS-en keresztül."
 
@@ -6868,7 +2760,7 @@ msgstr "SSL támogatást biztosít a GNUTLS-en keresztül."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -6876,48 +2768,49 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL támogatást biztosít a Mozilla NSS-en keresztül."
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s visszajött."
 
-#: ../libgaim/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s elment."
 
-#: ../libgaim/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s inaktívvá vált."
 
-#: ../libgaim/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s már nem inaktív."
 
-#: ../libgaim/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s belépett."
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Figyelmeztessen, ha"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "A partner _elmegy"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "A partner _inaktívvá válik"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "_Partner be-/kilép"
 
@@ -6927,7 +2820,7 @@ msgstr "_Partner be-/kilép"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Partnerállapot-értesítés"
 
@@ -6935,7 +2828,8 @@ msgstr "Partnerállapot-értesítés"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -6943,15 +2837,15 @@ msgstr ""
 "Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, "
 "visszaérkezik vagy az inaktív állapota megszűnik."
 
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl bővítménybetöltő"
 
-#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl bővítmények betöltését támogatja"
 
-#: ../libgaim/plugins/tcl/tcl.c:481
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -6960,14 +2854,33 @@ msgstr ""
 "akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Nem lehetséges a bejövő azonnali üzenő kapcsolatokat figyelni\n"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nem hozható létre kapcsolat a helyi mDNS kiszolgálóval. Egyáltalán fut?"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:459 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
+msgid "Away"
+msgstr "Távol"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6978,83 +2891,86 @@ msgstr "Nem hozható létre kapcsolat a helyi mDNS kiszolgálóval. Egyáltalán
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokollbővítmény"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:474
-#: ../libgaim/protocols/bonjour/bonjour.c:482
-#: ../libgaim/protocols/bonjour/bonjour.c:540
-#: ../libgaim/protocols/silc/silc.c:300
-msgid "Gaim User"
-msgstr "Gaim felhasználó"
+#: ../libpurple/protocols/bonjour/bonjour.c:463
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:528
+msgid "Purple Person"
+msgstr "Purple személy"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Gépnév"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "Utónév"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "Vezetéknév"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:797
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:580
 msgid "AIM Account"
 msgstr "AIM fiók"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:583
 msgid "Jabber Account"
 msgstr "Jabber fiók"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s bezárta a társalgást."
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Nem nyitható meg a foglalat"
 
-#: ../libgaim/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Hiba a foglalat tulajdonságainak beállításakor"
 
-#: ../libgaim/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "Nem köthető a foglalat a porthoz"
 
-#: ../libgaim/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "Nem lehet figyelni a foglalatot"
 
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "Érvénytelen proxybeállítások"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7062,302 +2978,329 @@ msgstr ""
 "A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy "
 "típusához."
 
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Jelsor hiba"
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Nem tölthető le a jelsor.\n"
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Partnerlista mentése..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A partnerlistája üres, semmi nem került a fájlba."
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "A fájl nem nyitható meg"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "A partnerlista mentése sikeres!"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Nem tölthető be a partnerlista"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Partnerlista betöltése..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "A partnerlista betöltése sikeres!"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Partnerlista mentése..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Töltse ki a regisztrációs mezőket."
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Nem regisztrálható új fiók. Hiba történt.\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Az új Gadu-Gadu fiók regisztrálva"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "A regisztráció sikeresen befejeződött!"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:786
-#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Jelszó (megerősítés)"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Adja meg az aktuális jelsort"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuális jelsor"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Új Gadu-Gadu fiók regisztrálása"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Töltse ki az alábbi mezőket"
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
-#: ../libgaim/protocols/oscar/oscar.c:3764
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Város"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Születési év"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Nem"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Férfi vagy nő"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Férfi"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Nő"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Csak elérhetők"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Partnerek keresése"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Adja meg alább a keresési feltételt"
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Töltse ki a mezőket."
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "A jelenlegi jelszava eltér a megadottól."
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "A jelszó nem változtatható meg. Hiba történt.\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "A Gadu-Gadu fiók jelszavának megváltoztatása"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "A jelszó sikeresen megváltoztatva!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Jelenlegi jelszó"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "A Gadu-Gadu jelszó megváltoztatása"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Felvétel csevegéshez..."
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3034 ../pidgin/gtkblist.c:3358
+#: ../pidgin/gtkdocklet.c:467 ../pidgin/gtkstatusbox.c:1054
+msgid "Offline"
+msgstr "Kilépett"
+
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:455 ../pidgin/gtkstatusbox.c:1051
+msgid "Available"
+msgstr "Elérhető"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2649
+#: ../libpurple/protocols/oscar/oscar.c:3680
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1558
-#: ../libgaim/protocols/jabber/buddy.c:1734
-#: ../libgaim/protocols/oscar/oscar.c:3704
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Utónév"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Születési év"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Unable to display the search results."
 msgstr "A keresés eredményei nem jeleníthetők meg."
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu nyilvános könyvtár"
+msgstr "Gadu-Gadu nyilvános címtár"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Keresési eredmények"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "Nem találhatók megfelelő felhasználók"
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "A foglalatot nem lehet olvasni"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "A partnerlista letöltve"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "A partnerlistája letöltve a kiszolgálóról."
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "A partnerlista feltöltve"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "A kapcsolódás meghiúsult."
 
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
 msgid "Blocked"
-msgstr "Blokkolt"
+msgstr "Tiltott"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Felvétel csevegéshez"
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
-msgstr "Blokkolás megszüntetése"
+msgstr "Tiltás feloldása"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
-msgstr "Blokkolás"
+msgstr "Tiltás"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "Csevegés _neve:"
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Csevegéshiba"
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "Ez a csevegésnév már használatban van"
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Nincs kapcsolat a kiszolgálóval."
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Partnerek keresése..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Change password..."
 msgstr "Jelszó megváltoztatása..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2030
 msgid "Upload buddylist to Server"
 msgstr "Partnerlista feltöltése a kiszolgálóra"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Partnerlista letöltése a kiszolgálóról"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Partnerlista törlése a kiszolgálóról"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Partnerlista mentése fájlba..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Partnerlista betöltése fájlból..."
 
@@ -7372,122 +3315,147 @@ msgstr "Partnerlista betöltése fájlból..."
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokollbővítmény"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "Népszerű lengyel azonnali üzenő"
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu felhasználó"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ismeretlen parancs: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "a jelenlegi téma: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Nincs beállítva téma"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "A fájlátvitel meghiúsult"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr "A Gaim nem tudott megnyitni egy szabad  portot."
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "Nem nyitható meg figyelőport."
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Hiba a MOTD megjelenítésénél"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Nincs elérhető MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Nincs MOTD társítva ehhez a kapcsolathoz."
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
 msgid "Server has disconnected"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "Cs_atorna:"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Jelszó:"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "Az IRC becenevek nem tartalmazhatnak szóközt"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
-#: ../libgaim/protocols/jabber/jabber.c:927
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+msgid "Connecting"
+msgstr "Kapcsolódás"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:595
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Nem sikerült létrehozni a foglalatot"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1265
 msgid "Couldn't connect to host"
 msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "A kapcsolódás sikertelen"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "Az SSL kézfogás sikertelen"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Téma"
 
@@ -7499,204 +3467,212 @@ msgstr "Téma"
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokollbővítmény"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Az IRC protokollbővítmény, amely kevésbé rossz"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1984
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2122
+#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Kiszolgáló"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "Kódolások"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:782
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Valódi név"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "SSL használata"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:178
 msgid "Bad mode"
 msgstr "Rossz üzemmód"
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:189
 #, c-format
 msgid "You are banned from %s."
 msgstr "Kitiltották a következőről: %s."
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:190
 msgid "Banned"
 msgstr "Kitiltva"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:207
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nem lehet kitiltani a következőt: %s: a kitiltottak listája tele van"
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:292
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:293
 msgid " <i>(identified)</i>"
 msgstr " <i>(azonosítva)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:294
+#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Becenév"
 
-#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Jelenleg a következőn"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:325
 msgid "Idle for"
 msgstr "Inaktív"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:328
 msgid "Online since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Jelző meghatározása:</b>"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "Glorious"
 msgstr "Ragyogó"
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s megváltoztatta a témát a következőre: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s törölte a témát."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:418
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s témája: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:436
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "\"%s\" üzenet ismeretlen"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:437
 msgid "Unknown message"
 msgstr "Ismeretlen üzenet"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "A Gaim olyan üzenetet küldött, amit az IRC kiszolgáló nem tudott értelmezni."
+#: ../libpurple/protocols/irc/msgs.c:437
+msgid "The IRC server received a message it did not understand."
+msgstr "Az IRC kiszolgáló olyan üzenetet kapott, amit nem tudott értelmezni."
 
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:458
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Felhasználók a következőn: %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:555
 msgid "Time Response"
 msgstr "Válaszidő"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:556
 msgid "The IRC server's local time is:"
 msgstr "Az IRC kiszolgáló helyi ideje:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:567
 msgid "No such channel"
 msgstr "Nincs ilyen csatorna"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "no such channel"
 msgstr "nincs ilyen csatorna"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:581
 msgid "User is not logged in"
 msgstr "A felhasználó nincs bejelentkezve"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:586
 msgid "No such nick or channel"
 msgstr "Nincs ilyen becenév/csatorna"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "Could not send"
 msgstr "Nem sikerült elküldeni"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:662
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Meghívásra van szükség a következőhöz csatlakozáshoz: %s."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:663
 msgid "Invitation only"
 msgstr "Meghívásos"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:775
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s kirúgta Önt: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s kizárta (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mód (%s %s) %s által"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:890
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7704,7 +3680,7 @@ msgstr ""
 "Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg "
 "érvénytelen karaktereket tartalmaz."
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:895
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7712,51 +3688,52 @@ msgstr ""
 "Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg "
 "érvénytelen karaktereket tartalmaz."
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Cannot change nick"
 msgstr "A becenév nem változtatható meg"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Could not change nick"
 msgstr "Nem sikerült megváltoztatni a becenevet"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:955
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Elhagyta a(z) %s%s csatornát"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:997
 msgid "Error: invalid PONG from server"
 msgstr "Hiba: érvénytelen PONG a kiszolgálótól"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:999
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING válasz -- Késleltetés %lu másodperc"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1080
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Nem lehet csatlakozni ehhez: %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nem lehet csatlakozni a csatornához"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1115
 msgid "Nick or channel is temporarily unavailable."
 msgstr "A becenév vagy csatorna átmenetileg nem érhető el."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1127
 #, c-format
 msgid "Wallops from %s"
 msgstr "Ütések a következőtől: %s"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;elvégzendő művelet&gt;:  Egy művelet elvégzése."
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -7764,11 +3741,11 @@ msgstr ""
 "away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva "
 "visszatér a távollétből."
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: parancs küldése a chanserv kiszolgálónak."
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -7776,7 +3753,7 @@ msgstr ""
 "deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele "
 "valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -7786,7 +3763,7 @@ msgstr ""
 "valakitől, így nem beszélhet, ha a csatorna moderált (+m). "
 "Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -7794,7 +3771,7 @@ msgstr ""
 "invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a "
 "megadott vagy a jelenlegi csatornán."
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -7802,7 +3779,7 @@ msgstr ""
 "j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy "
 "több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -7811,7 +3788,7 @@ msgstr ""
 "vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha "
 "szükséges."
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -7819,7 +3796,7 @@ msgstr ""
 "kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. "
 "Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -7828,15 +3805,15 @@ msgstr ""
 "<i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt "
 "a parancsot.</i>"
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;elvégzendő művelet&gt;:  Végrehajt egy műveletet."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: parancs küldése a memoserv kiszolgálónak."
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -7844,7 +3821,7 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;becenév|csatorna|&gt;:  Csatorna- vagy "
 "felhasználómód beállítása vagy visszavonása."
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -7852,20 +3829,20 @@ msgstr ""
 "msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
 "(nem pedig a csatornának)."
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [csatorna]:  Kilistázza a csatornán jelenlévő felhasználókat."
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1800
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;új becenév&gt;:  Megváltoztatja a becenevét."
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: parancs küldése a nickserv kiszolgálónak."
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -7873,7 +3850,7 @@ msgstr ""
 "op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása "
 "valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -7881,11 +3858,11 @@ msgstr ""
 "operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
 "tudja."
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: parancs küldése az openserv kiszolgálónak."
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -7893,7 +3870,7 @@ msgstr ""
 "part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, "
 "egy opcionális üzenettel."
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -7901,7 +3878,7 @@ msgstr ""
 "ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha "
 "nincs megadva) késése."
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -7909,17 +3886,17 @@ msgstr ""
 "query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
 "(nem pedig a csatornának)."
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális "
 "üzenettel."
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -7927,25 +3904,25 @@ msgstr ""
 "remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. "
 "Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Megjeleníti az IRC kiszolgáló jelenlegi helyi idejét."
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [új téma]:  A csatorna témájának megtekintése vagy megváltoztatása."
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy "
 "visszavonása."
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [becenév]: CTCP VERSION kérés küldése felhasználónak"
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -7953,7 +3930,7 @@ msgstr ""
 "voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása "
 "valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -7961,55 +3938,56 @@ msgstr ""
 "wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
 "tudja."
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;becenév&gt;: Információk lekérése egy kijelentkezett felhasználóról."
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Válaszidő a következőtől: %s: %lu másodperc"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "CTCP PING válasz"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Kapcsolat bontva."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
 "támogatása nem található."
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
 
-#: ../libgaim/protocols/jabber/auth.c:232
-msgid "Server couldn't authenticate you without a password"
-msgstr "A kiszolgáló jelszó nélkül nem képes hitelesíteni Önt"
-
-#: ../libgaim/protocols/jabber/auth.c:235
-#: ../libgaim/protocols/jabber/auth.c:236
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:295
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:481
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "Egyszerű szöveges hitelesítés"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -8017,127 +3995,136 @@ msgstr ""
 "Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított "
 "csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
 
-#: ../libgaim/protocols/jabber/auth.c:243
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:306
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:434
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Érvénytelen válasz a kiszolgálótól."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "Érvénytelen hívás a kiszolgálótól"
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "SASL hiba"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:783
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Teljes név"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:796
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Utónév"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Keresztnév"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Utca"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "További cím"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Helység"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Régió"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Irányítószám"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:869
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "Ország"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:880
-#: ../libgaim/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:906
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Szervezet neve"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Szervezeti egység"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Funkció"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/oscar/oscar.c:3730
 msgid "Birthday"
 msgstr "Születésnap"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3045
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Leírás"
+
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCard szerkesztése"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -8145,113 +4132,113 @@ msgstr ""
 "Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, "
 "amelyek nem okoznak kényelmetlenséget."
 
-#: ../libgaim/protocols/jabber/buddy.c:652
-#: ../libgaim/protocols/jabber/buddy.c:691
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Kliens"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Operációs rendszer"
 
-#: ../libgaim/protocols/jabber/buddy.c:666
-#: ../libgaim/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr "Erőforrás"
 
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1226
-#: ../libgaim/protocols/jabber/jabber.c:1236
-#: ../libgaim/protocols/jabber/jabber.c:1246
-#: ../libgaim/protocols/jabber/jabber.c:1256
-#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1232
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
 msgid "Priority"
 msgstr "Prioritás"
 
-#: ../libgaim/protocols/jabber/buddy.c:804
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Középső név"
 
-#: ../libgaim/protocols/jabber/buddy.c:837
-#: ../libgaim/protocols/jabber/jabber.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3763
-#: ../libgaim/protocols/oscar/oscar.c:3776
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Cím"
 
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Postafiók"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Fotó"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Logó"
 
-#: ../libgaim/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "Rejtettség visszavonása"
 
-#: ../libgaim/protocols/jabber/buddy.c:1348
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1356
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"
 
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1372
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: ../libgaim/protocols/jabber/buddy.c:1405
-#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/buddy.c:1407
+#: ../libpurple/protocols/jabber/jabber.c:1241
 msgid "Chatty"
 msgstr "Beszédes"
 
-#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
 msgid "Extended Away"
 msgstr "Nem vagyok a gépnél"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1265
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5760
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne zavarjanak"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1560
-#: ../libgaim/protocols/jabber/buddy.c:1739
-#: ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: ../libgaim/protocols/jabber/buddy.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "A keresés eredményei a következők"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1667
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -8259,560 +4246,586 @@ msgstr ""
 "Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne "
 "feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
 
-#: ../libgaim/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "A címtárlekérdezés sikertelen"
 
-#: ../libgaim/protocols/jabber/buddy.c:1688
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "A címtárkiszolgáló lekérdezése nem sikerült."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Kiszolgálóutasítások: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Töltsön ki legalább egy mezőt a megfelelő Jabber felhasználók kereséséhez."
 
-#: ../libgaim/protocols/jabber/buddy.c:1749
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3708
-#: ../libgaim/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "E-Mail Address"
 msgstr "E-mail cím"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
-#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "Jabber felhasználók keresése"
 
-#: ../libgaim/protocols/jabber/buddy.c:1773
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Keresés"
+
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
-msgstr "Érvénytelen könyvtár"
+msgstr "Érvénytelen címtár"
 
-#: ../libgaim/protocols/jabber/buddy.c:1790
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
-msgstr "Adjon meg egy felhasználói könyvtárat"
+msgstr "Adjon meg egy felhasználói címtárat"
 
-#: ../libgaim/protocols/jabber/buddy.c:1791
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
-msgstr "Válasszon ki egy felhasználói könyvtárat a kereséshez"
+msgstr "Válasszon ki egy felhasználói címtárat a kereséshez"
 
-#: ../libgaim/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
-msgstr "Keresési könyvtár"
+msgstr "Keresés a címtárban"
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5228
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sz_oba:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Kiszolgáló:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "A_zonosító:"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s érvénytelen szobanév"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Érvénytelen szobanév"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s érvénytelen kiszolgálónév"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Érvénytelen kiszolgálónév"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s érvénytelen szobaazonosító"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Érvénytelen szobaazonosító"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Beállítási hiba"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:407
+#: ../libpurple/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "A beállítás sikertelen"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "Szobabeállítási hiba"
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "Ezt a szobát nem lehet beállítani"
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:472
+#: ../libpurple/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "Regisztrációs hiba"
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "A nem-MUC csevegőszobákban nem támogatott a becenév megváltoztatása"
 
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:680
+#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Hiba szobalista letöltése közben"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Érvénytelen kiszolgáló"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Adjon meg egy konferenciakiszolgálót"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Válassza ki a lekérdezendő konferenciakiszolgálót"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Szobák keresése"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "Hiba a folyamat inicializálásánál"
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:294
-#: ../libgaim/protocols/jabber/jabber.c:322
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Írási hiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:390
-#: ../libgaim/protocols/jabber/jabber.c:427
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Olvasási hiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:504
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr "Nem lehet létrehozni foglalatot"
 
-#: ../libgaim/protocols/jabber/jabber.c:552
-#: ../libgaim/protocols/jabber/jabber.c:895
+#: ../libpurple/protocols/jabber/jabber.c:565
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Érvénytelen Jabber azonosító"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s regisztrációja sikeres"
 
-#: ../libgaim/protocols/jabber/jabber.c:625
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "A regisztráció sikeres"
 
-#: ../libgaim/protocols/jabber/jabber.c:632
-#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Unknown Error"
 msgstr "Ismeretlen hiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:634
-#: ../libgaim/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "A regisztráció sikertelen"
 
-#: ../libgaim/protocols/jabber/jabber.c:750
-#: ../libgaim/protocols/jabber/jabber.c:751
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "Már regisztrálva van"
 
-#: ../libgaim/protocols/jabber/jabber.c:827
-#: ../libgaim/protocols/oscar/oscar.c:3765
-#: ../libgaim/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "State"
 msgstr "Állam"
 
-#: ../libgaim/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "Irányítószám"
 
-#: ../libgaim/protocols/jabber/jabber.c:837
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "Dátum"
 
-#: ../libgaim/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr "Kérem adja meg a következő információkat az új fiók regisztrálásához."
 
-#: ../libgaim/protocols/jabber/jabber.c:858
-#: ../libgaim/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "Új Jabber fiók regisztrálása"
 
-#: ../libgaim/protocols/jabber/jabber.c:1025
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+msgid "Register"
+msgstr "Regisztráció"
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Initializing Stream"
 msgstr "Folyam inicializálása"
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Hitelesítés"
 
-#: ../libgaim/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Re-initializing Stream"
 msgstr "A folyam újrainicializálása"
 
-#: ../libgaim/protocols/jabber/jabber.c:1109
-#: ../libgaim/protocols/jabber/jabber.c:1479
-#: ../libgaim/protocols/jabber/jabber.c:1520
-#: ../libgaim/protocols/jabber/jabber.c:1554
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/jabber/jabber.c:1115
+#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:5511
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
-#: ../libgaim/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1157
 msgid "Both"
 msgstr "Mindkettő"
 
-#: ../libgaim/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "Feladó (Címzett függőben)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "Címzett"
 
-#: ../libgaim/protocols/jabber/jabber.c:1160
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Nincs"
+
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
 msgstr "Feliratkozás"
 
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libpurple/protocols/jabber/jabber.c:1301
 msgid "Password Changed"
 msgstr "Jelszó megváltoztatva"
 
-#: ../libgaim/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Your password has been changed."
 msgstr "A jelszava meg lett változtatva."
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1307
 msgid "Error changing password"
 msgstr "Hiba a jelszó megváltoztatásakor"
 
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/jabber/jabber.c:1363
 msgid "Password (again)"
 msgstr "Jelszó (még egyszer)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Change Jabber Password"
 msgstr "Jabber jelszó megváltoztatása"
 
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
 msgstr "Kérem adja meg az új jelszavát"
 
-#: ../libgaim/protocols/jabber/jabber.c:1373
-#: ../libgaim/protocols/oscar/oscar.c:6355
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Felhasználói információk beállítása..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6366
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Jelszó megváltoztatása..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1391
 msgid "Search for Users..."
 msgstr "Felhasználók keresése..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Bad Request"
 msgstr "Hibás kérés"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Conflict"
 msgstr "Ütközés"
 
-#: ../libgaim/protocols/jabber/jabber.c:1463
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Feature Not Implemented"
 msgstr "A szolgáltatás nincs megvalósítva"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Forbidden"
 msgstr "Tiltva"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Gone"
 msgstr "Elment"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Internal Server Error"
 msgstr "Belső kiszolgálóhiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Item Not Found"
 msgstr "Az elem nem található"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Malformed Jabber ID"
 msgstr "Rosszul formázott Jabber azonosító"
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Acceptable"
 msgstr "Nem fogadható el"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Not Allowed"
 msgstr "Nem engedélyezett"
 
-#: ../libgaim/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Payment Required"
 msgstr "Fizetés szükséges"
 
-#: ../libgaim/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1493
 msgid "Recipient Unavailable"
 msgstr "A címzett nem érhető el"
 
-#: ../libgaim/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Registration Required"
 msgstr "Regisztráció szükséges"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "Remote Server Not Found"
 msgstr "A távoli kiszolgáló nem található"
 
-#: ../libgaim/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Remote Server Timeout"
 msgstr "Időtúllépés a távoli kiszolgálón"
 
-#: ../libgaim/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Server Overloaded"
 msgstr "A kiszolgáló túl van terhelve"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Service Unavailable"
 msgstr "A szolgáltatás nem érhető el"
 
-#: ../libgaim/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Subscription Required"
 msgstr "Feliratkozás szükséges"
 
-#: ../libgaim/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Unexpected Request"
 msgstr "Váratlan kérés"
 
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Authorization Aborted"
 msgstr "Hitelesítés megszakítva"
 
-#: ../libgaim/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Incorrect encoding in authorization"
 msgstr "Hibás kódolás a hitelesítésben"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1521
 msgid "Invalid authzid"
 msgstr "Érvénytelen authzid"
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Invalid Authorization Mechanism"
 msgstr "Érvénytelen hitelesítési eljárás"
 
-#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Authorization mechanism too weak"
 msgstr "A hitelesítési eljárás túl gyenge"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1532
 msgid "Temporary Authentication Failure"
 msgstr "Átmeneti hitelesítési hiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authentication Failure"
 msgstr "Hitelesítési hiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Bad Format"
 msgstr "Rossz formátum"
 
-#: ../libgaim/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Bad Namespace Prefix"
 msgstr "Rossz névtér-előtag"
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Resource Conflict"
 msgstr "Erőforrás-ütközés"
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Időtúllépés miatt a kapcsolat megszakadt"
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Gone"
 msgstr "A gép eltűnt"
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Host Unknown"
 msgstr "Ismeretlen gép"
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Improper Addressing"
 msgstr "Hiányos címzés"
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Invalid ID"
 msgstr "Érvénytelen azonosító"
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Invalid Namespace"
 msgstr "Érvénytelen névtér"
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid XML"
 msgstr "Érvénytelen XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Non-matching Hosts"
 msgstr "Nem illeszkedő gépek"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Policy Violation"
 msgstr "Szabályok megsértése"
 
-#: ../libgaim/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Remote Connection Failed"
 msgstr "Távoli kapcsolat sikertelen"
 
-#: ../libgaim/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Resource Constraint"
 msgstr "Erőforrás-megszorítás"
 
-#: ../libgaim/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Restricted XML"
 msgstr "Korlátozott XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "See Other Host"
 msgstr "Lásd a másik gépet"
 
-#: ../libgaim/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "System Shutdown"
 msgstr "Rendszerleállítás"
 
-#: ../libgaim/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "Undefined Condition"
 msgstr "Meghatározatlan feltétel"
 
-#: ../libgaim/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Encoding"
 msgstr "Nem támogatott kódolás"
 
-#: ../libgaim/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Stanza Type"
 msgstr "Nem támogatott Stanza típus"
 
-#: ../libgaim/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Version"
 msgstr "Nem támogatott verzió"
 
-#: ../libgaim/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "XML Not Well Formed"
 msgstr "Nem megfelelően formázott XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Stream Error"
 msgstr "Folyamhiba"
 
-#: ../libgaim/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1657
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nem lehet kitiltani %s felhasználót"
 
-#: ../libgaim/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ismeretlen kapcsolat: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1682
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "%s felhasználó kapcsolata nem állítható be a következőre: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ismeretlen szerep: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1708
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "A(z) \"%s\" szerep nem állítható be a következő felhasználónak: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/jabber/jabber.c:1761
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nem lehet kirúgni %s felhasználót"
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1792
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
 
-#: ../libgaim/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1796
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Csevegőszoba beállítása."
 
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "part [room]:  Leave the room."
 msgstr "part [szoba]:  A szoba elhagyása."
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1810
 msgid "register:  Register with a chat room."
 msgstr "register:  Regisztráció csevegőszobánál."
 
-#: ../libgaim/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/jabber/jabber.c:1816
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [új téma]:  A téma megtekintése vagy megváltoztatása."
 
-#: ../libgaim/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;felhasználó&gt; [szoba]:  Felhasználó kitiltása a szobából."
 
-#: ../libgaim/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1828
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -8820,7 +4833,7 @@ msgstr ""
 "affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
 "felhasználó a szobával fennálló kapcsolatának beállítása."
 
-#: ../libgaim/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1834
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -8828,21 +4841,21 @@ msgstr ""
 "role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: "
 "Beállítja a felhasználó szerepét a szobában."
 
-#: ../libgaim/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;felhasználó&gt; [üzenet]:  Felhasználó meghívása a szobába."
 
-#: ../libgaim/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott "
 "kiszolgálón."
 
-#: ../libgaim/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;felhasználó&gt; [szoba]:  Felhasználó kirúgása a szobából."
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik "
@@ -8858,73 +4871,73 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1962
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokollbővítmény"
 
-#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "Régi (5223 port) SSL kényszerítése"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "Kapcsolódási port"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2004
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1848
 msgid "Connect server"
 msgstr "Kapcsolatkiszolgáló"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "%s üzenetet küldött"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a következő témát állította be: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "A téma: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Az üzenet eljuttatása a következőhöz: %s sikertelen: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Jabber üzenethiba"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (%s kód)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "XML elemzési hiba"
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba a jelenlétben"
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Új szoba létrehozása"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8932,41 +4945,42 @@ msgstr ""
 "Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az "
 "alapbeállításokat?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "Sz_oba beállítása"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "Alapértel_mezések elfogadása"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Hiba a(z) %s csevegésben"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja "
 "fájlok átvitelét"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Fájl küldése sikertelen"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Partnerlista-szinkronizációs probléma itt: %s (%s)"
 
-#: ../libgaim/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -8975,7 +4989,7 @@ msgstr ""
 "%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. "
 "Szeretné ezt a partnert felvenni?"
 
-#: ../libgaim/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -8984,266 +4998,268 @@ msgstr ""
 "%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a "
 "partnert felvenni?"
 
-#: ../libgaim/protocols/msn/error.c:35
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr "Az üzenetet nem sikerült értelmezni"
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "Szintaktikai hiba (valószínűleg Gaim hiba)"
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "Szintaktikai hiba (valószínűleg klienshiba)"
 
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Érvénytelen e-mail cím"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "A felhasználó nem létezik"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "A teljesen minősített tartománynév hiányzik"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Már be van jelentkezve"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Érvénytelen felhasználónév"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Érvénytelen becenév"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "A lista megtelt"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Már rajta van"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Nincs a listán"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "A felhasználó nem érhető el"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Már be van állítva ez a mód"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "A másik listán már szerepel"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Túl sok csoport"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Érvénytelen csoport"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "A felhasználó nincs a csoportban"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "A csoportnév túl hosszú"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "A nulla csoportot nem lehet eltávolítani"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Nem létező csoporthoz próbált meg felvenni egy felhasználót"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "A közvetítés sikertelen"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "A figyelmeztetés átvitele meghiúsult"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Szükséges mezők hiányoznak"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Túl sok találat az FND-hez"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Nincs bejelentkezve"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "A szolgáltatás átmenetileg nem érhető el"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Adatbáziskiszolgáló-hiba"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Parancs letiltva"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "Fájlművelethiba"
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "Memóriafoglalási hiba"
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Hibás CHL érték lett küldve a kiszolgálónak"
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "A kiszolgáló foglalt"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "A kiszolgáló nem érhető el"
 
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr "A partnerértesítő kiszolgáló nem üzemel"
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Adatbázis-kapcsolódási hiba"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "A kiszolgáló leáll (jelentkezzen ki)"
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Hiba a kapcsolat létrehozásakor"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Ismeretlen vagy nem engedélyezett CVR paraméterek"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Nem lehet írni"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Folyamat túlterhelve"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "A felhasználó túl aktív"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Túl sok folyamat"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Passport (MSN igazolvány) nincs ellenőrizve"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr "Hibás barát-fájl"
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Váratlan"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "A felhasználónév túl gyorsan változik"
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "A kiszolgáló túl elfoglalt"
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "Nem engedélyezett kijelentkezett állapotban"
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "Nem fogad új felhasználókat"
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Gyermekek Passport-ja (MSN igazolvány) szülői beleegyezés nélkül"
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Passport fiók (MSN igazolvány) még nincs ellenőrizve"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Rossz jegy"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Ismeretlen hibakód %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN hiba: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr "Becenév beállítása."
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ezen a néven fogják látni az MSN partnerei."
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "Otthoni telefonszám beállítása."
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "Munkahelyi telefonszám beállítása."
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "Mobiltelefonszám beállítása."
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr "Engedélyezi az MSN mobil oldalakat?"
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:314
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -9251,304 +5267,315 @@ msgstr ""
 "Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil "
 "oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "Tiltás"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "Mobilüzenet küldése."
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "Oldal"
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:529
 msgid "Has you"
 msgstr "Szerepel-e a listáján"
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "Rögtön jövök"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "Elfoglalt vagyok"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:567
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "Telefonálok"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:571
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "Ebédelni mentem"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:599
 msgid "Set Friendly Name..."
 msgstr "Becenév beállítása..."
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Home Phone Number..."
 msgstr "Otthoni telefonszám beállítása..."
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Work Phone Number..."
 msgstr "Munkahelyi telefonszám beállítása..."
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Set Mobile Phone Number..."
 msgstr "Mobiltelefonszám beállítása..."
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:618
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobileszközök engedélyezése/tiltása..."
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:623
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobiloldalak engedélyezése/tiltása..."
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail bejövő levelek megnyitása"
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:657
 msgid "Send to Mobile"
 msgstr "Küldés mobiltelefonra"
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Csevegés ke_zdeményezése"
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"Az MSN igénybevételéhez SSL támogatás szükséges. Kérem telepítsen egy "
-"támogatott SSL könyvtárat. További információkért keresse fel a következő "
-"címet: http://gaim.sf.net/faq-ssl.php."
+#: ../libpurple/protocols/msn/msn.c:705
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL könyvtárat."
 
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:730
 msgid "Failed to connect to server."
 msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
 
-#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
-#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "Általános"
+
+#: ../libpurple/protocols/msn/msn.c:1528
+#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Kor"
 
-#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Foglalkozás"
 
-#: ../libgaim/protocols/msn/msn.c:1542
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1214
 msgid "Location"
 msgstr "Hely"
 
-#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
-#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
 msgid "Hobbies and Interests"
 msgstr "Hobbik és érdeklődési kör"
 
-#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
-#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
-#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
 msgid "A Little About Me"
 msgstr "Magamról röviden"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1559
 msgid "Social"
 msgstr "Társadalmi"
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Családi állapot"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1562
 msgid "Interests"
 msgstr "Érdeklődési kör"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1563
 msgid "Pets"
 msgstr "Állatok"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1564
 msgid "Hometown"
 msgstr "Szülőváros"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1565
 msgid "Places Lived"
 msgstr "Lakóhelyek"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1566
 msgid "Fashion"
 msgstr "Divat"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Music"
 msgstr "Zene"
 
-#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
-#: ../libgaim/protocols/msn/msn.c:1767
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Kedvenc idézet"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Contact Info"
 msgstr "Kapcsolatinformációk"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1587
 msgid "Personal"
 msgstr "Személyes"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1590
 msgid "Significant Other"
 msgstr "Társ"
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Home Address"
 msgstr "Otthoni cím"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Personal Mobile"
 msgstr "Személyes mobil"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal E-Mail"
 msgstr "Saját e-mail"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Personal IM"
 msgstr "Saját azonnali üzenő"
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Anniversary"
 msgstr "Évforduló"
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work"
 msgstr "Munka"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Beosztás"
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Company"
 msgstr "Cég"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Részleg"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Profession"
 msgstr "Foglalkozás"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Work Phone"
 msgstr "Munkahelyi telefon"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Work Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:3787
 msgid "Work Address"
 msgstr "Munkahelyi cím"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work Mobile"
 msgstr "Munkahelyi mobil"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Work Pager"
 msgstr "Munkahelyi személyhívó"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Work Fax"
 msgstr "Munkahelyi fax"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Work E-Mail"
 msgstr "Munkahelyi e-mail"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work IM"
 msgstr "Munkahelyi azonnali üzenő"
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Start Date"
 msgstr "Kezdés dátuma"
 
-#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
-#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "Favorite Things"
 msgstr "Kedvenc dolgok"
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
-#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Honlap"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "A felhasználó nem hozott létre nyilvános profilt."
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -9558,16 +5585,14 @@ msgstr ""
 "felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre "
 "nyilvános profilt."
 
-#: ../libgaim/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-"A Gaim nem talált információkat a felhasználó profiljában. A felhasználó "
-"valószínűleg nem létezik."
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr "Nem találhatók információk a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
 
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profil URL-je"
 
@@ -9581,96 +5606,96 @@ msgstr "Profil URL-je"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokollbővítmény"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2131
 msgid "Use HTTP Method"
 msgstr "HTTP eljárás használata"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2136
 msgid "Show custom smileys"
 msgstr "Egyéni hangulatjelek beállítása"
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Nem lehet kapcsolódni"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s érvénytelen csoport."
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Ismeretlen hiba."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s ezen: %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Nem lehet felhasználót felvenni ehhez: %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Nem lehet blokkolni a felhasználót ezen: %s (%s)"
+msgstr "Nem lehet letiltani a felhasználót ezen: %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Nem lehet engedélyezni a felhasználót ezen: %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s nem adható hozzá, mert a partnerlista tele van."
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s érvénytelen passport fiók."
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "A szolgáltatás átmenetileg nem érhető el."
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Nem lehet átnevezni a csoportot"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Nem lehet törölni a csoportot"
 
-#: ../libgaim/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -9699,15 +5724,15 @@ msgstr[1] ""
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 
-#: ../libgaim/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Írási hiba"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Olvasási hiba"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -9716,297 +5741,293 @@ msgstr ""
 "Kapcsolódási hiba a(z) %s kiszolgálótól:\n"
 "%s"
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "A protokollt nem támogatja a kiszolgáló."
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Hiba a HTTP feldolgozása közben."
 
-#: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3467
-#: ../libgaim/protocols/yahoo/yahoo.c:191
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Bejelentkezett egy másik helyről."
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja "
 "újra később."
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Az MSN kiszolgálók átmenetileg leállnak."
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Nem sikerült a hitelesítés: %s"
 
-#: ../libgaim/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja "
 "újra később."
 
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Kézfogás"
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr "Átvitel"
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Hitelesítés megkezdése"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Süti letöltése"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Süti küldése"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Partnerlista fogadása"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Nem vagyok a gépnél"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Telefonálok"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Ebédelni mentem"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Időtúllépés következett be, emiatt az üzenet lehet, hogy nem lett elküldve:"
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Az üzenet nem küldhető el, láthatatlan módban nem engedélyezett:"
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Az üzenet nem küldhető el, mivel a felhasználó kijelentkezett:"
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Az üzenet kapcsolódási hiba miatt nem küldhető el:"
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Az üzenet nem küldhető el, mivel túl gyorsan küldi:"
 
-#: ../libgaim/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Az üzenet nem küldhető el, mivel hiba lépett fel a közvetítés közben:"
 
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Az üzenet ismeretlen hiba miatt lehet, hogy nem lett elküldve:"
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s egy bökést küldött Önnek!"
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s felvette Önt a partnerlistájára."
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s eltávolította Önt a partnerlistájáról."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Nem lehet hozzáadni a következőt: \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "A megadott felhasználónév érvénytelen."
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr "A szükséges paraméterek átadása sikertelen"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr "Nem lehet a hálózatra írni"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr "Nem lehet a hálózatról olvasni"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr "Hiba a kiszolgálóval végzett kommunikációban"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
 msgstr "A konferencia nem található"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
 msgstr "A konferencia nem létezik"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
 msgstr "Ilyen nevű mappa már létezik"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
 msgstr "A jelszó lejárt"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Hibás jelszó"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
 msgstr "A felhasználó nem található"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
 msgstr "A fiók le lett tiltva"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
-msgstr "A kiszolgáló nem tudott hozzáférni a könyvtárhoz"
+msgstr "A kiszolgáló nem tudott hozzáférni a címtárhoz"
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr "A rendszeradminisztrátora letiltotta ezt a műveletet"
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr "A kiszolgáló nem érhető el, próbálkozzon később"
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr "A kapcsolat nem adható kétszer ugyanahhoz a mappához"
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr "Önmagát nem adhatja hozzá"
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr "A főarchívum hibásan van beállítva"
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
 msgstr "Hibás felhasználónév vagy jelszó"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "A megadott felhasználónévhez tartozó kiszolgáló nem ismerhető fel"
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "A fiókja le lett tiltva, mivel túl sok érvénytelen jelszót adott meg"
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Ugyanazt a személyt nem adhatja hozzá kétszer egy társalgáshoz"
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Elérte az engedélyezett kapcsolatok számát"
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr "Helytelen felhasználónevet adott meg"
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
-msgstr "Hiba lépett fel a könyvtár frissítése közben"
+msgstr "Hiba lépett fel a címtár frissítése közben"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr "Inkompatibilis protokollverzió"
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
-msgstr "A felhasználó blokkolta Önt"
+msgstr "A felhasználó letiltotta Önt"
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
 
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1967
 msgid "The user is either offline or you are blocked"
-msgstr "A felhasználó kilépett, vagy Ön blokkolva van"
+msgstr "A felhasználó kilépett, vagy Ön le van tiltva"
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1970
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Ismeretlen hiba: 0x%X"
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "A bejelentkezés sikertelen (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
 "s)."
 
-#: ../libgaim/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Nem lehet \"%s\"-t felvenni az Ön partnerlistájára (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libgaim/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Az üzenetet nem lehet elküldeni (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:493
-#: ../libgaim/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Nem lehet meghívni a felhasználót (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni "
 "a konferenciát (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Az üzenetet nem lehet elküldeni. Nem sikerült létrehozni a konferenciát (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -10015,7 +6036,7 @@ msgstr ""
 "Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali "
 "listán. Hiba a mappa létrehozása közben (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -10024,106 +6045,106 @@ msgstr ""
 "Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa "
 "létrehozása közben a kiszolgálóoldali listában (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Nem sikerült %s felhasználó részleteit lekérni (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Nem lehet a felhasználót felvenni a magánszféra-listára (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Nem lehet %s felhasználót felvenni a tiltólistára (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Nem lehet %s felhasználót felvenni az engedélyezési listára (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Nem lehet %s felhasználót eltávolítani a magánszféra-listáról (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nem lehet megváltoztatni a kiszolgálóoldali magánszféra-beállításokat (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Nem lehet konferenciát létrehozni (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Hiba a kiszolgálóval végzett kommunikációban, a kapcsolat lezárása."
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonszám"
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Saját cím"
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Postacím"
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Felhasználóazonosító"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Teljes név"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konferencia %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Nem lehet SSL kapcsolatot létrehozni a kiszolgálóhoz."
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Hitelesítés..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Várakozás válaszra..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s meghívva erre a társalgásra."
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Meghívás társalgásra"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -10134,25 +6155,25 @@ msgstr ""
 "\n"
 "Elküldve: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Szeretne csatlakozni a társalgáshoz?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ki lett jelentkeztetve, mivel bejelentkezett egy másik munkaállomásról."
 
-#: ../libgaim/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Úgy tűnik, %s kilépett, és nem kapta meg az utoljára küldött üzenetet."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -10160,11 +6181,11 @@ msgstr ""
 "Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
 "amelyikhez kapcsolódni szeretne."
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Hiba: az SSL támogatás nincs telepítve."
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ez a konferencia le lett zárva. További üzenetek már nem küldhetőek."
 
@@ -10178,33 +6199,33 @@ msgstr "Ez a konferencia le lett zárva. További üzenetek már nem küldhetőe
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger protokollbővítmény"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Kiszolgáló címe"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Kiszolgáló portja"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "A kiszolgáló lezárta a kapcsolatot."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -10213,13 +6234,14 @@ msgstr ""
 "Elveszett a kapcsolat a kiszolgálóhoz:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -10238,19 +6260,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM protokollbővítmény"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Mindig az AIM/ICQ proxy kiszolgáló használata fájlátvitelhez\n"
-"(lassabb, de nem jeleníti meg az IP címet)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10261,152 +6275,144 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ protokollbővítmény"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Mindig az ICQ proxy kiszolgáló használata fájlátvitelhez\n"
-"(lassabb, de nem jeleníti meg az IP címet)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "A távoli felhasználó lezárta a kapcsolatot."
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "A távoli felhasználó visszautasította a kérését."
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "A távoli felhasználóhoz elveszett a kapcsolat:<br>%s"
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a távoli felhasználótól."
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Nem hozható létre kapcsolat a távoli felhasználóval."
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "A közvetlen kapcsolat létrejött"
 
-#: ../libgaim/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "A(z) %s fájl %s, amely nagyobb, mint a legnagyobb méret (%s)."
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Érvénytelen hiba"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Érvénytelen SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Sebesség a kiszolgálóhoz"
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Sebesség a kliens felé"
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "A szolgáltatás nem érhető el"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "A szolgáltatás nincs megadva"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "Elavult SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "A kiszolgáló nem támogatja"
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "A kliens nem támogatja"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "A kliens elutasította"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "A válasz túl nagy"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "A válaszok elvesztek"
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Kérés elutasítva"
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "Tönkretett SNAC rakomány"
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Elégtelen jogosultságok"
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "A helyi engedélyezés/letiltás listában"
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "Túl rosszindulatú (küldő)"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "Túl rosszindulatú (fogadó)"
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "A felhasználó átmenetileg nem érhető el"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Nincs találat"
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "Lista-túlcsordulás"
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "A kérés nem egyértelmű"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "A sor megtelt"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "Nem, amíg az AOL-on tartózkodik"
 
-#: ../libgaim/protocols/oscar/oscar.c:327
+#: ../libpurple/protocols/oscar/oscar.c:329
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -10418,132 +6424,154 @@ msgstr ""
 "milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó "
 "fiókbeállításainál.)"
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:438
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
-msgstr "(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző kódolást használnak, vagy %s hibás klienst használ.)"
+msgstr ""
+"(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző "
+"kódolást használnak, vagy %s hibás klienst használ.)"
+
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Partnerikon"
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#: ../libpurple/protocols/oscar/oscar.c:623
 msgid "Voice"
 msgstr "Hang"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:626
 msgid "AIM Direct IM"
 msgstr "AIM közvetlen azonnali üzenetek"
 
-#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:632
+#: ../libpurple/protocols/oscar/oscar.c:5919
 msgid "Get File"
 msgstr "Fájl letöltése"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:639
 msgid "Games"
 msgstr "Játékok"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Add-Ins"
 msgstr "Kiegészítők"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Send Buddy List"
 msgstr "Partnerlista küldése"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "ICQ Direct Connect"
 msgstr "ICQ közvetlen kapcsolat"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:651
 msgid "AP User"
 msgstr "AP felhasználó"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:654
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "ICQ Server Relay"
 msgstr "ICQ közvetítő kiszolgáló"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Old ICQ UTF8"
 msgstr "Régi ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "Trillian Encryption"
 msgstr "Trillian titkosítás"
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Security Enabled"
 msgstr "Biztonság engedélyezve"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "Video Chat"
 msgstr "Videócsevegés"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Live Video"
 msgstr "Élő videó"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Camera"
 msgstr "Fényképezőgép"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:710
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "Not Available"
 msgstr "Nem érhető el"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:712
+#: ../libpurple/protocols/oscar/oscar.c:5710
 msgid "Occupied"
 msgstr "Elfoglalt"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:716
 msgid "Web Aware"
 msgstr "A weben"
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:463 ../pidgin/gtkstatusbox.c:1053
+msgid "Invisible"
+msgstr "Láthatatlan"
+
+#: ../libpurple/protocols/oscar/oscar.c:720
 msgid "Online"
 msgstr "Elérhető"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:819
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP cím"
+
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:2840
 msgid "Warning Level"
 msgstr "Figyelmeztetési szint"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:836
 msgid "Buddy Comment"
 msgstr "Partnermegjegyzés"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:976
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10552,7 +6580,7 @@ msgstr ""
 "Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:984
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10561,20 +6589,20 @@ msgstr ""
 "Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1024
 msgid "Screen name sent"
 msgstr "Felhasználónév elküldve"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1029
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat létrejött, süti elküldve"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1058
 msgid "Finalizing connection"
 msgstr "Kapcsolódás befejezése"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1242
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10585,28 +6613,28 @@ msgstr ""
 "érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, "
 "számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "Érvénytelen felhasználónév."
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "Helytelen jelszó."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "A fiókja jelenleg fel van függesztve."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1348
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -10614,47 +6642,46 @@ msgstr ""
 "Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
 "tovább folytatja, még többet kell majd várnia."
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
-"Az ügyfél program verziója túl régi. Kérem töltse le a frissítést a "
+"A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a "
 "következő helyről: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1388
 msgid "Could Not Connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1393
 msgid "Received authorization"
 msgstr "A hitelesítés fogadva"
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1416
 msgid "The SecurID key entered is invalid."
 msgstr "A megadott SecurID kulcs érvénytelen."
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1430
 msgid "Enter SecurID"
 msgstr "Adja meg a SecurID-t"
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1431
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Írja be a hatjegyű számot a digitális képernyőről."
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libgaim/protocols/oscar/oscar.c:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5837
-#: ../libgaim/protocols/oscar/oscar.c:6067
-#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:2224
+#: ../libpurple/protocols/oscar/oscar.c:2271
+#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1472
+#: ../libpurple/protocols/oscar/oscar.c:1515
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10663,55 +6690,55 @@ msgstr ""
 "Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. "
 "Frissítésekért keresse fel a következő címet: %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "A Gaim nem tudott lekérni egy érvényes AIM belépő hasht."
+#: ../libpurple/protocols/oscar/oscar.c:1475
+#: ../libpurple/protocols/oscar/oscar.c:1518
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nem kérhető le érvényes AIM belépő hash."
 
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1604
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő "
 "címet: %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr "A Gaim nem tudott lekérni egy érvényes belépő hasht."
+#: ../libpurple/protocols/oscar/oscar.c:1607
+msgid "Unable to get a valid login hash."
+msgstr "Nem kérhető le érvényes belépő hash."
 
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1633
 msgid "Password sent"
 msgstr "Jelszó elküldve"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1689
 msgid "Unable to initialize connection"
 msgstr "A kapcsolat nem inicializálható"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2194
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Kérem engedélyezze, hogy felvehessem a partnereim közé."
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2222
 msgid "Authorization Request Message:"
 msgstr "Engedélyezést kérő üzenet:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Please authorize me!"
 msgstr "Kérem engedélyezze, hogy felvegyem!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2271
-#: ../libgaim/protocols/oscar/oscar.c:2278
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#: ../libgaim/protocols/oscar/oscar.c:5197
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2263
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "Nincs ok megadva."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2269
 msgid "Authorization Denied Message:"
 msgstr "Engedélyezést elutasító üzenet:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2397
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10722,17 +6749,17 @@ msgstr ""
 "következő indoklással:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2398
 msgid "ICQ authorization denied."
 msgstr "ICQ engedélyezés elutasítva."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2405
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "%u felhasználó elfogadta a kérését, így felveheti őt a partnerlistájára."
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10745,7 +6772,7 @@ msgstr ""
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10758,7 +6785,7 @@ msgstr ""
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10771,27 +6798,31 @@ msgstr ""
 "Az üzenet:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2450
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "%u ICQ felhasználó küldött Önnek egy partnert: %s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2456
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Fel kívánja venni ezt a partnert a listájára?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "Hozzá_adás"
+
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2546
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2555
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -10801,7 +6832,7 @@ msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy
 # #: ../src/protocols/oscar/oscar.c:1605
 # #, c-format
 # msgid "You missed %d message from %s because the rate limit has been exceeded."
-#: ../libgaim/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2564
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -10812,7 +6843,7 @@ msgstr[1] ""
 "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
 "gyakoriságának a korlátját."
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2573
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -10823,7 +6854,7 @@ msgstr[1] ""
 "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
 "rosszindulatú volt."
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2582
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -10834,74 +6865,69 @@ msgstr[1] ""
 "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
 "volt."
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2591
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC hiba: %s\n"
-
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2746
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Az üzenetet nem lehet elküldeni: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2758
-#: ../libgaim/protocols/oscar/oscar.c:2763
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2751
+#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2817
 msgid "Unknown reason."
 msgstr "Ismeretlen ok."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2813
 #, c-format
 msgid "User information not available: %s"
 msgstr "A felhasználó információi nem érhetőek el: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2816
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s felhasználó információi nem érhetőek el:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2845
 msgid "Online Since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Tag ezóta"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2855
 msgid "Capabilities"
 msgstr "Képességek"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "Elérhetőségi üzenet"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
 msgstr "Az AIM kapcsolata megszakadhatott."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3175
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -10909,11 +6935,7 @@ msgstr ""
 "[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
 "érvénytelen karaktereket tartalmazott.]"
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
-msgid "Rate limiting error."
-msgstr "Sebességkorlátozási hiba."
-
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3378
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -10921,84 +6943,85 @@ msgstr ""
 "Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. "
 "Kérem várjon 10 másodpercet és próbálja meg újra."
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3450
 msgid "You have been signed off for an unknown reason."
 msgstr "Ismeretlen okból ki lett jelentkeztetve."
 
-#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilépett a(z) %s csevegőszobából."
 
-#: ../libgaim/protocols/oscar/oscar.c:3723
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libgaim/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3740
 msgid "Personal Web Page"
 msgstr "Saját weboldal"
 
-#: ../libgaim/protocols/oscar/oscar.c:3758
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "További információ"
 
-#: ../libgaim/protocols/oscar/oscar.c:3766
-#: ../libgaim/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Zip Code"
 msgstr "Irányítószám"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Division"
 msgstr "Részleg"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Position"
 msgstr "Pozíció"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Web Page"
 msgstr "Weboldal"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Information"
 msgstr "Munkahelyi adatok"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libpurple/protocols/oscar/oscar.c:3858
 msgid "Pop-Up Message"
 msgstr "Felbukkanó üzenet"
 
-#: ../libgaim/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3898
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "A következő felhasználónév a következőhöz van rendelve: %s"
 msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3903
 msgid "Screen name"
 msgstr "Felhasználónév"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3929
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nem található eredmény a(z) %s e-mail címre"
 
-#: ../libgaim/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Kapnia kell egy %s jóváhagyását kérő levelet."
 
-#: ../libgaim/protocols/oscar/oscar.c:3946
+#: ../libpurple/protocols/oscar/oscar.c:3952
 msgid "Account Confirmation Requested"
 msgstr "Fiókjóváhagyás megkérve"
 
-#: ../libgaim/protocols/oscar/oscar.c:3977
+#: ../libpurple/protocols/oscar/oscar.c:3983
 msgid "Error Changing Account Info"
 msgstr "Hiba a fiók információinak megváltoztatása közben"
 
-#: ../libgaim/protocols/oscar/oscar.c:3980
+#: ../libpurple/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -11007,14 +7030,14 @@ msgstr ""
 "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
 "felhasználónév eltér az eredetitől."
 
-#: ../libgaim/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az "
 "érvénytelen."
 
-#: ../libgaim/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -11023,7 +7046,7 @@ msgstr ""
 "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
 "felhasználónév túl hosszú."
 
-#: ../libgaim/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -11032,7 +7055,7 @@ msgstr ""
 "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már "
 "függőben van erre a felhasználónévre."
 
-#: ../libgaim/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -11041,7 +7064,7 @@ msgstr ""
 "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
 "cím túl sok felhasználónévhez van társítva."
 
-#: ../libgaim/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -11050,41 +7073,31 @@ msgstr ""
 "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
 "cím érvénytelen."
 
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Hiba 0x%04x: Ismeretlen hiba."
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"A felhasználóneve a következőképpen van formázva:\n"
-"%s"
+msgid "The e-mail address for %s is %s"
+msgstr "%s e-mail címe a következő: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "Fiókinformációk"
 
-#: ../libgaim/protocols/oscar/oscar.c:4014
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "%s e-mail címe a következő: %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4189
+#: ../libpurple/protocols/oscar/oscar.c:4187
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban "
 "kell lennie."
 
-#: ../libgaim/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4432
 msgid "Unable to set AIM profile."
 msgstr "Nem lehet beállítani az AIM profilt."
 
-#: ../libgaim/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4433
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -11094,37 +7107,37 @@ msgstr ""
 "beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már "
 "megtörtént."
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
+#: ../libpurple/protocols/oscar/oscar.c:4447
 #, c-format
 msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] "A profil mérete túllépte a maximális %d bájtot. A Gaim csonkította."
-msgstr[1] "A profil mérete túllépte a maximális %d bájtot. A Gaim csonkította."
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
+msgstr[1] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libgaim/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4452
 msgid "Profile too long."
 msgstr "A profil túl hosszú."
 
-#: ../libgaim/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] "A távollét üzenet hossza túllépte a maximális %d bájtot. A Gaim csonkította."
-msgstr[1] "A távollét üzenet hossza túllépte a maximális %d bájtot. A Gaim csonkította."
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
+msgstr[1] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libgaim/protocols/oscar/oscar.c:4510
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Away message too long."
 msgstr "A távollét-üzenet túl hosszú."
 
-#: ../libgaim/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -11135,36 +7148,32 @@ msgstr ""
 "felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és "
 "szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
 
-#: ../libgaim/protocols/oscar/oscar.c:4581
-#: ../libgaim/protocols/oscar/oscar.c:5004
-#: ../libgaim/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:4573
+#: ../libpurple/protocols/oscar/oscar.c:4996
+#: ../libpurple/protocols/oscar/oscar.c:5010
 msgid "Unable To Add"
 msgstr "Nem sikerült felvenni"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4677
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nem lehet lekérni a partnerek listáját"
 
-#: ../libgaim/protocols/oscar/oscar.c:4686
+#: ../libpurple/protocols/oscar/oscar.c:4678
 msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"A Gaim ideiglenesen nem tudta a partnerek listáját lekérni az AIM "
-"kiszolgálóról. A partnerlistája nem veszett el, és néhány órán belül "
-"valószínűleg elérhetővé válik."
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr "Az AIM kiszolgálók ideiglenesen nem tudták elküldeni a partnerlistáját. A partnerlistája nem veszett el és néhány órán belül valószínűleg elérhetővé válik."
 
-#: ../libgaim/protocols/oscar/oscar.c:4890
-#: ../libgaim/protocols/oscar/oscar.c:4891
-#: ../libgaim/protocols/oscar/oscar.c:4896
-#: ../libgaim/protocols/oscar/oscar.c:5072
-#: ../libgaim/protocols/oscar/oscar.c:5073
-#: ../libgaim/protocols/oscar/oscar.c:5078
+#: ../libpurple/protocols/oscar/oscar.c:4882
+#: ../libpurple/protocols/oscar/oscar.c:4883
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5065
+#: ../libpurple/protocols/oscar/oscar.c:5070
 msgid "Orphans"
 msgstr "Árvák"
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:4994
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -11173,12 +7182,12 @@ msgstr ""
 "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
 "Kérem töröljön egyet közülük és próbálja meg újra."
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5008
 msgid "(no name)"
 msgstr "(nincs név)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5008
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -11188,7 +7197,7 @@ msgstr ""
 "Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, "
 "hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
 
-#: ../libgaim/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -11197,22 +7206,22 @@ msgstr ""
 "%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel "
 "akarja venni őt?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5108
 msgid "Authorization Given"
 msgstr "Engedély megadva"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5188
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "%s felhasználó engedélyezi, hogy felvegye őt a partnerei közé."
 
-#: ../libgaim/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5189
 msgid "Authorization Granted"
 msgstr "Engedély kiadva"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5192
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -11223,46 +7232,51 @@ msgstr ""
 "következő indoklással:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5193
 msgid "Authorization Denied"
 msgstr "Engedély elutasítva"
 
-#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Váltás:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5269
 msgid "Invalid chat name specified."
 msgstr "A megadott csevegésnév érvénytelen."
 
-#: ../libgaim/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5339
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Az Ön IM képe nem lett elküldve. Nem küldhet IM képeket AIM csevegésekbe."
 
-#: ../libgaim/protocols/oscar/oscar.c:5516
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5478
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "Away Message"
 msgstr "Távol üzenet"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(lekérés)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5683
+msgid "iTunes Music Store Link"
+msgstr "iTunes zenebolt hivatkozás"
+
+#: ../libpurple/protocols/oscar/oscar.c:5791
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s partnermegjegyzése"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5792
 msgid "Buddy Comment:"
 msgstr "Partnermegjegyzés:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5839
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Közvetlen kapcsolat nyitását választotta %s partnerrel."
 
-#: ../libgaim/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5843
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -11270,69 +7284,65 @@ msgstr ""
 "Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági "
 "kockázatként. Folytatni kívánja?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Get AIM Info"
 msgstr "AIM információk lekérése"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Edit Buddy Comment"
 msgstr "Partnermegjegyzés szerkesztése"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5898
 msgid "Get Status Msg"
 msgstr "Állapotüzenet lekérése"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libpurple/protocols/oscar/oscar.c:5911
 msgid "Direct IM"
 msgstr "Közvetlen IM"
 
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Re-request Authorization"
 msgstr "Engedélyezés újrakérése"
 
-#: ../libgaim/protocols/oscar/oscar.c:6032
+#: ../libpurple/protocols/oscar/oscar.c:5992
 msgid "Require authorization"
 msgstr "Engedélyezés kérése"
 
-#: ../libgaim/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:5995
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "A weben ismert (ennek engedélyezése után SPAM-et fog kapni!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6040
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "ICQ Privacy Options"
 msgstr "ICQ magánszféra beállításai"
 
-#: ../libgaim/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6019
 msgid "The new formatting is invalid."
 msgstr "Az új formázás érvénytelen."
 
-#: ../libgaim/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely "
 "karaktereket változtathatja meg."
 
-#: ../libgaim/protocols/oscar/oscar.c:6065
-msgid "New screen name formatting:"
-msgstr "Új felhasználónév formázás:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6121
+#: ../libpurple/protocols/oscar/oscar.c:6073
 msgid "Change Address To:"
 msgstr "Cím megváltoztatása a következőre:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6119
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Ön nem vár engedélyezésre</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6169
+#: ../libpurple/protocols/oscar/oscar.c:6122
 msgid "You are awaiting authorization from the following buddies"
 msgstr "A következő partnerektől vár engedélyezésre"
 
-#: ../libgaim/protocols/oscar/oscar.c:6170
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11340,96 +7350,100 @@ msgstr ""
 "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
 "kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
 
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Find Buddy by E-Mail"
 msgstr "Partnerek keresése e-mail cím szerint"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Search for a buddy by e-mail address"
 msgstr "Partner keresése e-mail cím alapján"
 
-#: ../libgaim/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Adja meg annak a partnernek az e-mail címét, akit keres."
 
-#: ../libgaim/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "_Search"
 msgstr "_Keresés"
 
-#: ../libgaim/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6303
 msgid "Set User Info (URL)..."
 msgstr "Felhasználói információk beállítása (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6314
 msgid "Change Password (URL)"
 msgstr "Jelszó megváltoztatása (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6318
 msgid "Configure IM Forwarding (URL)"
 msgstr "Üzenettovábbítás beállítása (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6328
 msgid "Set Privacy Options..."
-msgstr "Magánszféra opciók beállítása..."
+msgstr "Magánszféra-beállítások..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6393
-msgid "Format Screen Name..."
-msgstr "Felhasználónév formázása..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
 
-#: ../libgaim/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "Display Currently Registered E-Mail Address"
 msgstr "A jelenleg regisztrált e-mail cím megjelenítése"
 
-#: ../libgaim/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "A jelenleg regisztrált e-mail cím megváltoztatása..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6412
+#: ../libpurple/protocols/oscar/oscar.c:6350
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
-#: ../libgaim/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Partner keresése e-mail cím szerint..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
 
-#: ../libgaim/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6429
 msgid "Use recent buddies group"
 msgstr "A legutóbbi partnerek csoport használata"
 
-#: ../libgaim/protocols/oscar/oscar.c:6494
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Show how long you have been idle"
 msgstr "Megjeleníti, meddig volt inaktív"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6584
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Mindig az ICQ proxy kiszolgáló használata fájlátvitelhez\n"
+"(lassabb, de nem jeleníti meg az IP címet)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "%s felkérése, hogy kapcsolódjon hozzánk ezen: %s:%hu közvetlen kapcsolattal."
 
-#: ../libgaim/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Kapcsolódási kísérlet a következőhöz: %s:%hu."
 
-#: ../libgaim/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "Kapcsolódási kísérlet proxy kiszolgálón keresztül."
 
-#: ../libgaim/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s felkérte a közvetlen kapcsolatra a következőhöz: %s"
 
-#: ../libgaim/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -11439,391 +7453,399 @@ msgstr ""
 "képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a "
 "magánszférája biztonságát."
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "Kapcs_olódás"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Elsődleges információk"
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Személyes bemutatkozás"
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ szám"
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Ország/terület"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Megye/állam"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoszkóp szimbólum"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Zodiákus jel"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Vércsoport"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Főiskola"
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Irányítószám"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobil telefonszám"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonszám"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Vízöntő"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Halak"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Kos"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Bika"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Ikrek"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Rák"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Oroszlán"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Szűz"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Mérleg"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpió"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Nyilas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Bak"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Patkány"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Ökör"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigris"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Nyúl"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Sárkány"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Kígyó"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Ló"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Kecske"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Majom"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Kakas"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Kutya"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Disznó"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Információk módosítása"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Információk frissítése"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Információi frissítve lettek"
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
-msgstr "Egyéni arcképet próbál beállítani. A Gaim jelenleg csak a szabványos arcképeket támogatja. Válasszon egy képet innen: "
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr "Az egyéni arcképek beállítása jelenleg nem támogatott. Válasszon egy képet innen: %s."
 
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Érvénytelen QQ arckép"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Visszautasította %d kérését"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Indokolja meg:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Kérés visszautasítása"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Bocs, nem vagy az esetem..."
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:136
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "A partner felvétele felhatalmazási kéréssel meghiúsult"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "Sikeresen eltávolított egy partnert"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Sikeresen eltávolította magát egy partnertől"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "A(z) %d felhasználó felhatalmazást kér"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Írja be ide kérését"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Leszünk barátok?"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Küldés"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Felvette %d felhasználót a partnerlistájára"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid hiba"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Érvénytelen QQid"
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "Azonosító: "
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Csoportazonosító"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Létrehozó"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Csoportleírás"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Engedélyezés"
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libgaim/protocols/qq/group.c:120
+#: ../libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr "Adja meg a külső csoportazonosítót"
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Csak állandó QQ csoportok között kereshet\n"
 
-#: ../libgaim/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "A(z) %d felhasználó csatlakozásra jelentkezett a(z) %d csoporthoz"
 
-#: ../libgaim/protocols/qq/group_im.c:123
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Ok: %s"
 
-#: ../libgaim/protocols/qq/group_im.c:130
-#: ../libgaim/protocols/qq/group_im.c:174
-#: ../libgaim/protocols/qq/group_im.c:214
-#: ../libgaim/protocols/qq/group_im.c:249
-#: ../libgaim/protocols/qq/group_im.c:283
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ Qun művelet"
 
-#: ../libgaim/protocols/qq/group_im.c:133
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Jóváhagyás"
 
-#: ../libgaim/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "A csatlakozási kérelmét a(z) %d csoporthoz %d admin visszautasította"
 
-#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "A csatlakozási kérelmét a(z) %d csoporthoz %d admin jóváhagyta"
 
-#: ../libgaim/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Ön [%d] kilépett a következő csoportból: \"%d\""
 
-#: ../libgaim/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Ön [%d] fel lett véve a következő csoportba: \"%d\""
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "A csoport fel lett véve a partnerlistájára"
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "Nem vagyok tag"
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Tag vagyok"
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Csatlakozásra jelentkezem"
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Admin vagyok"
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Ismeretlen állapot"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr "Ez a csoport nem engedélyezi mások csatlakozását"
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "Sikeresen elhagyta a csoportot"
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ csoporthitelesítés"
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "A hitelesítési műveletét elfogadta a QQ kiszolgáló"
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Az elfogadható tartományon kívüli csoportazonosítót adott meg"
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "Biztosan ki akar lépni ebből a Qun-ből?"
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -11831,174 +7853,181 @@ msgstr ""
 "Ne feledje, ha Ön hozta létre,\n"
 "akkor ez a művelet törli a Qun-t."
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "Folytatás"
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kód: [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr "Csoportművelet-hiba"
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Jóvá kívánja hagyni a kérést?"
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "Sikeresen módosította a Qun tagot"
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "Sikeresen módosította a Qun információkat"
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "Sikeresen létrehozott egy Qun-t"
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "Be kívánja állítani most a Qun részleteit?"
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "Beállítás"
 
-#: ../libgaim/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "Rendszerüzenet"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "Kiszolgáló ACK"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "Üzenet küldése meghiúsult\n"
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr "Életben tartási hiba, úgy tűnik a kapcsolat elveszett!"
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr "Bejelentkezési jelsor kérési hiba!"
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Nem lehet bejelentkezni, nézze meg a hibakeresési naplót"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Nem lehet kapcsolódni."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Ismeretlen-%d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "%s cím"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Szint"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: Elérhető"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: Távol"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: Láthatatlan"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: Kilépett"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "Érvénytelen név"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Jelenleg elérhető</b>: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Utolsó frissítés</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Kapcsolat módja</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Kiszolgáló IP</b>: %s: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Nyilvános IP címem</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Bejelentkezés ideje</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Utolsó bejelentkezési IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Utolsó bejelentkezés ideje</b>: %s\n"
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Bejelentkezési információk"
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "Információim módosítása"
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr "Bejelentkezési információk megjelenítése"
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr "Kilépés ebből a QQ Qun-ből"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "A partner tiltása"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -12009,247 +8038,249 @@ msgstr "Kilépés ebből a QQ Qun-ből"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tbővítmény"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Bejelentkezés TCP felett"
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Bejelentkezés rejtve"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr "Küldési hiba a foglalaton"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Kapcsolat visszautasítva"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Foglalathiba"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "A foglalatból nem lehet olvasni"
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d visszautasította a következő fájlt: %s"
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "Fájlküldés"
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d megszakította a(z) %s átvitelét"
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "A kapcsolat elveszett"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr "A bejelentkezés meghiúsult, nincs válasz"
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Fel kívánja venni ezt a partnert?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s felvette"
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Szeretné felvenni?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s felvette [%s]"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "%s felhasználó visszautasította a kérését"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "%s felhasználó jóváhagyta kérését"
 
-#: ../libgaim/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s fel kívánja venni Önt [%s] barátként"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s nincs a partnerlistáján"
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Szeretné felvenni?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Kapcsolat lezárva (írás)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Csoport címe:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes csoportazonosító:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "%s csoport információi"
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes címjegyzék-információk"
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Csoport meghívása konferenciára..."
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Notes címjegyzék-információk lekérése"
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Kézfogás küldése"
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Várakozás a kézfogás igazolására"
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "A kézfogás igazolva, bejelentkezés küldése"
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Várakozás a bejelentkezés igazolására"
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Bejelentkezés átirányítva"
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Bejelentkezés kényszerítése"
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Bejelentkezés igazolva"
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Szolgáltatások indítása"
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: ../libgaim/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s "
 "kiszolgálón"
 
-#: ../libgaim/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime adminisztrátori bejelentés"
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Kapcsolat visszaállítva"
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Hiba a foglalatból olvasás közben: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Bejelentés a következőtől: %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "A konferencia lezárva"
 
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Az üzenet nem küldhető el: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Hely lezárva"
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Hangszórók"
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Fájlátvitel"
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Támogatja"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Külső felhasználó"
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Konferencia létrehozása a következő felhasználóval"
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -12258,27 +8289,27 @@ msgstr ""
 "Adja meg az új konferencia témáját és a(z) %s számára elküldendő "
 "meghívóüzenetet."
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Új konferencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Létrehozás"
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Elérhető konferenciák"
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Új konferencia létrehozása..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Felhasználó meghívása konferenciára"
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12289,23 +8320,27 @@ msgstr ""
 "felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új "
 "konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
 
-#: ../libgaim/protocols/sametime/sametime.c:3492
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Meghívás konferenciára"
 
-#: ../libgaim/protocols/sametime/sametime.c:3582
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Meghívás konferenciára..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "TESZT bejelentés küldése"
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+msgid "Topic:"
+msgstr "Téma:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Nincs megadva Sametime közösségi kiszolgáló"
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -12314,38 +8349,38 @@ msgstr ""
 "Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés "
 "folytatásához adjon meg egyet alább."
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile kapcsolat beállítása"
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Nincs megadva Sametime közösségi kiszolgáló"
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ismeretlen (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Utolsó ismert kliens"
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "Felhasználónév"
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "Sametime azonosító"
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Kétértelmű felhasználói azonosító került megadásra"
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12354,15 +8389,15 @@ msgstr ""
 "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza "
 "ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Válasszon felhasználót"
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "A felhasználó nem vehető fel: a felhasználó nem található"
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -12371,11 +8406,11 @@ msgstr ""
 "A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a "
 "bejegyzés eltávolításra került a partnerlistájából."
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Nem vehető fel a felhasználó"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12384,63 +8419,63 @@ msgstr ""
 "Hiba a(z) %s fájl olvasásakor: \n"
 "%s.\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Távol tárolt partnerlista"
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Partnerlista tárolási módja"
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Csak helyi partnerlista"
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Partnerlista összefésülése a kiszolgálóról"
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Lista összefésülése a kiszolgálóról és mentés oda"
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Lista szinkronizálása a kiszolgálóval"
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "A(z) %s fiók Sametime listájának importálása"
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "A(z) %s fiók Sametime listájának exportálása"
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "A csoport nem vehető fel: a csoport már létezik"
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Már létezik \"%s\" nevű csoport a partnerlistán."
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "Nem vehető fel a csoport"
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "Lehetséges találatok"
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr "Notes címjegyzék csoporteredmények"
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12451,15 +8486,15 @@ msgstr ""
 "hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az "
 "alábbi listából."
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr "Válasszon Notes címjegyzéket"
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "Nem vehető fel a csoport: a csoport nem található"
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -12468,11 +8503,11 @@ msgstr ""
 "A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes "
 "címjegyzékcsoportjának sem felelt meg."
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr "Notes címjegyzékcsoport"
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5475
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -12480,12 +8515,12 @@ msgstr ""
 "Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet "
 "tagjaival együtt fel kíván venni a partnerlistájára."
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "\"%s\" keresésének eredménye"
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12496,26 +8531,30 @@ msgstr ""
 "partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az "
 "alábbi műveletgombokkal."
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "A keresés eredménye"
+
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "Nincs találat"
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime "
 "közösségben."
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "Nincs találat"
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "Felhasználó keresése"
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -12523,83 +8562,90 @@ msgstr ""
 "Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez "
 "felhasználókat keres a Sametime közösségben."
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "Felhasználó keresése"
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr "Sametime lista importálása..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr "Sametime lista exportálása..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr "Notes címjegyzékcsoport hozzáadása..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "Felhasználó keresése..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr "Bejelentkezés kényszerítése (kiszolgáló átirányítások mellőzése)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
-msgstr "Ügyfél azonosságának elrejtése"
+msgstr "Kliens azonosságának elrejtése"
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "%s felhasználó nincs jelen a hálózatban"
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Kulcscsere"
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "A kulcscsere nem végezhető el"
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Hiba lépett fel a kulcscsere közben"
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "A kulcscsere sikertelen"
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Időtúllépés kulcscsere közben"
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "A kulcscsere megszakítva"
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "A kulcscsere már elkezdődött"
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Nem indíthat kulcscserét önmagával"
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "A távoli felhasználó már nincs jelen a hálózatban"
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -12608,7 +8654,7 @@ msgstr ""
 "Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a "
 "kulcscserét?"
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12619,79 +8665,88 @@ msgstr ""
 "Távoli gép: %s\n"
 "Távoli port: %d"
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Kulcscsere-kérés"
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "Azonnali üzenetváltás jelszóval"
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Nem lehet beállítani az azonnaliüzenő-kulcsot"
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "Azonnaliüzenő-jelszó beállítása"
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Nyilvános kulcs lekérése"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:549
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "A nyilvános kulcs nem tölthető le"
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Nyilvános kulcs megjelenítése"
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Nem sikerült a nyilvános kulcsot betölteni"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Felhasználói információk"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:714
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "A felhasználói információk lekérése sikertelen"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s partner nem megbízható"
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"Nem fogadhat partnerértesítéseket, amíg nem importálja a partner "
-"nyilvános kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" "
-"paranccsal töltheti le."
+"Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános "
+"kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal "
+"töltheti le."
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Megnyitás..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s partner nincs jelen a hálózatban"
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -12699,15 +8754,15 @@ msgstr ""
 "Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson "
 "az Importálásra."
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importálás..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Megfelelő felhasználó kiválasztása"
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -12715,7 +8770,7 @@ msgstr ""
 "Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a "
 "partnerlistához adandó megfelelő felhasználót a listából."
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -12723,213 +8778,238 @@ msgstr ""
 "Több felhasználó található ugyanazzal a névvel. Válassza ki a "
 "partnerlistához adandó megfelelő felhasználót a listából."
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Leválasztott"
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Gyengélkedik"
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Ébresszen fel"
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktív"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Boldog"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Szomorú"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Dühös"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Féltékeny"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Megszégyenült"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Legyőzhetetlen"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Szerelmes"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Álmos"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Unott"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Érdeklődő"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Nyugtalan"
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Felhasználói módok"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Hangulat"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Előnyben részesített kapcsolat"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Előnyben részesített nyelv"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Eszköz"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Időzóna"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Földrajzi hely"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Azonnali üzenőkulcs visszaállítása"
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Azonnali üzenet kulcscserével"
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "Azonnali üzenet jelszóval"
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Nyilvános kulcs letöltése..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1667
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Felhasználó kidobása"
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Rajzolás a rajzlapra"
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Jelmondat:"
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "A(z) %s csatorna nem létezik a hálózatban"
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Csatornainformációk"
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Csatornainformációk lekérése sikertelen"
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Csatorna neve:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Felhasználók száma:</b> %d"
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Csatorna alapítója:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Csatorna titkosítója:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Csatorna HMAC:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Csatorna témája:</b><br> %s"
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Csatorna módjai:</b> "
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Alapító kulcsának ujjlenyomata:</b><br> %s"
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Alapító kulcsának blablakódja:</b><br> %s"
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Csatorna nyilvános kulcsának hozzáadása"
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Nyilvános kulcs megnyitása..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Csatorna jelmondata"
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Csatorna nyilvános kulcsainak listája"
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12943,322 +9023,334 @@ msgstr ""
 "szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok "
 "a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Csatornahitelesítés"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Hozzáadás / Eltávolítás"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Jelmondat"
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és "
 "jelmondatát."
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Csatorna magáncsoport felvétele"
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "Felhasználók korlátozása"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-"A csatorna legnagyobb felhasználószámának beállítása. A felhasználószám-"
-"korlátozás megszüntetéséhez állítsa nullára."
+msgstr "A csatorna legnagyobb felhasználószámának beállítása. A felhasználószám-korlátozás feloldásához állítsa nullára."
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Meghívási lista"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Kitiltási lista"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Magáncsoport felvétele"
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Állandóság visszavonása"
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Állandóság beállítása"
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Felhasználószám korlátozása"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Témamegszorítás visszavonása"
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Témamegszorítás beállítása"
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Magáncsatorna visszavonása"
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Magáncsatorna beállítása"
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Titkos csatorna visszavonása"
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Titkos csatorna beállítása"
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ön a csatornaalapító a következőn: <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "A csatornaalapító a következőn: <I>%s</I>: <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s "
 "csatornához"
 
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Kapcsolódás magáncsoporthoz"
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Nem lehet kapcsolódni a magáncsoporthoz"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Hívás parancsa"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Nem lehet meghívni a parancsot"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Biztonságos fájlátvitel"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Hiba a fájlátvitel közben"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Kulcscsere sikertelen"
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "A fájlátviteli folyamat nem létezik"
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nincs aktív fájlátviteli folyamat"
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "A fájlátvitel már elindult"
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "A kulcscsere nem végezhető el az átvitelhez"
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "A fájlátvitel elindítása nem sikerült"
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "A fájl nem küldhető el"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s megváltoztatta a(z) <I>%s</I> témáját a következőre: %s"
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> átállította a(z) <I>%s</I> csatorna üzemmódjait a következőkre: %s"
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> eltávolította a(z) <I>%s</I> csatorna üzemmódjait"
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> beállította <I>%s</I> üzemmódjait a következőkre: %s"
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> eltávolította <I>%s</I> összes üzemmódját"
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Önt a következőről: <I>%s</I> kirúgta <I>%s</I> (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Önt kidobta a következő: %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Kidobta: %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Kiszolgáló kijelentkezett"
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Személyes információk"
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Születésnap"
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Pozíció"
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Szervezet"
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Egység"
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Megjegyzés"
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Csatlakozás csevegéshez"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Valódi név"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Állapotszöveg"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Nyilvános kulcs ujjlenyomata"
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Nyilvános kulcs blablakódja"
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Több..."
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Leválás a kiszolgálóról"
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "Nem lehet leválni"
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Nem lehet beállítani a témát"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Nem sikerült a becenevet megváltoztatni"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Szobalista"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nem sikerült lekérni a szobalistát"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "Nem érkezett nyilvános kulcs"
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Kiszolgálóinformációk"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nem lehet lekérni a kiszolgálóinformációkat"
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Kiszolgálóstatisztikák"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nem lehet lekérni a kiszolgálóstatisztikákat"
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "Nincsenek elérhető kiszolgálóstatisztikák"
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -13293,102 +9385,104 @@ msgstr ""
 "Kiszolgáló-operátorok összesen: %d\n"
 "Útválasztó-operátorok összesen: %d\n"
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "Hálózati statisztika"
 
-#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping sikertelen"
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping válasz érkezett a kiszolgálótól"
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "Nem sikerült kidobni a felhasználót"
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr "Kulcscsere sikertelen"
 
-#: ../libgaim/protocols/silc/ops.c:1723
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
 "gombra egy új kapcsolat létrehozásához."
 
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "Folyamat folytatása"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Kapcsolat hitelesítése"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "Kiszolgáló nyilvános kulcsának ellenőrzése"
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Jelmondat szükséges"
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Hiba: A verziók különböznek, kérem frissítse a kliensét"
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Hiba: A távoli fél nem bízik meg vagy nem támogatja az Ön nyilvános kulcsát"
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Hiba: A távoli fél nem támogatja a javasolt KE csoportot"
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Hiba: A távoli fél nem támogatja a javasolt titkosítót"
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Hiba: A távoli fél nem támogatja a javasolt PKCS-t"
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Hiba: A távoli fél nem támogatja a javasolt hash függvényt"
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Hiba: A távoli fél nem támogatja a javasolt HMAC-ot"
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Hiba: Nem megfelelő aláírás"
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Hiba: Érvénytelen süti"
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Hiba: Hitelesítés sikertelen"
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -13397,12 +9491,12 @@ msgstr ""
 "%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel "
 "a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "%s nyilvános kulcsa megérkezett. El kívánja fogadni ezt a nyilvános kulcsot?"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13415,65 +9509,73 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Nyilvános kulcs ellenőrzése"
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_Nézet.."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nem támogatott típusú nyilvános kulcs"
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "Kapcsolódás sikertelen"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr "Nem lehet inicializálni a SILC kliens kapcsolatot"
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr "Kulcscsere elvégzése"
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr "Névtelen"
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Nem lehet inicializálni a SILC protokollt"
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr "A ~/.silc könyvtár nem található vagy nem érhető el"
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Kapcsolódás a SILC kiszolgálóhoz"
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Nem sikerült a SILC kulcspárt betölteni: %s"
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr "Nem hozható létre kapcsolat"
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr "Az Ön jelenlegi hangulata"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+msgid "Normal"
+msgstr "Normál"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr "Szerelmes"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13481,43 +9583,46 @@ msgstr ""
 "\n"
 "Az előnyben részesített kapcsolatfelvételi módszerek"
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr "Videokonferencia"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "Az Ön jelenlegi állapota"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr "Elérhető szolgáltatások"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr "Mások láthatják milyen szolgáltatásokat használ"
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr "Mások láthatják milyen számítógépet használ"
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr "Az Ön VCard fájlja"
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr "Felhasználó online állapotattribútumai"
 
-#: ../libgaim/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/silc.c:739
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -13527,174 +9632,178 @@ msgstr ""
 "személyes információit. Kérem töltse ki azokat az információkat, amelyeket "
 "más felhasználók láthatnak Önről."
 
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "A nap üzenete"
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "Nem érhető el a nap üzenete"
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nincs \"nap üzenete\" hozzárendelve ehhez a kapcsolathoz"
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Új SILC kulcspár létrehozása"
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "A jelmondatok nem egyeznek"
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "A kulcselőállítás meghiúsult"
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Kulcs hossza"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Nyilvános kulcs fájlja"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Személyes kulcs fájlja"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Jelmondat (megerősítés)"
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Kulcspár előállítása"
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Elérhető állapot"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "A nap üzenetének megtekintése"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "SILC kulcspár létrehozása..."
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> felhasználó nincs jelen a hálózatban"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "A téma túl hosszú"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Meg kell adnia egy becenevet"
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "%s csatorna nem található"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "csatorna üzemmódok a következőhöz: %s: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nincsenek csatorna üzemmódok beállítva a következőn: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nem sikerült beállítani a csatorna üzemmódokat a következőhöz: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1534
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Ismeretlen parancs: %s, (talán egy Gaim hiba)"
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Ismeretlen parancs: %s, (talán klienshiba)"
 
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [csatorna]:  A csevegés elhagyása"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [csatorna]:  A csevegés elhagyása"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;új téma&gt;]:  A téma megtekintése vagy módosítása"
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a "
 "hálózaton"
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  Csatornák listázása ezen a hálózaton"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;becenév&gt;:  A becenévhez tartozó információk megjelenítése"
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a "
 "felhasználónak"
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  A kiszolgáló napi üzenetének megjelenítése"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  Ezen folyamat leválasztása"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet "
 "kíséretében"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Egy silc kliensparancs meghívása"
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó "
 "kidobása"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;új becenév&gt;:  A becenevének megváltoztatása"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 "whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak "
 "megjelenítése"
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -13702,7 +9811,7 @@ msgstr ""
 "cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna "
 "üzemmódjainak megjelenítése vagy megváltoztatása"
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -13710,17 +9819,17 @@ msgstr ""
 "cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév "
 "módjainak megváltoztatása a csatornán"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 "umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a "
 "hálózaton"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;becenév&gt; [-pubkey]:  Kiszolgáló-operátori jogok kérése"
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -13728,39 +9837,39 @@ msgstr ""
 "invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó "
 "meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a "
 "csatornáról"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [kiszolgáló]:  A kiszolgáló adminisztrációs részleteinek megjelenítése"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;csatorna&gt; +|-&lt;becenév&gt;]:  Kliens kitiltása a csatornáról"
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános "
 "kulcsának letöltése"
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  A kiszolgáló és a hálózat statisztikáinak megjelenítése"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING küldése a kapcsolódott kiszolgálónak"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;csatorna&gt;:  Egy csatorna felhasználóit listázza ki"
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13777,111 +9886,116 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1816
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokollbővítmény"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1818
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1844 ../pidgin/gtkprefs.c:1920
+msgid "Network"
+msgstr "Hálózat"
+
+#: ../libpurple/protocols/silc/silc.c:1855
 msgid "Public Key file"
 msgstr "Nyilvános kulcs fájlja"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1859
 msgid "Private Key file"
 msgstr "Személyes kulcs fájlja"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1869
 msgid "Cipher"
 msgstr "Titkosító"
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1879
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1882
 msgid "Public key authentication"
 msgstr "Nyilvános kulcs hitelesítése"
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1885
 msgid "Reject watching by other users"
 msgstr "Más felhasználók nem láthatnak"
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1888
 msgid "Block invites"
-msgstr "Meghívások blokkolása"
+msgstr "Meghívások tiltása"
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1891
 msgid "Block IMs without Key Exchange"
-msgstr "Kulcscsere nélküli azonnali üzenetváltások blokkolása"
+msgstr "Kulcscsere nélküli azonnali üzenetváltások tiltása"
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1894
 msgid "Reject online status attribute requests"
 msgstr "Online állapotattribútum-kérések visszautasítása"
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "Block messages to whiteboard"
-msgstr "Üzenetek blokkolása a rajzlapra"
+msgstr "Üzenetek tiltása a rajzlapra"
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Rajzlap automatikus megnyitása"
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "SILC kulcspár létrehozása..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Valódi név: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Felhasználónév: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Kiszolgálónév: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Szervezet: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Ország: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmus: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Kulcs hossza: \t%d bit\n"
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -13892,7 +10006,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -13901,36 +10015,37 @@ msgstr ""
 "Nyilvános kulcs blablakódja:\n"
 "%s"
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Nyilvános kulcs információi"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr "Lapozás"
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferencia"
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "Számítógép"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "Terminál"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s üzenetet küldött a rajzlapra. Meg kívánja nyitni a rajzlapot?"
 
-#: ../libgaim/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -13939,36 +10054,36 @@ msgstr ""
 "%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a "
 "rajzlapot?"
 
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Rajzlap"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libgaim/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Nem sikerült az írás"
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1486
 msgid "Could not connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "Nem sikerült létrehozni a figyelő foglalatot"
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
 msgstr "Nem sikerült a kiszolgáló feloldása"
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
 msgstr "A gépnév nem oldható fel"
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "A SIP felhasználónevek nem tartalmazhatnak szóközt vagy @ szimbólumot"
 
@@ -13980,159 +10095,159 @@ msgstr "A SIP felhasználónevek nem tartalmazhatnak szóközt vagy @ szimbólum
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokollbővítmény"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "A SIP/SIMPLE protokollbővítmény"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Állapot közzététele (megjegyzés: mindenki figyelheti)"
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "UDP használata"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "Proxy használata"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr "Felhasználó hitelesítése"
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr "Tartomány hitelesítése"
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "%s keresése"
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Kapcsolódás sikertelen a következőhöz: %s"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Bejelentkezés: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nem lehet írni a(z) %s fájlba."
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nem lehet olvasni a(z) %s fájlt."
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Az üzenet túl hosszú, az utolsó %s bájt csonkítva."
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s jelenleg nincs bejelentkezve."
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s figyelmeztetése nincs engedélyezve."
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Egy üzenet el lett dobva, Ön túllépte a kiszolgáló átviteli sebességhatárát."
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Nem lehet csevegni a következőben: %s."
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Túl gyorsan küld üzeneteket a következőnek: %s."
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Nem kapott meg egy üzenetet a következőtől: %s, mert az túl nagy volt."
 
-#: ../libgaim/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan "
 "küldte."
 
-#: ../libgaim/protocols/toc/toc.c:518
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Hiba."
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Túl sok találat."
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Több feltétel szükséges."
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Könyvtárszolgáltatás átmenetileg nem érhető el."
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "E-mail keresés korlátozva."
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Kulcsszó figyelmen kívül hagyva."
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Nincsenek kulcsszavak."
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
-msgstr "A felhasználónak nincs könyvtárinformációja."
+msgstr "A felhasználó nem rendelkezik címtár-információkkal."
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Nem támogatott ország."
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Ismeretlen hiba: %s."
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Hibás felhasználónév vagy jelszó."
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "A szolgáltatás átmenetileg nem érhető el."
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez."
 
-#: ../libgaim/protocols/toc/toc.c:558
+#: ../libpurple/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -14140,92 +10255,78 @@ msgstr ""
 "Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha "
 "tovább folytatja, akkor még tovább kell majd várnia."
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ismeretlen bejelentkezési hiba történt: %s."
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Ismeretlen hiba történt: %d. Információ: %s"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Érvénytelen csoportnév"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Kapcsolat lezárva"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Várakozás válaszra..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "A TOC ismét működőképes. Mostantól újra küldhet üzeneteket."
 
-#: ../libgaim/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Jelszó sikeresen megváltoztatva"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr "A TOC egy PAUSE parancsot küldött."
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"Ilyen estben a TOC nem veszi figyelembe a felé küldött üzeneteket, és "
-"kirúghatja, ha újabb üzenetet küld. A Gaim megakadályozza hogy bármi is "
-"átjusson. Ez csak ideiglenes, kérem legyen türelemmel."
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "_Csoport:"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Könyvtárinformációk lekérése"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Könyvtárinformációk beállítása"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s nem nyitható meg írásra!"
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította."
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Az átvitelhez nem sikerült a kapcsolatot létrehozni."
 
-#: ../libgaim/protocols/toc/toc.c:2095
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "A fájl fejlécét nem sikerült kiírni. A fájl nem lesz elküldve."
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - Mentés másként..."
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Mentés másként..."
 
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s kéri %s partnert %d fájl fogadására: %s (%.2f %s)%s%s"
 msgstr[1] "%s kéri %s partnert %d fájl fogadására: %s (%.2f %s)%s%s"
 
-#: ../libgaim/protocols/toc/toc.c:2236
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s egy fájl elküldésére kéri"
@@ -14240,36 +10341,36 @@ msgstr "%s egy fájl elküldésére kéri"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokollbővítmény"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Az Ön Yahoo! üzenete nem lett elküldve."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr "Csiling!!"
+#: ../libpurple/protocols/yahoo/yahoo.c:878
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s egy bökést küldött!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! rendszerüzenet %s számára:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "Hozzáférés elutasítva üzenet:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
 "közé."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -14278,26 +10379,23 @@ msgstr ""
 "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
 "közé, a következő magyarázattal: %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "Partner felvétele megtagadva"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. A Gaim "
-"ezen verziója valószínűleg nem fog tudni sikeresen bejelentkezni. "
-"Ellenőrizze az esetleges frissítéseket itt: %s."
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr "A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. Valószínűleg nem fog tudni sikeresen bejelentkezni. Keressen esetleges frissítéseket a következő helyen: %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! hitelesítés sikertelen"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -14307,165 +10405,153 @@ msgstr ""
 "az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a "
 "felhasználót."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "Mellőzi a partnert?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "A normális hitelesítés sikertelen!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"A normális hitelesítési eljárás sikertelen volt. Ez vagy azt jelenti, hogy a "
-"jelszava helytelen, vagy azt, hogy a Yahoo! hitelesítési sémája "
-"megváltozott. A Gaim most megpróbál bejelentkezni a Web Messenger "
-"hitelesítés használatával, ami csökkentett funkcionalitást és kevesebb "
-"szolgáltatást fog eredményezni."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "A fiókja zárolva van, kérem jelentkezzen be a Yahoo! weboldalára."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán "
 "megoldhatja ezt a problémát."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
 "tartozó kiszolgálóoldali listán."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hallható %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Kapcsolathiba"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "Nem vagyok az asztalnál"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "Nem vagyok a munkahelyemen"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "Nyaralok"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "Kilépett"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr "Belépettként látszik"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "Jelenlét"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "Kilépettként látszik"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne látsszon tartósan kilépettként"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "Csatlakozás a csevegéshez"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "Konferencia kezdeményezése"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "Jelenlét beállításai"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr "Firkálás megkezdése"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "Melyik azonosítót aktiválja?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "Kihez csatlakozik a csevegésben?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "Azonosító aktiválása..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "Felhasználó csatlakoztatása csevegéshez..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
+msgid "You have just sent a Buzz!"
+msgstr "Elküldött egy bökést!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Csatornák listázása a Yahoo hálózatán"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
 
@@ -14479,90 +10565,90 @@ msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indításár
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokollbővítmény"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japán"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "Személyhívó kiszolgáló"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "Japán személyhívó kiszolgáló"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "Személyhívó Port"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "Fájlátviteli kiszolgáló"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "Japán fájlátviteli kiszolgáló"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "Fájlátviteli port"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "Csevegőszoba nyelve"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "Csevegőszobák listájának URL címe"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Yahoo csevegőkiszolgáló"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Yahoo csevegőport"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%"
 "s\"."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Meghívás visszautasítva"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Nem sikerült kapcsolódni a csevegéshez"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Ismeretlen szoba"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Esetleg tele van a szoba"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Nem érhető el"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -14570,68 +10656,68 @@ msgstr ""
 "Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, "
 "mielőtt újra csatlakozhatna a csevegőszobához"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Jelenleg a következőben cseveg: %s."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "Partner csatlakoztatása a csevegéshez sikertelen"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "Lehet, hogy jelenleg nincsenek csevegőszobában?"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr "A szobalista letöltése sikertelen."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr "Hangok"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr "Webkamerák"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr "Nem lehet letölteni a szobalistát."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "Felhasználói szobák"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Firkálási kérés elküldve."
 
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "Nem lehet a fájlleírót létrehozni."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
 msgid "Write Error"
 msgstr "Írási hiba"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profil"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -14639,53 +10725,55 @@ msgstr ""
 "Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt "
 "profilok jelenleg nem támogatottak."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
-msgstr "Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia a böngészőjében:"
+msgstr ""
+"Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia "
+"a böngészőjében:"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! azonosító"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Hobbik"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Legfrissebb hírek"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Honlap"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Érdekes link 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Érdekes link 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Érdekes link 3"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Utolsó frissítés"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s felhasználói információi nem érhetőek el"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -14693,7 +10781,7 @@ msgstr ""
 "Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg "
 "nem támogatott."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -14701,7 +10789,7 @@ msgstr ""
 "A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti "
 "kiszolgálóoldali hiba, kérem próbálja újra később."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -14712,15 +10800,15 @@ msgstr ""
 "felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem "
 "próbálkozzon újra később."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "A felhasználó profilja üres."
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Kapcsolathiba a YCHT kiszolgálóval."
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -14729,7 +10817,7 @@ msgstr ""
 "A kapcsolat elveszett a kiszolgálóval\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -14737,82 +10825,82 @@ msgstr ""
 "(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" "
 "beállításait a Fiókszerkesztőben)"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Nem lehet a(z) %s,%s,%s csevegésbe küldeni"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1203
 msgid "User"
 msgstr "Felhasználó"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1209
 msgid "Hidden or not logged-in"
 msgstr "Láthatatlan vagy nincs bejelentkezve"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1211
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ennél: %s %s óta"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1546
-#: ../libgaim/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1545
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
 msgid "Anyone"
 msgstr "Bárki"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2353
 msgid "_Class:"
 msgstr "_Osztály:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr "_Példány:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr "_Címzett:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "A feliratkozási kísérlet a következőre: %s,%s,%s sikertelen"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2689
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;becenév&gt;: Felhasználó keresése"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2694
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;becenév&gt;: Felhasználó keresése"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2699
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új "
 "csevegéshez"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,"
 "*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -14820,7 +10908,7 @@ msgstr ""
 "zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;"
 "<i>osztály</i>,<i>példány</i>,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14828,7 +10916,7 @@ msgstr ""
 "zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a "
 "következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -14836,17 +10924,17 @@ msgstr ""
 "zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;"
 "ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,"
 "SZEMÉLY,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr "Ismételt feliratkozás"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr "Feliratkozások lekérése a kiszolgálótól"
 
@@ -14860,45 +10948,45 @@ msgstr "Feliratkozások lekérése a kiszolgálótól"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokollbővítmény"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "tzc használata"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "tzc parancs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "Exportálás .anyone-ba"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "Exportálás .zephyr.subs-ba"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "Importálás .anyone-ból"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "Importálás .zephyr.subs-ból"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr "Tartomány"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr "Exportálás"
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -14907,68 +10995,68 @@ msgstr ""
 "Nem lehet létrehozni a foglalatot:\n"
 "%s"
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n"
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "%d HTTP proxy kapcsolathiba"
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
 "d. porton."
 
-#: ../libgaim/proxy.c:984
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "Hiba %s feloldásakor"
 
-#: ../libgaim/proxy.c:1676
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
 msgstr "A gépnév nem oldható fel"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Igen"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Nem"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "Elfog_adás"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Nem vagyok itt"
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "mentett állapotok"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s neve ezentúl %s néven szerepel.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:670
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14977,73 +11065,73 @@ msgstr ""
 "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:675
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:679
 msgid "Accept chat invitation?"
 msgstr "Elfogadja a meghívást a csevegésre?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Visszaállítás"
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:156
 msgid "Unavailable"
 msgstr "Nem érhető el"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s megváltoztatta az állapotát (%s -> %s)"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ezentúl %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s már nem %s"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1288
 #, c-format
 msgid "%s became idle"
 msgstr "%s inaktív lett"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1305
 #, c-format
 msgid "%s became unidle"
 msgstr "%s már nem inaktív"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1371
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s inaktív lett"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1373
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s már nem inaktív"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "Hiba %s olvasásakor"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -15052,62 +11140,62 @@ msgstr ""
 "Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a "
 "régi fájl %s~ néven lett elmentve."
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2980
 msgid "Calculating..."
 msgstr "Számítás..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2983
 msgid "Unknown."
 msgstr "Ismeretlen."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:3009
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d másodperc"
 msgstr[1] "%d másodperc"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:3021
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d nap"
 msgstr[1] "%d nap"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:3029
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d óra"
 msgstr[1] "%s, %d óra"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:3035
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:3043
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d perc"
 msgstr[1] "%s, %d perc"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:3049
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
+#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nem lehet csatlakozni a következőhöz: %s"
 
-#: ../libgaim/util.c:3292
+#: ../libpurple/util.c:3441
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -15116,18 +11204,4189 @@ msgstr ""
 "Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. "
 "Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
 
-#: ../libgaim/util.c:3327
+#: ../libpurple/util.c:3476
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Hiba %s olvasása közben: %s"
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3507
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Hiba %s írása közben: %s"
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nem lehet a következőhöz kapcsolódni: %s: %s"
 
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Azonnali üzenetküldés"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin üzenetküldő"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Azonnali üzenetek küldése több protokoll használatával"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Tájolás"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "A tálca tájolása."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:398
+msgid "Login Options"
+msgstr "Bejelentkezés beállításai"
+
+#: ../pidgin/gtkaccount.c:500
+msgid "Local alias:"
+msgstr "Helyi álnév:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:562
+msgid "User Options"
+msgstr "Felhasználói beállítások"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:580
+msgid "Use this buddy icon for this account:"
+msgstr "Ezen partnerikon használata a fiókhoz:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:700
+#, c-format
+msgid "%s Options"
+msgstr "%s beállításai"
+
+#: ../pidgin/gtkaccount.c:897
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME proxybeállítások használata"
+
+#: ../pidgin/gtkaccount.c:898
+msgid "Use Global Proxy Settings"
+msgstr "Globális proxybeállítások használata"
+
+#: ../pidgin/gtkaccount.c:904
+msgid "No Proxy"
+msgstr "Nincs Proxy"
+
+#: ../pidgin/gtkaccount.c:910
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:916
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:922
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "Környezeti beállítások használata"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:967
+msgid "If you look real closely"
+msgstr "ha igazán közelről nézi"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:970
+msgid "you can see the butterflies mating"
+msgstr "láthatja a pillangók nászát"
+
+#: ../pidgin/gtkaccount.c:991
+msgid "Proxy Options"
+msgstr "Proxy beállításai"
+
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "Proxy _típusa:"
+
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Gépnév:"
+
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../pidgin/gtkaccount.c:1026
+msgid "_Username:"
+msgstr "_Felhasználó:"
+
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "Jel_szó:"
+
+#: ../pidgin/gtkaccount.c:1440
+msgid "Add Account"
+msgstr "Fiók hozzáadása"
+
+#: ../pidgin/gtkaccount.c:1464
+msgid "_Basic"
+msgstr "_Alap"
+
+#: ../pidgin/gtkaccount.c:1475
+msgid "_Advanced"
+msgstr "_Haladó"
+
+#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#: ../pidgin/gtkaccount.c:1975
+msgid "Protocol"
+msgstr "Protokoll"
+
+# fixme: üdvözli a %s az {pidgin | finch} lehet, nemde?
+#: ../pidgin/gtkaccount.c:2169
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
+"\n"
+"Nincsenek beállítva azonnaliüzenő-fiókjai. A %s használatának megkezdéséhez kattintson az alábbi <b>Hozzáadás</b> gombra és állítsa be első fiókját. Ha azt szeretné hogy a %s több fiókhoz csatlakozzon, kattintson újra a <b>Hozzáadás</b> gombra és állítsa be mindet.\n"
+"\n"
+"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, "
+"szerkesztéséhez vagy eltávolításához."
+
+#: ../pidgin/gtkblist.c:722
+msgid "Join a Chat"
+msgstr "Csatlakozás egy csevegéshez"
+
+#: ../pidgin/gtkblist.c:743
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez "
+"csatlakozni kíván.\n"
+
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "F_iók:"
+
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
+msgid "_Block"
+msgstr "_Tiltás"
+
+#: ../pidgin/gtkblist.c:1028
+msgid "Un_block"
+msgstr "_Tiltás feloldása"
+
+#: ../pidgin/gtkblist.c:1079
+msgid "Get _Info"
+msgstr "_Info"
+
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+msgid "I_M"
+msgstr "Ü_zenet"
+
+#: ../pidgin/gtkblist.c:1088
+msgid "_Send File"
+msgstr "_Fájl küldése"
+
+#: ../pidgin/gtkblist.c:1095
+msgid "Add Buddy _Pounce"
+msgstr "_Partnerfigyelmeztetés felvétele"
+
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1204 ../pidgin/gtkblist.c:1227
+msgid "View _Log"
+msgstr "Nap_ló megtekintése"
+
+#: ../pidgin/gtkblist.c:1115
+msgid "Alias..."
+msgstr "Álnév..."
+
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1212
+#: ../pidgin/gtkblist.c:1233
+msgid "_Alias..."
+msgstr "Ál_név..."
+
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1214
+#: ../pidgin/gtkblist.c:1235
+msgid "_Remove"
+msgstr "_Eltávolítás"
+
+#: ../pidgin/gtkblist.c:1175
+msgid "Add a _Buddy"
+msgstr "P_artner felvétele"
+
+#: ../pidgin/gtkblist.c:1177
+msgid "Add a C_hat"
+msgstr "_Csevegés felvétele"
+
+#: ../pidgin/gtkblist.c:1180
+msgid "_Delete Group"
+msgstr "_Csoport törlése"
+
+#: ../pidgin/gtkblist.c:1182
+msgid "_Rename"
+msgstr "Á_tnevezés"
+
+#. join button
+#: ../pidgin/gtkblist.c:1200 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+msgid "_Join"
+msgstr "_Csatlakozás"
+
+#: ../pidgin/gtkblist.c:1202
+msgid "Auto-Join"
+msgstr "Automatikus csatlakozás"
+
+#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1263
+msgid "_Collapse"
+msgstr "Összecs_ukás"
+
+#: ../pidgin/gtkblist.c:1268
+msgid "_Expand"
+msgstr "_Kibontás"
+
+#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1525
+#: ../pidgin/gtkblist.c:4491 ../pidgin/gtkblist.c:4501
+msgid "/Tools/Mute Sounds"
+msgstr "/Eszközök/Hangok némítása"
+
+#: ../pidgin/gtkblist.c:1985 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
+"partnert."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2813
+msgid "/_Buddies"
+msgstr "/_Partnerek"
+
+#: ../pidgin/gtkblist.c:2814
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Partnerek/Új azonnal_i üzenet..."
+
+#: ../pidgin/gtkblist.c:2815
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Partnerek/_Csatlakozás csevegéshez..."
+
+#: ../pidgin/gtkblist.c:2816
+msgid "/Buddies/Get User _Info..."
+msgstr "/Partnerek/_Felhasználó adatainak lekérése..."
+
+#: ../pidgin/gtkblist.c:2817
+msgid "/Buddies/View User _Log..."
+msgstr "/Partnerek/Felhasználó _naplójának lekérése..."
+
+#: ../pidgin/gtkblist.c:2819
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Partnerek/Ki_lépett partnerek megjelenítése"
+
+#: ../pidgin/gtkblist.c:2820
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Partnerek/Ür_es csoportok megjelenítése"
+
+#: ../pidgin/gtkblist.c:2821
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Partnerek/_Partner részleteinek megjelenítése"
+
+#: ../pidgin/gtkblist.c:2822
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Partnerek/Inaktív i_dők megjelenítése"
+
+#: ../pidgin/gtkblist.c:2823
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Partnerek/Part_nerek rendezése"
+
+#: ../pidgin/gtkblist.c:2825
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Partnerek/_Partner felvétele..."
+
+#: ../pidgin/gtkblist.c:2826
+msgid "/Buddies/Add C_hat..."
+msgstr "/Partnerek/Cse_vegés felvétele..."
+
+#: ../pidgin/gtkblist.c:2827
+msgid "/Buddies/Add _Group..."
+msgstr "/Partnerek/C_soport felvétele..."
+
+#: ../pidgin/gtkblist.c:2829
+msgid "/Buddies/_Quit"
+msgstr "/Partnerek/_Kilépés"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2832
+msgid "/_Accounts"
+msgstr "/_Fiókok"
+
+#: ../pidgin/gtkblist.c:2833 ../pidgin/gtkblist.c:6414
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Fiókok/Hozzáadás\\/Szerkesztés"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2836
+msgid "/_Tools"
+msgstr "/_Eszközök"
+
+#: ../pidgin/gtkblist.c:2837
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Eszközök/_Partnerfigyelmeztetések"
+
+#: ../pidgin/gtkblist.c:2838
+msgid "/Tools/Plu_gins"
+msgstr "/Eszközök/Bő_vítmények"
+
+#: ../pidgin/gtkblist.c:2839
+msgid "/Tools/Pr_eferences"
+msgstr "/Eszközök/_Beállítások"
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Tools/Pr_ivacy"
+msgstr "/Eszközök/Ma_gánszféra"
+
+#: ../pidgin/gtkblist.c:2842
+msgid "/Tools/_File Transfers"
+msgstr "/Eszközök/_Fájlátvitelek"
+
+#: ../pidgin/gtkblist.c:2843
+msgid "/Tools/R_oom List"
+msgstr "/Eszközök/_Szobalista"
+
+#: ../pidgin/gtkblist.c:2844
+msgid "/Tools/System _Log"
+msgstr "/Eszközök/_Rendszernapló"
+
+#: ../pidgin/gtkblist.c:2846
+msgid "/Tools/Mute _Sounds"
+msgstr "/Eszközök/_Hangok némítása"
+
+#. Help
+#: ../pidgin/gtkblist.c:2849
+msgid "/_Help"
+msgstr "/_Súgó"
+
+#: ../pidgin/gtkblist.c:2850
+msgid "/Help/Online _Help"
+msgstr "/Súgó/Online _súgó"
+
+#: ../pidgin/gtkblist.c:2851
+msgid "/Help/_Debug Window"
+msgstr "/Súgó/_Hibakereső ablak"
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Help/_About"
+msgstr "/Súgó/_Névjegy"
+
+#: ../pidgin/gtkblist.c:2880
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Fiók:</b> %s"
+
+#: ../pidgin/gtkblist.c:2958
+msgid "Buddy Alias"
+msgstr "Partnerálnév"
+
+#: ../pidgin/gtkblist.c:2979
+msgid "Logged In"
+msgstr "Bejelentkezve"
+
+#: ../pidgin/gtkblist.c:3025
+msgid "Last Seen"
+msgstr "Utoljára látszott"
+
+#: ../pidgin/gtkblist.c:3045
+msgid "Spooky"
+msgstr "Idegroncs"
+
+#: ../pidgin/gtkblist.c:3047
+msgid "Awesome"
+msgstr "Szuper"
+
+#: ../pidgin/gtkblist.c:3049
+msgid "Rockin'"
+msgstr "Király"
+
+#: ../pidgin/gtkblist.c:3374
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Inaktív (%d ó %02d p)"
+
+#: ../pidgin/gtkblist.c:3376
+#, c-format
+msgid "Idle %dm"
+msgstr "Inaktív (%d p)"
+
+#: ../pidgin/gtkblist.c:3513
+msgid "/Buddies/New Instant Message..."
+msgstr "/Partnerek/Új azonnali üzenet..."
+
+#: ../pidgin/gtkblist.c:3514 ../pidgin/gtkblist.c:3547
+msgid "/Buddies/Join a Chat..."
+msgstr "/Partnerek/Csatlakozás csevegéshez..."
+
+#: ../pidgin/gtkblist.c:3515
+msgid "/Buddies/Get User Info..."
+msgstr "/Partnerek/Felhasználó adatainak lekérése..."
+
+#: ../pidgin/gtkblist.c:3516
+msgid "/Buddies/Add Buddy..."
+msgstr "/Partnerek/Partner felvétele..."
+
+#: ../pidgin/gtkblist.c:3517 ../pidgin/gtkblist.c:3550
+msgid "/Buddies/Add Chat..."
+msgstr "/Partnerek/Csevegés felvétele..."
+
+#: ../pidgin/gtkblist.c:3518
+msgid "/Buddies/Add Group..."
+msgstr "/Partnerek/Csoport felvétele..."
+
+#: ../pidgin/gtkblist.c:3553
+msgid "/Tools/Buddy Pounces"
+msgstr "/Eszközök/Partnerfigyelmeztetések"
+
+#: ../pidgin/gtkblist.c:3556
+msgid "/Tools/Privacy"
+msgstr "/Eszközök/Magánszféra"
+
+#: ../pidgin/gtkblist.c:3559
+msgid "/Tools/Room List"
+msgstr "/Eszközök/Szobalista"
+
+#: ../pidgin/gtkblist.c:3656 ../pidgin/gtkdocklet.c:156
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d olvasatlan üzenet %s partnertől\n"
+msgstr[1] "%d olvasatlan üzenet %s partnertől\n"
+
+#: ../pidgin/gtkblist.c:3733
+msgid "Manually"
+msgstr "Kézi"
+
+#: ../pidgin/gtkblist.c:3735
+msgid "Alphabetically"
+msgstr "ABC sorrend"
+
+#: ../pidgin/gtkblist.c:3736
+msgid "By status"
+msgstr "Állapot szerint"
+
+#: ../pidgin/gtkblist.c:3737
+msgid "By log size"
+msgstr "Napló mérete szerint"
+
+#: ../pidgin/gtkblist.c:3939 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s bontotta a kapcsolatot"
+
+#: ../pidgin/gtkblist.c:3949
+msgid "Re-enable Account"
+msgstr "Fiók újraengedélyezése"
+
+#: ../pidgin/gtkblist.c:3970
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s bontotta a kapcsolatot: %s</span>"
+
+#: ../pidgin/gtkblist.c:4123
+msgid "<b>Username:</b>"
+msgstr "<b>Felhasználónév:</b>"
+
+#: ../pidgin/gtkblist.c:4130
+msgid "<b>Password:</b>"
+msgstr "<b>Jelszó:</b>"
+
+#: ../pidgin/gtkblist.c:4141
+msgid "_Login"
+msgstr "_Bejelentkezés"
+
+#: ../pidgin/gtkblist.c:4226
+msgid "/Accounts"
+msgstr "/Fiókok"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4240
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
+"\n"
+"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/"
+"Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő "
+"fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát "
+"és cseveghet barátaival."
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4485
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Partnerek/Kilépett partnerek megjelenítése"
+
+#: ../pidgin/gtkblist.c:4488
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Partnerek/Üres csoportok megjelenítése"
+
+#: ../pidgin/gtkblist.c:4494
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Partnerek/Partner részleteinek megjelenítése"
+
+#: ../pidgin/gtkblist.c:4497
+msgid "/Buddies/Show Idle Times"
+msgstr "/Partnerek/Inaktivitási idők megjelenítése"
+
+#: ../pidgin/gtkblist.c:5335
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat "
+"egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett "
+"kerül megjelenítésre, amennyiben az lehetséges.\n"
+
+#: ../pidgin/gtkblist.c:5395 ../pidgin/gtkblist.c:5756
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Csoport:"
+
+#: ../pidgin/gtkblist.c:5654
+msgid "This protocol does not support chat rooms."
+msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
+
+#: ../pidgin/gtkblist.c:5670
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas "
+"lenne."
+
+#: ../pidgin/gtkblist.c:5711
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni "
+"kívánt csevegésről.\n"
+
+#: ../pidgin/gtkblist.c:5794
+msgid "Please enter the name of the group to be added."
+msgstr "Kérem adja meg a felvenni kívánt csoport nevét."
+
+#: ../pidgin/gtkblist.c:6434
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Fiókok/"
+
+#: ../pidgin/gtkblist.c:6458
+msgid "_Edit Account"
+msgstr "_Fiók szerkesztése"
+
+#: ../pidgin/gtkblist.c:6471 ../pidgin/gtkconv.c:2900
+msgid "No actions available"
+msgstr "Nem állnak rendelkezésre műveletek"
+
+#: ../pidgin/gtkblist.c:6479
+msgid "_Disable"
+msgstr "_Tiltás"
+
+#: ../pidgin/gtkblist.c:6491
+msgid "Enable Account"
+msgstr "Fiók engedélyezése"
+
+#: ../pidgin/gtkblist.c:6497
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Fiókok/Fiók engedélyezése"
+
+#: ../pidgin/gtkblist.c:6546
+msgid "/Tools"
+msgstr "/Eszközök"
+
+#: ../pidgin/gtkblist.c:6616
+msgid "/Buddies/Sort Buddies"
+msgstr "/Partnerek/Partnerek rendezése"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a "
+"hibát és nem engedélyezi újra a fiókot."
+
+#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "A partner nem ugyanazt a protokollt használja, mint ez a csevegés"
+
+#: ../pidgin/gtkconv.c:802
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
+"partnert."
+
+#: ../pidgin/gtkconv.c:855
+msgid "Invite Buddy Into Chat Room"
+msgstr "Partner meghívása a csevegőszobába"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:885
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
+"tetszőleges meghívóüzenettel együtt."
+
+#: ../pidgin/gtkconv.c:906
+msgid "_Buddy:"
+msgstr "_Partner:"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
+msgid "_Message:"
+msgstr "Ü_zenet:"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Nem lehet megnyitni a fájlt."
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Társalgás %s partnerrel</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "Társalgás mentése"
+
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+msgid "Find"
+msgstr "Keresés"
+
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "Kere_sés:"
+
+#: ../pidgin/gtkconv.c:1340
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
+
+#: ../pidgin/gtkconv.c:1348
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
+
+#: ../pidgin/gtkconv.c:1596
+msgid "Un-Ignore"
+msgstr "Mellőzés visszavonása"
+
+#: ../pidgin/gtkconv.c:1599
+msgid "Ignore"
+msgstr "Mellőzés"
+
+#: ../pidgin/gtkconv.c:1619
+msgid "Get Away Message"
+msgstr "Távollét üzenet lekérdezése"
+
+#: ../pidgin/gtkconv.c:1642
+msgid "Last said"
+msgstr "Utoljára ezt mondta"
+
+#: ../pidgin/gtkconv.c:2484
+msgid "Unable to save icon file to disk."
+msgstr "Nem menthető lemezre az ikonfájl."
+
+#: ../pidgin/gtkconv.c:2535
+msgid "Save Icon"
+msgstr "Ikon mentése"
+
+#: ../pidgin/gtkconv.c:2587
+msgid "Animate"
+msgstr "Animálás"
+
+#: ../pidgin/gtkconv.c:2592
+msgid "Hide Icon"
+msgstr "Ikon elrejtése"
+
+#: ../pidgin/gtkconv.c:2595
+msgid "Save Icon As..."
+msgstr "Ikon mentése másként..."
+
+#: ../pidgin/gtkconv.c:2599
+msgid "Set Custom Icon..."
+msgstr "Egyéni ikon beállítása..."
+
+#: ../pidgin/gtkconv.c:2612
+msgid "Remove Custom Icon"
+msgstr "Egyéni ikon eltávolítása"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2754
+msgid "/_Conversation"
+msgstr "/_Társalgás"
+
+#: ../pidgin/gtkconv.c:2756
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Társalgás/Új azonnali ü_zenet..."
+
+#: ../pidgin/gtkconv.c:2761
+msgid "/Conversation/_Find..."
+msgstr "/Társalgás/Ker_esés..."
+
+#: ../pidgin/gtkconv.c:2763
+msgid "/Conversation/View _Log"
+msgstr "/Társalgás/Nap_ló megtekintése"
+
+#: ../pidgin/gtkconv.c:2764
+msgid "/Conversation/_Save As..."
+msgstr "/Társalgás/_Mentés másként..."
+
+#: ../pidgin/gtkconv.c:2766
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Társalgás/Elő_zmények törlése"
+
+#: ../pidgin/gtkconv.c:2770
+msgid "/Conversation/Se_nd File..."
+msgstr "/Társalgás/Fájl kül_dése..."
+
+#: ../pidgin/gtkconv.c:2771
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele..."
+
+#: ../pidgin/gtkconv.c:2773
+msgid "/Conversation/_Get Info"
+msgstr "/Társalgás/_Információ lekérése"
+
+#: ../pidgin/gtkconv.c:2775
+msgid "/Conversation/In_vite..."
+msgstr "/Társalgás/Me_ghívás..."
+
+#: ../pidgin/gtkconv.c:2777
+msgid "/Conversation/M_ore"
+msgstr "/Társalgás/_Több"
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/Al_ias..."
+msgstr "/Társalgás/Ál_név..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/_Block..."
+msgstr "/Társalgás/_Tiltás..."
+
+#: ../pidgin/gtkconv.c:2785
+msgid "/Conversation/_Unblock..."
+msgstr "/Társalgás/_Tiltás feloldása..."
+
+#: ../pidgin/gtkconv.c:2787
+msgid "/Conversation/_Add..."
+msgstr "/Társalgás/_Hozzáadás..."
+
+#: ../pidgin/gtkconv.c:2789
+msgid "/Conversation/_Remove..."
+msgstr "/Társalgás/_Eltávolítás..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/_Close"
+msgstr "/Társalgás/_Bezárás"
+
+#. Options
+#: ../pidgin/gtkconv.c:2798
+msgid "/_Options"
+msgstr "/_Beállítások"
+
+#: ../pidgin/gtkconv.c:2799
+msgid "/Options/Enable _Logging"
+msgstr "/Beállítások/_Naplózás engedélyezése"
+
+#: ../pidgin/gtkconv.c:2800
+msgid "/Options/Enable _Sounds"
+msgstr "/Beállítások/_Hangok engedélyezése"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Beállítások/_Partnerikonok megjelenítése"
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Beállítások/_Formázás eszköztárak mutatása"
+
+#: ../pidgin/gtkconv.c:2804
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Beállítások/I_dőbélyegek mutatása"
+
+#: ../pidgin/gtkconv.c:2879
+msgid "/Conversation/More"
+msgstr "/Társalgás/Több"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+msgid "/Conversation"
+msgstr "/Társalgás"
+
+#: ../pidgin/gtkconv.c:2964
+msgid "/Conversation/View Log"
+msgstr "/Társalgás/Napló megtekintése"
+
+#: ../pidgin/gtkconv.c:2970
+msgid "/Conversation/Send File..."
+msgstr "/Társalgás/Fájl küldése..."
+
+#: ../pidgin/gtkconv.c:2974
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Társalgás/Partnerfigyelmeztetés felvétele..."
+
+#: ../pidgin/gtkconv.c:2980
+msgid "/Conversation/Get Info"
+msgstr "/Társalgás/Információ lekérése"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/Invite..."
+msgstr "/Társalgás/Meghívás..."
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Alias..."
+msgstr "/Társalgás/Álnév..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Block..."
+msgstr "/Társalgás/Tiltás..."
+
+#: ../pidgin/gtkconv.c:2998
+msgid "/Conversation/Unblock..."
+msgstr "/Társalgás/Tiltás feloldása..."
+
+#: ../pidgin/gtkconv.c:3002
+msgid "/Conversation/Add..."
+msgstr "/Társalgás/Hozzáadás..."
+
+#: ../pidgin/gtkconv.c:3006
+msgid "/Conversation/Remove..."
+msgstr "/Társalgás/Eltávolítás..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Options/Enable Logging"
+msgstr "/Beállítások/Naplózás engedélyezése"
+
+#: ../pidgin/gtkconv.c:3013
+msgid "/Options/Enable Sounds"
+msgstr "/Beállítások/Hangok engedélyezése"
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Beállítások/Formázás eszköztárak mutatása"
+
+#: ../pidgin/gtkconv.c:3029
+msgid "/Options/Show Timestamps"
+msgstr "/Beállítások/Időbélyegek mutatása"
+
+#: ../pidgin/gtkconv.c:3032
+msgid "/Options/Show Buddy Icon"
+msgstr "/Beállítások/Partnerikon megjelenítése"
+
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+msgid "User is typing..."
+msgstr "A felhasználó gépel..."
+
+#: ../pidgin/gtkconv.c:3159
+msgid "User has typed something and stopped"
+msgstr "A felhasználó gépelt valamit és megállt"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3341
+msgid "_Send To"
+msgstr "_Küldés mint"
+
+#: ../pidgin/gtkconv.c:4049
+msgid "_Send"
+msgstr "_Küldés"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4197
+msgid "0 people in room"
+msgstr "0 személy tartózkodik a szobában"
+
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d személy van a szobában"
+msgstr[1] "%d személy van a szobában"
+
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+msgid "Typing"
+msgstr "Gépel"
+
+#: ../pidgin/gtkconv.c:6054
+msgid "Stopped Typing"
+msgstr "Abbahagyta a gépelést"
+
+#: ../pidgin/gtkconv.c:6059
+msgid "Nick Said"
+msgstr "Becenév kimondva"
+
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:509
+msgid "Unread Messages"
+msgstr "Olvasatlan üzenetek"
+
+#: ../pidgin/gtkconv.c:6069
+msgid "New Event"
+msgstr "Új esemény"
+
+#: ../pidgin/gtkconv.c:7196
+msgid "Confirm close"
+msgstr "Bezárás jóváhagyása"
+
+#: ../pidgin/gtkconv.c:7228
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Olvasatlan üzenetei vannak. Biztos, hogy bezárja az ablakot?"
+
+#: ../pidgin/gtkconv.c:7763
+msgid "Close other tabs"
+msgstr "Más lapok bezárása"
+
+#: ../pidgin/gtkconv.c:7769
+msgid "Close all tabs"
+msgstr "Minden lap bezárása"
+
+#: ../pidgin/gtkconv.c:7777
+msgid "Detach this tab"
+msgstr "Ezen lap leválasztása"
+
+#: ../pidgin/gtkconv.c:7783
+msgid "Close this tab"
+msgstr "Ezen lap bezárása"
+
+#: ../pidgin/gtkconv.c:8086
+msgid "Close conversation"
+msgstr "Társalgás bezárása"
+
+#: ../pidgin/gtkconv.c:8550
+msgid "Last created window"
+msgstr "Utoljára létrehozott ablak"
+
+#: ../pidgin/gtkconv.c:8552
+msgid "Separate IM and Chat windows"
+msgstr "Üzenő- és csevegőablakok elkülönítése"
+
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Új ablak"
+
+#: ../pidgin/gtkconv.c:8556
+msgid "By group"
+msgstr "Csoport szerint"
+
+#: ../pidgin/gtkconv.c:8558
+msgid "By account"
+msgstr "Fiók szerint"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Hibakereső napló mentése"
+
+#: ../pidgin/gtkdebug.c:596
+msgid "Invert"
+msgstr "Invertálás"
+
+#: ../pidgin/gtkdebug.c:599
+msgid "Highlight matches"
+msgstr "Találatok kiemelése"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Icon Only"
+msgstr "Csak i_kon"
+
+#: ../pidgin/gtkdebug.c:667
+msgid "_Text Only"
+msgstr "Csak s_zöveg"
+
+#: ../pidgin/gtkdebug.c:668
+msgid "_Both Icon & Text"
+msgstr "Ik_on és szöveg"
+
+#: ../pidgin/gtkdebug.c:804
+msgid "Filter"
+msgstr "Szűrő"
+
+#: ../pidgin/gtkdebug.c:823
+msgid "Right click for more options."
+msgstr "Kattintson a jobb egérgombbal további beállításokért."
+
+#: ../pidgin/gtkdebug.c:853
+msgid "Level "
+msgstr "Szint: "
+
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+msgid "Select the debug filter level."
+msgstr "Válassza ki a hibakeresési szűrő szintjét."
+
+#: ../pidgin/gtkdebug.c:862
+msgid "All"
+msgstr "Minden"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Misc"
+msgstr "Egyéb"
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
+#: ../pidgin/gtkdebug.c:866
+msgid "Error "
+msgstr "Hiba "
+
+#: ../pidgin/gtkdebug.c:867
+msgid "Fatal Error"
+msgstr "Végzetes hiba"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+msgid "lead developer"
+msgstr "vezető fejlesztő"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
+msgid "developer"
+msgstr "fejlesztő"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "fejlesztő és webmester"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support"
+msgstr "támogató"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support/QA"
+msgstr "támogató/QA"
+
+#: ../pidgin/gtkdialogs.c:109
+msgid "win32 port"
+msgstr "win32 portolás"
+
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+msgid "maintainer"
+msgstr "karbantartó"
+
+#: ../pidgin/gtkdialogs.c:112
+msgid "libfaim maintainer"
+msgstr "libfaim karbantartó"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:114
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker és kijelölt vezető"
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "Jabber developer"
+msgstr "Jabber fejlesztő"
+
+#: ../pidgin/gtkdialogs.c:116
+msgid "original author"
+msgstr "eredeti szerző"
+
+#: ../pidgin/gtkdialogs.c:123
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../pidgin/gtkdialogs.c:124
+msgid "Arabic"
+msgstr "Arab"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "Bolgár"
+
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+msgid "Bengali"
+msgstr "Bengáli"
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "Bosnian"
+msgstr "Bosnyák"
+
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+msgid "Catalan"
+msgstr "Katalán"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+msgid "Valencian-Catalan"
+msgstr "Valenciai katalán"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+msgid "Czech"
+msgstr "Cseh"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+msgid "Danish"
+msgstr "Dán"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "Német"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
+msgid "Dzongkha"
+msgstr "Dzongkha"
+
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+msgid "Greek"
+msgstr "Görög"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "Ausztrál angol"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "Kanadai angol"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "Brit angol"
+
+#: ../pidgin/gtkdialogs.c:148
+msgid "Esperanto"
+msgstr "Eszperantó"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Spanish"
+msgstr "Spanyol"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+msgid "Euskera(Basque)"
+msgstr "Baszk"
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+msgid "Persian"
+msgstr "Perzsa"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "Finnish"
+msgstr "Finn"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+msgid "French"
+msgstr "Francia"
+
+#: ../pidgin/gtkdialogs.c:157
+msgid "Galician"
+msgstr "Galíciai"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+msgid "Gujarati"
+msgstr "Gudzsarati"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+msgid "Hebrew"
+msgstr "Héber"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../pidgin/gtkdialogs.c:162
+msgid "Hungarian"
+msgstr "Magyar"
+
+#: ../pidgin/gtkdialogs.c:163
+msgid "Indonesian"
+msgstr "Indonéz"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Italian"
+msgstr "Olasz"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+msgid "Japanese"
+msgstr "Japán"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+msgid "Georgian"
+msgstr "Grúz"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+msgid "Korean"
+msgstr "Koreai"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
+msgid "Kurdish"
+msgstr "Kurd"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Lithuanian"
+msgstr "Litván"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Macedonian"
+msgstr "Macedón"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "Norvég Bokmål"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "Nepáli"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Dutch, Flemish"
+msgstr "Holland, flamand"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Norwegian"
+msgstr "Norvég"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+msgid "Polish"
+msgstr "Lengyel"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Portuguese"
+msgstr "Portugál"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "Brazil portugál"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr "Pastu"
+
+#: ../pidgin/gtkdialogs.c:184
+msgid "Romanian"
+msgstr "Román"
+
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Russian"
+msgstr "Orosz"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
+msgid "Slovak"
+msgstr "Szlovák"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+msgid "Slovenian"
+msgstr "Szlovén"
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Albanian"
+msgstr "Albán"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+msgid "Serbian"
+msgstr "Szerb"
+
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+msgid "Swedish"
+msgstr "Svéd"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "Thai"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "Török"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "Vietnami"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh és a Gnome-Vi csapat"
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+msgid "Simplified Chinese"
+msgstr "Egyszerűsített kínai"
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Hongkongi kínai"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
+msgid "Traditional Chinese"
+msgstr "Hagyományos kínai"
+
+#: ../pidgin/gtkdialogs.c:208
+msgid "Amharic"
+msgstr "Amhara"
+
+#: ../pidgin/gtkdialogs.c:327
+#, c-format
+msgid "About %s"
+msgstr "A %s névjegye"
+
+#: ../pidgin/gtkdialogs.c:363
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr ""
+"A %s egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
+"SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
+"Gadu és QQ protokollok egyidejű használatának képességével. A Gtk+ "
+"használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot "
+"terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában "
+"foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett "
+"\"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek "
+"teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk "
+"garanciát.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:378
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 az irc.freenode.net hálózaton<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin az irc.freenode.net hálózaton<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:387
+msgid "Current Developers"
+msgstr "Jelenlegi fejlesztők"
+
+#: ../pidgin/gtkdialogs.c:402
+msgid "Crazy Patch Writers"
+msgstr "Őrült patch szerzők"
+
+#: ../pidgin/gtkdialogs.c:417
+msgid "Retired Developers"
+msgstr "Visszavonult fejlesztők"
+
+#: ../pidgin/gtkdialogs.c:432
+msgid "Artists"
+msgstr "Grafikusok"
+
+#: ../pidgin/gtkdialogs.c:447
+msgid "Current Translators"
+msgstr "Jelenlegi fordítók"
+
+#: ../pidgin/gtkdialogs.c:467
+msgid "Past Translators"
+msgstr "Korábbi fordítók"
+
+#: ../pidgin/gtkdialogs.c:485
+msgid "Debugging Information"
+msgstr "Hibakeresési információk"
+
+#: ../pidgin/gtkdialogs.c:854
+msgid "Get User Info"
+msgstr "Felhasználó adatainak lekérése"
+
+#: ../pidgin/gtkdialogs.c:856
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg "
+"szeretné tekinteni."
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "Felhasználó naplójának lekérése"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg "
+"szeretné tekinteni."
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Alias Contact"
+msgstr "Kapcsolat álneve"
+
+#: ../pidgin/gtkdialogs.c:969
+msgid "Enter an alias for this contact."
+msgstr "Adjon meg egy álnevet ehhez a kapcsolathoz."
+
+#: ../pidgin/gtkdialogs.c:991
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Adjon meg egy álnevet %s számára."
+
+#: ../pidgin/gtkdialogs.c:993
+msgid "Alias Buddy"
+msgstr "Partner álneve"
+
+#: ../pidgin/gtkdialogs.c:1014
+msgid "Alias Chat"
+msgstr "Csevegés álneve"
+
+#: ../pidgin/gtkdialogs.c:1015
+msgid "Enter an alias for this chat."
+msgstr "Adjon meg egy álnevet ehhez a csevegéshez."
+
+#: ../pidgin/gtkdialogs.c:1054
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
+msgstr[1] ""
+"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1062
+msgid "Remove Contact"
+msgstr "Kapcsolat eltávolítása"
+
+#: ../pidgin/gtkdialogs.c:1065
+msgid "_Remove Contact"
+msgstr "_Kapcsolat eltávolítása"
+
+#: ../pidgin/gtkdialogs.c:1096
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. "
+"Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1103
+msgid "Merge Groups"
+msgstr "Csoportok összefésülése"
+
+#: ../pidgin/gtkdialogs.c:1106
+msgid "_Merge Groups"
+msgstr "_Csoportok összefésülése"
+
+#: ../pidgin/gtkdialogs.c:1156
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"A(z) %s csoport és annak összes tagja eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1159
+msgid "Remove Group"
+msgstr "Csoport törlése"
+
+#: ../pidgin/gtkdialogs.c:1162
+msgid "_Remove Group"
+msgstr "_Csoport eltávolítása"
+
+#: ../pidgin/gtkdialogs.c:1195
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "%s eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1198
+msgid "Remove Buddy"
+msgstr "Partner törlése"
+
+#: ../pidgin/gtkdialogs.c:1201
+msgid "_Remove Buddy"
+msgstr "Partner _törlése"
+
+#: ../pidgin/gtkdialogs.c:1222
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1225
+msgid "Remove Chat"
+msgstr "Csevegés eltávolítása"
+
+#: ../pidgin/gtkdialogs.c:1228
+msgid "_Remove Chat"
+msgstr "_Csevegés eltávolítása"
+
+#: ../pidgin/gtkdocklet.c:153
+msgid "Right-click for more unread messages...\n"
+msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal...\n"
+
+#: ../pidgin/gtkdocklet.c:452
+msgid "Change Status"
+msgstr "Állapot megváltoztatása"
+
+#: ../pidgin/gtkdocklet.c:504
+msgid "Show Buddy List"
+msgstr "Partnerlista mutatása"
+
+#: ../pidgin/gtkdocklet.c:530
+msgid "New Message..."
+msgstr "Új üzenet..."
+
+#: ../pidgin/gtkdocklet.c:545
+msgid "Mute Sounds"
+msgstr "Hangok némítása"
+
+#: ../pidgin/gtkdocklet.c:552
+msgid "Blink on new message"
+msgstr "Villogjon új üzenetkor"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:563
+msgid "Quit"
+msgstr "Kilépés"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Nem indult el"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Fogadás mint:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Fogadás partnertől:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Küldés partnernek:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Küldés mint:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "Nincs alkalmazás beállítva az ilyen típusú fájlok megnyitására."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Hiba történt a fájl megnyitása közben."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Hiba %s indításakor: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Hiba %s futtatásakor"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "A folyamat a következő hibakóddal tért vissza: %d"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Fájlnév:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Helyi fájl:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Sebesség:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Eltelt idő:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Hátralévő idő:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "Ezen _ablak bezárása az összes átvitel befejeződésekor"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "B_efejezett átvitelek törlése"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "Fájlát_vitel részletei"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+msgid "_Pause"
+msgstr "_Szünet"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "_Folytatás"
+
+#: ../pidgin/gtkimhtml.c:792
+msgid "Paste as Plain _Text"
+msgstr "Beillesztés egyszerű szö_vegként"
+
+#: ../pidgin/gtkimhtml.c:809
+msgid "_Reset formatting"
+msgstr "F_ormázás törlése"
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "Hiperhivatkozás színe"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "Hiperhivatkozások rajzolásához használt szín."
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr "Hiperhivatkozás előfényszíne"
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Hiperhivatkozások rajzolásához használt szín, amikor az egér rájuk mutat."
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "E-mail cím _másolása"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "Hivatk_ozás megnyitása böngészőben"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "_Hivatkozás helyének másolása"
+
+#: ../pidgin/gtkimhtml.c:3202
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Ismeretlen fájltípus</span>\n"
+"\n"
+"Alapértelmezett PNG használata."
+
+#: ../pidgin/gtkimhtml.c:3205
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Ismeretlen fájltípus\n"
+"\n"
+"Alapértelmezett PNG használata."
+
+#: ../pidgin/gtkimhtml.c:3218
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Hiba a kép mentése közben</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3221
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Hiba a kép mentése közben\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+msgid "Save Image"
+msgstr "Kép mentése"
+
+#: ../pidgin/gtkimhtml.c:3341
+msgid "_Save Image..."
+msgstr "Kép menté_se..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "Betűkészlet kiválasztása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "Szöveg színének kiválasztása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "Háttérszín kiválasztása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "_Leírás"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás "
+"opcionális."
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét."
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "Hivatkozás beszúrása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "_Beszúrás"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "A kép tárolása nem sikerült: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Kép beszúrása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Ehhez a témához nem állnak rendelkezésre hangulatjelek."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Hangulatjel választása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Félkövér"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Dőlt"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Aláhúzott"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Nagyobb betűméret"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Kisebb betűméret"
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Betűkészlet"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Betűszín"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Háttérszín"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Formázás törlése"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Hivatkozás beszúrása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Kép beszúrása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Hangulatjel beszúrása"
+
+#: ../pidgin/gtklog.c:267
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr "Biztos, hogy törölni akarja a(z) %s partnerrel folytatott, %s időpontban kezdődött beszélgetés naplóját?"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban kezdődött beszélgetés naplóját?"
+
+#: ../pidgin/gtklog.c:283
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
+
+#: ../pidgin/gtklog.c:427
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Társalgás itt: %s, ekkor: %s</span>"
+
+#: ../pidgin/gtklog.c:430
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Társalgás ezzel: %s, ekkor: %s</span>"
+
+#: ../pidgin/gtklog.c:477
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: ../pidgin/gtklog.c:524
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes "
+"állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
+
+#: ../pidgin/gtklog.c:528
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali "
+"üzenet naplózása\" tulajdonság be van állítva."
+
+#: ../pidgin/gtklog.c:531
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása"
+"\" tulajdonság be van állítva."
+
+#: ../pidgin/gtklog.c:535
+msgid "No logs were found"
+msgstr "Nem találhatók naplók"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:550
+msgid "_Browse logs folder"
+msgstr "A _naplómappa böngészése"
+
+#: ../pidgin/gtklog.c:614
+msgid "Total log size:"
+msgstr "Teljes naplóméret:"
+
+#: ../pidgin/gtklog.c:683
+#, c-format
+msgid "Conversations in %s"
+msgstr "Társalgások ezen: %s"
+
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#, c-format
+msgid "Conversations with %s"
+msgstr "Társalgások a következővel: %s"
+
+#: ../pidgin/gtklog.c:778
+msgid "System Log"
+msgstr "Rendszernapló"
+
+#: ../pidgin/gtkmain.c:372
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Próbálja a \"%s -h\" parancsot további információkért.\n"
+
+#: ../pidgin/gtkmain.c:374
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Használat: %s [KAPCSOLÓ]...\n"
+"\n"
+"  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
+"  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
+"  -h, --help          ezen súgó megjelenítése és kilépés\n"
+"  -n, --nologin       ne jelentkezzen be automatikusan\n"
+"  -l, --login[=NÉV]   automatikus bejelentkezés (a NÉV paraméter megadja a\n"
+"                      használandó fiókok vesszőkkel tagolt listáját)\n"
+"  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
+
+#: ../pidgin/gtkmain.c:497
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the Pidgin\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"A %s összeomlott és megpróbált kiírni egy magfájlt.\n"
+"Ez a szoftver és nem az Ön hibája miatt történt.\n"
+"\n"
+"Ha ismételten elő tudja állítani az összeomlást, akkor\n"
+"értesítse a Pidgin fejlesztőit a következő címen:\n"
+"%sbug.php\n"
+"\n"
+"Győződjön meg róla, hogy megadta, mit csinált az összeomlás előtt,\n"
+"és küldje be a visszakövetésből származó magfájlt. Ha nem tudja, hogyan\n"
+"szerezze be a visszakövetést, akkor olvassa el a következő címen található\n"
+"utasításokat:\n"
+"%sgdb.php\n"
+"\n"
+"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (angolul)\n"
+"SeanEgn-nak vagy LSchiere-nek. Sean és Luke kapcsolatinformációi más\n"
+"protokollokhoz elérhetők a következő oldalon:\n"
+"%scontactinfo.php\n"
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "Összes üzenet megnyitása"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Levele érkezett!</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "Feladó"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s %d új üzenetet kapott."
+msgstr[1] "%s %d új üzenetet kapott."
+
+#: ../pidgin/gtknotify.c:520
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] "<b>%d új e-mailje érkezett.</b>"
+msgstr[1] "<b>%d új e-mailje érkezett.</b>"
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "A(z) \"%s\" böngészőparancs érvénytelen."
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "Az URL megnyitása sikertelen"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Hiba \"%s\" indításakor: %s"
+
+#: ../pidgin/gtknotify.c:1065
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "A \"Kézi\" böngészőparancsot választotta, de nem adott meg parancsot."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "A következő bővítmények lesznek eltávolítva."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Több bővítmény lesz eltávolítva."
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "Bővítmények eltávolítása"
+
+#: ../pidgin/gtkplugin.c:399
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Írta:</span>\t%s\n"
+"<span weight=\"bold\">Webcím:</span>\t\t%s\n"
+"<span weight=\"bold\">Fájlnév:</span>\t\t%s"
+
+#: ../pidgin/gtkplugin.c:409
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Hiba: %s\n"
+"Keressen frissítést a bővítmény webhelyén.</span>"
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "Bő_vítmény beállítása"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Bővítmény részletei</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Fájl kiválasztása"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:524
+msgid "Pounce on Whom"
+msgstr "Kinél figyelmeztet"
+
+#: ../pidgin/gtkpounce.c:551
+msgid "_Buddy name:"
+msgstr "_Partner neve:"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Si_gns on"
+msgstr "Be_jelentkezik"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Signs o_ff"
+msgstr "_Kijelentkezik"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Goes a_way"
+msgstr "A partner _elmegy"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "Visszaté_r távollétből"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Becomes _idle"
+msgstr "_Inaktív lesz"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Is no longer i_dle"
+msgstr "_Már nem inaktív"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "Starts _typing"
+msgstr "Elkez_d gépelni"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "P_auses while typing"
+msgstr "_Felfüggeszti a gépelést"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "_Abbahagyja a gépelést"
+
+#: ../pidgin/gtkpounce.c:603
+msgid "Sends a _message"
+msgstr "Ü_zenetet küld"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "Ope_n an IM window"
+msgstr "Azonnali üzenőablak _megnyitása"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "_Pop up a notification"
+msgstr "Értesítés _megjelenítése"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "Send a _message"
+msgstr "Ü_zenet küldése"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "E_xecute a command"
+msgstr "Paran_cs végrehajtása"
+
+#: ../pidgin/gtkpounce.c:654
+msgid "P_lay a sound"
+msgstr "Hang _lejátszása"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Brows_e..."
+msgstr "_Tallózás..."
+
+#: ../pidgin/gtkpounce.c:661
+msgid "Br_owse..."
+msgstr "_Tallózás..."
+
+#: ../pidgin/gtkpounce.c:662
+msgid "Pre_view"
+msgstr "_Előnézet"
+
+#: ../pidgin/gtkpounce.c:786
+msgid "P_ounce only when my status is not available"
+msgstr "_Csak akkor figyelmeztet, ha az állapotom nem érhető el"
+
+#: ../pidgin/gtkpounce.c:791
+msgid "_Recurring"
+msgstr "_Ismétlődő"
+
+#: ../pidgin/gtkpounce.c:1247
+msgid "Pounce Target"
+msgstr "Figyelmeztetés címzettje"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
+"témák a témalistába dobással telepíthetők."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Ikon"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Rendszertálca-ikon"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Rendszertálca-ikon megjelenítése:"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Mindig"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Olvasatlan üzenetek esetén"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Társalgási ablak elrejtése"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "Új társal_gások elrejtése:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+msgid "When away"
+msgstr "Ha távol vagyok"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Lapok"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Üzenetek és csevegések megjelenítése _lapokkal ellátott ablakokban"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "_Bezárás gomb megjelenítése a lapokon"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Elhelyezés:"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "Felül"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Alul"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "Bal oldalon"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "Jobb oldalon"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Balra függőlegesen"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Jobbra függőlegesen"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "Új _társalgások:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "_Formázás mutatása bejövő üzeneteknél"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "_Partnerikonok megjelenítése"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Partnerikon-a_nimáció engedélyezése"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "Partnerek figyelmez_tetése, ha nekik gépel"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "_Helytelenül írt szavak kiemelése"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Finom görgetés használata"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Villanjon az ablak új üzenetek fogadásakor"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Alapértelmezett formázás"
+
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, "
+"amelyek támogatják a formázást. :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "ST_UN kiszolgáló:"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Például: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "_IP cím automatikus felismerése"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "_Nyilvános IP:"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "Portok"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "A figyelendő porttartomány _kézi megadása"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "_Első port:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "_Utolsó port:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Proxy-kiszolgáló"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "Nincs Proxy"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Felhasználó:"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME alapértelmezés"
+
+#: ../pidgin/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid "Manual"
+msgstr "Egyéni"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "Böngészőválasztás"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "_Böngésző:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "Hivatk_ozás megnyitása:"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "Alapértelmezett böngésző"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "Létező ablak"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "Új lap"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Kézi:\n"
+"(%s az URL-hez)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "Napló_formátum:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Összes azonnali üzenet na_plózása"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Összes _csevegés naplózása"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Összes állapot_változás naplózása a rendszernaplóba"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Hang kiválasztása"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quietest"
+msgstr "Leghalkabb"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quieter"
+msgstr "Halkabb"
+
+#: ../pidgin/gtkprefs.c:1527
+msgid "Quiet"
+msgstr "Halk"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Loud"
+msgstr "Hangos"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Louder"
+msgstr "Hangosabb"
+
+#: ../pidgin/gtkprefs.c:1535
+msgid "Loudest"
+msgstr "Leghangosabb"
+
+#: ../pidgin/gtkprefs.c:1598
+msgid "Sound Method"
+msgstr "Hangrendszer"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "_Method:"
+msgstr "Hang_rendszer kiválasztása:"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Rendszer-hangszóró"
+
+#: ../pidgin/gtkprefs.c:1603
+msgid "Automatic"
+msgstr "Automatikus"
+
+#: ../pidgin/gtkprefs.c:1606
+msgid "Command"
+msgstr "Parancs"
+
+#: ../pidgin/gtkprefs.c:1607
+msgid "No sounds"
+msgstr "Nincsenek hangok"
+
+#: ../pidgin/gtkprefs.c:1615
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Hanglejátszó _parancs:\n"
+"(%s fájlnév megadásához)"
+
+#: ../pidgin/gtkprefs.c:1641
+msgid "Sound Options"
+msgstr "Hangbeállítások"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Sounds when conversation has _focus"
+msgstr "Hangok lejátszása, ha a társalgás ablaka a_ktív"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Enable sounds:"
+msgstr "Hangok engedélyezése:"
+
+#: ../pidgin/gtkprefs.c:1646
+msgid "Only when available"
+msgstr "Csak ha elérhető"
+
+#: ../pidgin/gtkprefs.c:1647
+msgid "Only when not available"
+msgstr "Csak ha nem érhető el"
+
+#: ../pidgin/gtkprefs.c:1655
+msgid "Volume:"
+msgstr "Hangerő:"
+
+#: ../pidgin/gtkprefs.c:1683
+msgid "Sound Events"
+msgstr "Hangesemények"
+
+#: ../pidgin/gtkprefs.c:1734
+msgid "Play"
+msgstr "Lejátszás"
+
+#: ../pidgin/gtkprefs.c:1741
+msgid "Event"
+msgstr "Esemény"
+
+#: ../pidgin/gtkprefs.c:1760
+msgid "Test"
+msgstr "Teszt"
+
+#: ../pidgin/gtkprefs.c:1764
+msgid "Reset"
+msgstr "Visszaállítás"
+
+#: ../pidgin/gtkprefs.c:1768
+msgid "Choose..."
+msgstr "Kiválasztás..."
+
+#: ../pidgin/gtkprefs.c:1811
+msgid "_Report idle time:"
+msgstr "_Inaktivitás idejének jelentése:"
+
+#: ../pidgin/gtkprefs.c:1816
+msgid "Based on keyboard or mouse use"
+msgstr "Billentyűzet vagy egér használata alapján"
+
+#: ../pidgin/gtkprefs.c:1825
+msgid "_Auto-reply:"
+msgstr "_Automatikus válasz:"
+
+#: ../pidgin/gtkprefs.c:1829
+msgid "When both away and idle"
+msgstr "Ha távol van és inaktív"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1835
+msgid "Auto-away"
+msgstr "Automatikus távollét"
+
+#: ../pidgin/gtkprefs.c:1837
+msgid "Change status when _idle"
+msgstr "Állapot módosítása, _ha inaktív"
+
+#: ../pidgin/gtkprefs.c:1841
+msgid "_Minutes before changing status:"
+msgstr "Állapot módosítása ennyi _perc után:"
+
+#: ../pidgin/gtkprefs.c:1849
+msgid "Change _status to:"
+msgstr "Állap_ot megváltoztatása a következőre:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1870
+msgid "Status at Startup"
+msgstr "Állapot induláskor"
+
+#: ../pidgin/gtkprefs.c:1872
+msgid "Use status from last _exit at startup"
+msgstr "Az utolsó kilé_péskor érvényes állapot használata induláskor"
+
+#: ../pidgin/gtkprefs.c:1878
+msgid "Status to a_pply at startup:"
+msgstr "In_dításkor alkalmazandó állapot:"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Interface"
+msgstr "Felület"
+
+#: ../pidgin/gtkprefs.c:1918
+msgid "Smiley Themes"
+msgstr "Hangulatjel-témák"
+
+#: ../pidgin/gtkprefs.c:1919
+msgid "Sounds"
+msgstr "Hangok"
+
+#: ../pidgin/gtkprefs.c:1925
+msgid "Browser"
+msgstr "Böngésző"
+
+#: ../pidgin/gtkprefs.c:1929
+msgid "Status / Idle"
+msgstr "Állapot / Inaktív"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Mindenki kapcsolatba léphet velem"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Csak a partnerlistán szereplő felhasználók"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Csak az alábbi felhasználók:"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Az összes felhasználó letiltása"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Csak a következő felhasználók letiltása:"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Magánszféra"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "A magánszféra beállításainak módosításai azonnal életbe lépnek."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Magánszféra beállításai ehhez:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+msgid "Permit User"
+msgstr "Felhasználó engedélyezése"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Adjon meg egy felhasználót, aki kapcsolatba léphet Önnel."
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+"Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy "
+"kapcsolatba lépjen Önnel."
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgid "_Permit"
+msgstr "_Engedélyezés"
+
+#: ../pidgin/gtkprivacy.c:571
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Megengedi, hogy %s kapcsolatba lépjen Önnel?"
+
+#: ../pidgin/gtkprivacy.c:573
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Biztosan megengedi, hogy %s kapcsolatba lépjen Önnel?"
+
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+msgid "Block User"
+msgstr "Felhasználó tiltása"
+
+#: ../pidgin/gtkprivacy.c:603
+msgid "Type a user to block."
+msgstr "Adjon meg egy letiltandó felhasználót."
+
+#: ../pidgin/gtkprivacy.c:604
+msgid "Please enter the name of the user you wish to block."
+msgstr "Adja meg a letiltani kívánt felhasználó nevét."
+
+#: ../pidgin/gtkprivacy.c:612
+#, c-format
+msgid "Block %s?"
+msgstr "Letiltja a következőt: %s?"
+
+#: ../pidgin/gtkprivacy.c:614
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Biztosan le akarja tiltani %s felhasználót?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Alkalmazás"
+
+#: ../pidgin/gtkrequest.c:1481
+msgid "That file already exists"
+msgstr "Ez a fájl már létezik"
+
+#: ../pidgin/gtkrequest.c:1482
+msgid "Would you like to overwrite it?"
+msgstr "Szeretné felülírni?"
+
+#: ../pidgin/gtkrequest.c:1485
+msgid "Overwrite"
+msgstr "Felülírás"
+
+#: ../pidgin/gtkrequest.c:1486
+msgid "Choose New Name"
+msgstr "Válasszon új nevet"
+
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgid "Select Folder..."
+msgstr "Válasszon mappát..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Szobalista"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "Lista _lekérése"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "Cse_vegés hozzáadása"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Biztos, hogy törölni akarja a kijelölt mentett állapotokat?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+msgid "_Use"
+msgstr "_Használat"
+
+#: ../pidgin/gtksavedstatuses.c:726
+msgid "Title already in use.  You must choose a unique title."
+msgstr "A cím már használatban van. Használjon egyedi címet."
+
+#: ../pidgin/gtksavedstatuses.c:914
+msgid "Different"
+msgstr "Eltérő"
+
+#: ../pidgin/gtksavedstatuses.c:1107
+msgid "_Title:"
+msgstr "_Cím:"
+
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+msgid "_Status:"
+msgstr "Áll_apot:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "Use a _different status for some accounts"
+msgstr "_Eltérő állapot használata egyes fiókokhoz"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1222
+msgid "Sa_ve & Use"
+msgstr "Menté_s és használat"
+
+#: ../pidgin/gtksavedstatuses.c:1428
+#, c-format
+msgid "Status for %s"
+msgstr "%s állapota"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Partner belép"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Partner kilép"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Üzenet fogadása"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Társalgás kezdetét jelző üzenet"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Üzenet elküldve"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Egy személy csatlakozik a csevegéshez"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Egy személy elhagyja a csevegést"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Ön beszél a csevegésben"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Mások beszélnek a csevegésben"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Valaki csevegés közben leírja az Ön felhasználónevét"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer hiba"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "A GStreamer inicializálása meghiúsult."
+
+#: ../pidgin/gtkstatusbox.c:661
+msgid "Waiting for network connection"
+msgstr "Várakozás a hálózati kapcsolatra"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "A következő hiba történt %s betöltése közben: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "A kép betöltése meghiúsult"
+
+#: ../pidgin/gtkutils.c:1419
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "A(z) %s mappa nem küldhető el."
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+"A %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat "
+"egyenként kell elküldenie."
+
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
+msgid "You have dragged an image"
+msgstr "Egy képet húzott be"
+
+#: ../pidgin/gtkutils.c:1453
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy "
+"használhatja ezen felhasználó partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+msgid "Set as buddy icon"
+msgstr "Beállítás partnerikonként"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+msgid "Send image file"
+msgstr "Képfájl küldése"
+
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+msgid "Insert in message"
+msgstr "Beszúrás az üzenetbe"
+
+#: ../pidgin/gtkutils.c:1465
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Be kívánja állítani partnerikonként ehhez a felhasználóhoz?"
+
+#: ../pidgin/gtkutils.c:1472
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy "
+"használhatja ezen felhasználó partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1474
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
+"partnerikonjaként."
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1532
+msgid "Cannot send launcher"
+msgstr "Az indítóikon nem küldhető el"
+
+#: ../pidgin/gtkutils.c:1532
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
+"objektumot akarta elküldeni az indítóikon helyett."
+
+#: ../pidgin/gtkutils.c:2302
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Fájl:</b> %s\n"
+"<b>Fájlméret:</b> %s\n"
+"<b>Képméret:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2592
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "A(z) \"%s\" fájl túl nagy a következőhöz: %s. Próbálkozzon kisebb képpel.\n"
+
+#: ../pidgin/gtkutils.c:2594
+msgid "Icon Error"
+msgstr "Ikonhiba"
+
+#: ../pidgin/gtkutils.c:2595
+msgid "Could not set icon"
+msgstr "Az ikon beállítása meghiúsult"
+
+#: ../pidgin/gtkutils.c:2695
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nem sikerült megnyitni a(z) \"%s\" fájlt: %s"
+
+#: ../pidgin/gtkutils.c:2744
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült "
+"a képfájl"
+
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgid "Save File"
+msgstr "Fájl mentése"
+
+#: ../pidgin/gtkwhiteboard.c:867
+msgid "Select color"
+msgstr "Szín kiválasztása"
+
+#: ../pidgin/pidginstock.c:83
+msgid "_Alias"
+msgstr "Ál_név"
+
+#: ../pidgin/pidginstock.c:85
+msgid "Close _tabs"
+msgstr "_Lapok bezárása"
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Get Info"
+msgstr "Információ le_kérése"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Invite"
+msgstr "Meg_hívás"
+
+#: ../pidgin/pidginstock.c:89
+msgid "_Modify"
+msgstr "_Módosítás"
+
+#: ../pidgin/pidginstock.c:90
+msgid "_Open Mail"
+msgstr "_Levél megnyitása"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Statisztikák megjelenítése"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Válasz valószínűsége:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Statisztika beállítása"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr "Legnagyobb válasz-időkorlát:"
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "perc"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr "Legnagyobb utoljára-látszott különbség:"
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "Küszöb:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr "Partnerelérhetőség-előrejelzés"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr "Partnerelérhetőség-előrejelző bővítmény."
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"A partnerelérhetőség bővítmény statisztikai információk megjelenítésére "
+"szolgál a felhasználó partnerlistáján található partnerekről."
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "A partner inaktív"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "A partner távol"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "A partner \"nincs a gépnél\""
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "A partner mozog"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "A partner offline"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Pontértékek használata, ha..."
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog "
+"rendelkezni a kapcsolatban.\n"
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Az utolsó partner használata, ha a pontszámok azonosak"
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Fiókhoz használandó pontértékek..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Kapcsolat prioritása"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:185
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
+"beállítását."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó "
+"pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Társalgás színei"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "A társalgási ablak színeinek testreszabása"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Hibaüzenetek"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Kiemelt üzenetek"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Rendszerüzenetek"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Elküldött üzenetek"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Fogadott üzenetek"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Válassza ki %s színét"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Bejövő formázás figyelmen kívül hagyása"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Alkalmazás csevegésekben"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Alkalmazás üzenetváltásokban"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Társalgások száma szerint"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Társalgás elhelyezése"
+
+#: ../pidgin/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Társalgások száma ablakonként"
+
+#: ../pidgin/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Azonnali üzenő- és csevegőablakok elkülönítése szám szerinti elhelyezésnél"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:141
+msgid "ExtPlacement"
+msgstr "Bővített elhelyezés"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:143
+msgid "Extra conversation placement options."
+msgstr "Társalgások elhelyezésének beállításai."
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:145
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali "
+"üzenetek és csevegés elkülönítése"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Egérgesztusok beállítása"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Középső egérgomb"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Jobb egérgomb"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "Gesztusok _vizuális megjelenítése"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "Egérgesztusok"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "Egérgesztusok támogatása"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Egérgesztusok támogatása társalgási ablakokban.\n"
+"A középső gomb lenyomva tartásával elvégezhető műveletek:\n"
+"\n"
+"Lefelé húz és jobbra mozgat: zárja a társalgást.\n"
+"Felfelé húz és balra mozgat: az előző társalgásra vált.\n"
+"Felfelé húz és jobbra mozgat: a következő társalgásra vált."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Azonnali üzenetküldés"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Jelöljön ki egy személyt a címjegyzékéből vagy adjon hozzá egy újat."
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Új személy"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Partner kiválasztása"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek "
+"vagy hozzon létre egy újat."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "F_elhasználó részletei"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "_Partner összerendelése"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "Nem küldhető e-mail"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+"Az evolution végrehajtható állomány nem található a PATH változóban megadott "
+"útvonalon."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "Nem található e-mail cím ehhez a partnerhez."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "Hozzáadás a címjegyzékhez"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "E-mail küldése"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Evolution integráció beállítása"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+"Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá "
+"kell rendelni."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr "Evolution integráció"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:524
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr "Integrációt biztosít az Evolutionnel."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Kérem adja meg alább a személy adatait."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Kérem adja meg a partner felhasználónevét és fiókjának típusát."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Fiók típusa:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Opcionális információk:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Utónév:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Vezetéknév:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK szignálteszt"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Ellenőrzés, hogy minden felületi szignál megfelelően működik-e."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Előzmények"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Ikonállapot távollét esetén"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Levélfigyelő"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Új helyi levél érkezését ellenőrzi."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "Kis dobozt ad a partnerlistához, amely megjelenik új levél érkezésekor."
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Jelölő vonal"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Vonal húzása a társalgás új üzeneteinek jelzése érdekében."
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "Jelölő vonal húzása a következőkben:"
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "_IM ablakok"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "_Csevegőablakok"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson "
+"az MM ikonra."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "A zenei üzenetküldő munkamenet megerősítve."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr "Zenei üzenetküldés"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Ütközés történt a következő parancs futtatása közben:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr "Hiba a szerkesztő futtatása közben"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "A következő hiba történt:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr "Zenei üzenetküldés beállítása"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr "Kottaszerkesztő útvonala"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Alkalmaz"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Zenei üzenetküldő bővítmény együttműködő zeneszerzéshez."
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
+"felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Figyelmeztetés"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Csak ha valaki kimondja az Ön felhasználónevét"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "_Fókuszban lévő ablakok"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Értesítési módok"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "_Szöveg beszúrása az ablak címe elé:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "Új üzenetek számának _beszúrása az ablak címébe"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "Új üzenetek számának beszúrása az _X tulajdonságba"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "\"_SÜRGŐS\" tipp beállítása az ablakkezelő számára"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "_Társalgási ablak előtérbe hozása"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Értesítés eltávolítása"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "Eltávolítás, mikor a társalgás ablaka _aktívvá válik"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Eltávolítás a tá_rsalgás ablakára kattintáskor"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Eltávolítás a _társalgás ablakában történő gépeléskor"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Eltávolítás, mikor egy ü_zenet elküldésre kerül"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "Eltávolítás a társalgás lapjára _váltáskor"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:901
+msgid "Message Notification"
+msgstr "Üzenetértesítés"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin demóbővítmény"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Példa bővítmény, ami csinál valamit - nézze meg a leírást."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Ez egy igen hasznos bővítmény, ami sok mindent csinál:\n"
+"- Megmondja, ki írta a programot amikor belép\n"
+"- Visszafordít minden bejövő szöveget\n"
+"- Üzenetet küld a partnerlistán lévő partnereinek, amikor belépnek"
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "Kurzor színe"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Másodlagos kurzor színe"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Hiperhivatkozás színe"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView kiterjesztő mérete"
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView vízszintes elválasztás"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Társalgás beviteli mező"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "Társalgások előzményei"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "Naplómegjelenítő"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "Kérdés párbeszédablak"
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "Figyelmeztetés párbeszédablak"
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView behúzási kiterjesztők"
+
+#: ../pidgin/plugins/pidginrc.c:322
+msgid "Select Color"
+msgstr "Válasszon színt"
+
+#: ../pidgin/plugins/pidginrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Válassza ki %s betűkészletét"
+
+#: ../pidgin/plugins/pidginrc.c:398
+msgid "Select Interface Font"
+msgstr "Válassza ki a felület betűkészletét"
+
+#: ../pidgin/plugins/pidginrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ felület betűkészlete"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ szöveges gyorsbillentyű téma"
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "Felület színei"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr "Felöleti elemek méretei"
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "Betűkészletek"
+
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "Eszközök"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Beállítások kiírása ide: %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "A gtkrc fájlok újraolvasása"
+
+#: ../pidgin/plugins/pidginrc.c:622
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ témavezérlés"
+
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Hozzáférést biztosít az általánosan használt gtkrc beállításokhoz."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Nyers"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára."
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, "
+"MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a "
+"hibakereső ablakot."
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "A %s %s verzióját használja. A jelenleg legfrissebb verzió: %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Változások naplója:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr "A(z) %s verzióhoz hozzájuthat a <br><a href=\"http://pidgin.im/\">http://pidgin.im</a> címről."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Új verzió érhető el"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Kiadásértesítés"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Rendszeresen ellenőrzi az új programverziók megjelenését."
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának "
+"segítségével értesíti a felhasználót."
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "Kettőzés javítása"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "A megadott szó már létezik a javítási listában."
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "Szövegek cseréje"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "Ezt írja"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "Ezt küldi"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "Csak teljes szavak"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "Kis- és nagybetű"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "Új szöveghelyettesítés felvétele"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "Ezt ír_ja:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "Ezt _küldi:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus "
+"kezeléséhez)"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "_Csak teljes szavak cseréje"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Szövegcsere általános beállításai"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "Az utolsó szó helyettesítésének engedélyezése küldéskor"
+
+#: ../pidgin/plugins/spellchk.c:2373
+msgid "Text replacement"
+msgstr "Szöveg cseréje"
+
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
+"kimenő üzenetekben."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Partnerfigyelő"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Vízszintesen gördülő partnerlista."
+
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "Időbélyegek megjelenítése minden"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "Időbélyeg"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "iChat-stílusú időbélyeg megjelenítése"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "iChat stílusú időbélyegek megjelenítése minden N percben."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Időpecsét formátumbeállításai"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr "(hagyományos %s) 24 órás i_dőformátum kényszerítése"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Dátumok megjelenítése"
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "_Társalgások:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "Késleltetett üzenetekhez"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "Késleltetett üzenetekhez és csevegésekhez"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "Ü_zenetnaplók:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Üzenet időpecsét-formátumok"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Az üzenet időpecsét-formátumok testreszabása."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
+"naplóüzenetek időpecsét-formátumainak testreszabását."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Átlátszatlanság:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "IM társalgási ablakok"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_IM ablak átlátszósága"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "C_súszka mutatása az IM ablakban"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "IM ablak átlátszóságának eltávolítása, ha fókuszt kap"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Mindig legfelül"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Partnerlista-ablak"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "_Partnerlista-ablak átlátszósága"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Partnerlista-ablak átlátszóságának eltávolítása, ha fókuszt kap"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+msgid "Transparency"
+msgstr "Átlátszóság"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Változtatható átlátszóság a partnerlistához és a társalgásokhoz."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a "
+"társalgás és a partnerlista ablakában.\n"
+"\n"
+"* Megjegyzés: A bővítményhez Win2000 vagy újabb szükséges."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ runtime verzió"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Indítás"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "A %s indítá_sa a Windows indulásakor"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "_Dokkolható partnerlista"
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "_Partnerlista-ablak mindig felül:"
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr "Csak ha dokkolt"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr "_Villogtassa az ablakot új csevegésüzenetek fogadásakor"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Pidgwin Options"
+msgstr "A Pidgwin beállításai"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+msgid "Options specific to Pidgin for Windows."
+msgstr "A windowsos Pidginre jellemző beállítások."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
+"partnerlista dokkolása."
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>Kijelentkezve.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP konzol"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Fiók: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>Nincs csatlakoztatva az XMPP-hez</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "<iq/> mondat beszúrása."
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "<presence/> mondat beszúrása."
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "<message/> mondat beszúrása."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Nyers XMPP mondatok küldése és fogadása."
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
+"Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
+"hasznos."
+
diff --git a/po/ja.po b/po/ja.po
index 339863eb99..4c8c1717da 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,428 +1,501 @@
-# gaim ja.po.
+# pidgin ja.po.
 # Copyright (C) 2002, Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>
 # Copyright (C) 2002, Taku YASUI <tach@debian.or.jp>
 # Copyright (C) 2003, Junichi Uekawa <dancer@debian.org>
-# Copyright (C) 2003-2007, Takeshi AIHANA <aihana@gnome.gr.jp>
+# Copyright (C) 2003-2007, Takeshi AIHANA <takeshi.aihana@gmail.com>
 #
-# This file is distributed under the same license as the Gaim package.
+# This file is distributed under the same license as the 'pidgin' package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim trunk\n"
+"Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-27 09:34+0900\n"
-"PO-Revision-Date: 2007-01-27 09:39+0900\n"
-"Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
+"POT-Creation-Date: 2007-05-01 23:40+0900\n"
+"PO-Revision-Date: 2007-05-01 23:40+0900\n"
+"Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim インターネット・メッセンジャー"
+#: ../finch/finch.c:180
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s (詳しい情報は `%s -h' と入力して下さい)\n"
 
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "インターネット・メッセンジャー"
+#: ../finch/finch.c:182
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"用法: %s [オプション]...\n"
+"\n"
+"  -c, --config=DIR    DIR にある設定ファイルを使用する\n"
+"  -d, --debug         デバッグ情報を標準出力に表示する\n"
+"  -h, --help          このヘルプを表示して終了する\n"
+"  -n, --nologin       自動的にサイン・インしない\n"
+"  -v, --version       現在使用しているバージョンを表示して終了する\n"
 
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "複数のプロトコルを介してインスタント・メッセージを送信します"
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:689
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s でお使いの設定を %s から %s へ移行する際に複数のエラーが発生しました。原因"
+"を調査した上で手動にて移行を完了して下さい。それから http://developer.pidgin."
+"im にて問題を報告して下さい。"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:272
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1399
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1210
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "エラー"
 
-#: ../console/gntaccount.c:119
+#: ../finch/gntaccount.c:119
 msgid "Account was not added"
 msgstr "アカウントが追加されませんでした"
 
-#: ../console/gntaccount.c:120
+#: ../finch/gntaccount.c:120
 msgid "Screenname of an account must be non-empty."
 msgstr "アカウントのスクリーン名は空にしないで下さい。"
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
 msgid "New mail notifications"
 msgstr "新着メールを通知する"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
 msgid "Remember password"
 msgstr "パスワードを保存する"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
+#: ../pidgin/gtkblist.c:3948
 msgid "Modify Account"
 msgstr "アカウントの編集"
 
-#: ../console/gntaccount.c:474
+#: ../finch/gntaccount.c:474
 msgid "New Account"
 msgstr "新しいアカウント"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5357
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "スクリーン名:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5378
+#: ../pidgin/gtkblist.c:5741
 msgid "Alias:"
 msgstr "別名:"
 
+#. Cancel button
 #. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:313
-#: ../console/gntblist.c:380 ../console/gntblist.c:413
-#: ../console/gntblist.c:737 ../console/gntblist.c:906
-#: ../console/gntblist.c:997 ../console/gntblist.c:2021
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
-#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
-#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
-#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
-#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
-#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1761
-#: ../libgaim/protocols/jabber/buddy.c:1795
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:1365
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
-#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
-#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
-#: ../libgaim/protocols/oscar/oscar.c:6043
-#: ../libgaim/protocols/oscar/peer.c:1021
-#: ../libgaim/protocols/qq/buddy_info.c:484
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
-#: ../libgaim/protocols/qq/group_join.c:138
-#: ../libgaim/protocols/qq/group_join.c:359
-#: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
-#: ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:3410
-#: ../libgaim/protocols/sametime/sametime.c:3495
-#: ../libgaim/protocols/sametime/sametime.c:3665
-#: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5498
-#: ../libgaim/protocols/sametime/sametime.c:5622
-#: ../libgaim/protocols/silc/buddy.c:467
-#: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:961
-#: ../libgaim/protocols/yahoo/yahoo.c:3208
-#: ../libgaim/protocols/yahoo/yahoo.c:3217
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
+#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "キャンセル"
 
+#. Save button
 #. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
-#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "保存する"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "本当に %s を削除してもよろしいですか？"
 
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
+#: ../finch/gntaccount.c:614
 msgid "Delete Account"
 msgstr "アカウントの削除"
 
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:335
+#. Delete button
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "削除する"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:539
 msgid "Accounts"
 msgstr "アカウント"
 
-#: ../console/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "次の一覧にあるアカウントの有効/無効を変更できます:"
 
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:313 ../console/gntblist.c:380
-#: ../console/gntblist.c:413 ../console/gntnotify.c:309
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
-#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
-#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:5497
-#: ../libgaim/protocols/silc/chat.c:596
+#. Add button
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
+#: ../pidgin/gtkblist.c:5796 ../pidgin/gtkconv.c:1633
+#: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "追加する"
 
-#: ../console/gntaccount.c:677
+#. Modify button
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "変更する"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s さんは %s さんを仲間にしました%s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
 msgid "Add buddy to your list?"
 msgstr "仲間をリストに追加しますか？"
 
-#: ../console/gntblist.c:264
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s さんが %s さんを仲間リスト%s%s に追加したがっています"
+
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+msgid "Authorize buddy?"
+msgstr "仲間として承認しますか？"
+
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+msgid "Authorize"
+msgstr "承認する"
+
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+msgid "Deny"
+msgstr "拒否する"
+
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "仲間のスクリーン名を指定して下さい"
 
-#: ../console/gntblist.c:266
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "グループを指定して下さい"
 
-#: ../console/gntblist.c:268
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "アカウントを選択して下さい"
 
-#: ../console/gntblist.c:272
+#: ../finch/gntblist.c:286
 msgid "Error adding buddy"
 msgstr "仲間を追加する際にエラー"
 
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
+#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "スクリーン名"
 
-#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
-#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1207
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
 msgid "Group"
 msgstr "グループ"
 
-#: ../console/gntblist.c:306 ../console/gntblist.c:363
-#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
-#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
-#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2946 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "アカウント"
 
-#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
-#: ../libgaim/protocols/silc/buddy.c:736
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/buddy.c:1075
-#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3122
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5311
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "仲間の追加"
 
-#: ../console/gntblist.c:312
+#: ../finch/gntblist.c:327
 msgid "Please enter buddy information."
 msgstr "仲間の情報を入力して下さい:"
 
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "チャット"
 
 #. Extract their Name and put it in
-#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:792
-#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
-#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名前"
 
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5687
 msgid "Add Chat"
 msgstr "チャットの追加"
 
-#: ../console/gntblist.c:379
+#: ../finch/gntblist.c:398
 msgid "You can edit more information from the context menu later."
 msgstr "右クリック・メニューから情報を編集できます"
 
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
 msgid "Error adding group"
 msgstr "グループを追加する際にエラー"
 
-#: ../console/gntblist.c:391
+#: ../finch/gntblist.c:412
 msgid "You must give a name for the group to add."
 msgstr "追加するグループの名前を入力して下さい"
 
-#: ../console/gntblist.c:404
+#: ../finch/gntblist.c:425
 msgid "A group with the name already exists."
 msgstr "その名前のグループは既に存在します"
 
-#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
-#: ../libgaim/protocols/sametime/sametime.c:5408
-#: ../libgaim/protocols/sametime/sametime.c:5495
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5793
 msgid "Add Group"
 msgstr "グループの追加"
 
-#: ../console/gntblist.c:411
+#: ../finch/gntblist.c:432
 msgid "Enter the name of the group"
 msgstr "追加するグループの名前を入力して下さい:"
 
-#: ../console/gntblist.c:736
+#: ../finch/gntblist.c:761
 msgid "Edit Chat"
 msgstr "チャットの編集"
 
-#: ../console/gntblist.c:736
+#: ../finch/gntblist.c:761
 msgid "Please Update the necessary fields."
 msgstr "必要な項目を更新して下さい"
 
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "編集"
 
-#: ../console/gntblist.c:751
+#: ../finch/gntblist.c:778
 msgid "Auto-join"
 msgstr "自動参加"
 
-#: ../console/gntblist.c:760
+#: ../finch/gntblist.c:787
 msgid "Edit Settings"
 msgstr "設定の編集"
 
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "情報の取得"
 
-#: ../console/gntblist.c:811
+#: ../finch/gntblist.c:855
 msgid "Add Buddy Pounce"
 msgstr "つかむ仲間の追加"
 
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
 msgid "Send File"
 msgstr "ファイルの送信"
 
-#: ../console/gntblist.c:822
+#: ../finch/gntblist.c:866
 msgid "View Log"
 msgstr "ログの表示"
 
-#: ../console/gntblist.c:902
+#: ../finch/gntblist.c:947
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "%s さんの新しい名前を入力して下さい"
 
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
 msgid "Rename"
 msgstr "名前の変更"
 
-#: ../console/gntblist.c:904
+#: ../finch/gntblist.c:950
 msgid "Enter empty string to reset the name."
 msgstr "空の文字列を入力すると名前をリセットします"
 
-#: ../console/gntblist.c:977
+#: ../finch/gntblist.c:1026
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "この連絡先を削除すると、その中にある仲間の情報も全て削除されます"
 
-#: ../console/gntblist.c:985
+#: ../finch/gntblist.c:1034
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "このグループを削除すると、その中にある仲間の情報も全て削除されます"
 
-#: ../console/gntblist.c:990
+#: ../finch/gntblist.c:1039
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "本当に %s を削除してもよろしいですか？"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
+#: ../finch/gntblist.c:1042
 msgid "Confirm Remove"
 msgstr "削除の確認"
 
-#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
-#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "削除"
 
 #. Buddy List
-#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4190
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "仲間リスト"
 
-#: ../console/gntblist.c:1123
+#: ../finch/gntblist.c:1200
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../console/gntblist.c:1128
+#: ../finch/gntblist.c:1205
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:814
-#: ../libgaim/protocols/jabber/buddy.c:1562
-#: ../libgaim/protocols/jabber/buddy.c:1744
-#: ../libgaim/protocols/jabber/jabber.c:802
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2970
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. Idle stuff
-#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
-#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:645
-#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2860
-#: ../libgaim/protocols/oscar/oscar.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:2876
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2990
+#: ../pidgin/gtkblist.c:3379 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "待機中"
 
-#: ../console/gntblist.c:1270
+#: ../finch/gntblist.c:1347
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -431,12 +504,12 @@ msgstr ""
 "オンライン: %d\n"
 "合計: %d"
 
-#: ../console/gntblist.c:1279
+#: ../finch/gntblist.c:1356
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "アカウント: %s (%s)"
 
-#: ../console/gntblist.c:1291
+#: ../finch/gntblist.c:1368
 #, c-format
 msgid ""
 "\n"
@@ -445,94 +518,101 @@ msgstr ""
 "\n"
 "最後にお会いしたのは: %s前"
 
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
+#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "状態の追加..."
 
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
+#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:488
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "他の状態..."
 
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
+#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:540 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
+#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Account"
 msgstr "アカウント(_A)"
 
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
+#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
 msgid "New Instant Message"
 msgstr "新しいインスタント・メッセージ"
 
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
+#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "IM で会話する相手のスクリーン名または別名を入力して下さい:"
 
-#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
-#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
-#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
-#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
-#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
-#: ../libgaim/protocols/yahoo/yahoo.c:3207
-#: ../libgaim/protocols/yahoo/yahoo.c:3216
+#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
+#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "オプション"
 
-#: ../console/gntblist.c:2045
+#: ../finch/gntblist.c:2162
 msgid "Send IM..."
 msgstr "IM の送信..."
 
-#: ../console/gntblist.c:2049
+#: ../finch/gntblist.c:2166
 msgid "Toggle offline buddies"
 msgstr "オフラインの仲間に切り換える"
 
-#: ../console/gntblist.c:2053
+#: ../finch/gntblist.c:2172
 msgid "Sort by status"
 msgstr "状態順"
 
-#: ../console/gntblist.c:2057
+#: ../finch/gntblist.c:2176
 msgid "Sort alphabetically"
 msgstr "アルファベット順"
 
-#: ../console/gntblist.c:2061
+#: ../finch/gntblist.c:2180
 msgid "Sort by log size"
 msgstr "ログのサイズ順"
 
-#: ../console/gntconn.c:36
+#: ../finch/gntconn.c:38
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../console/gntconn.c:39
+#: ../finch/gntconn.c:41
 #, c-format
 msgid "%s disconnected."
 msgstr "%s さんは接続を切りました"
 
-#: ../console/gntconn.c:40
+#: ../finch/gntconn.c:42
 #, c-format
 msgid ""
 "%s was disconnected due to the following error:\n"
@@ -541,50 +621,55 @@ msgstr ""
 "%s さんが次のエラーが発生したので接続を切りました:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3944
 msgid "Connection Error"
 msgstr "接続エラー"
 
-#: ../console/gntconv.c:102
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3949
+msgid "Connect"
+msgstr "接続"
+
+#: ../finch/gntconv.c:103
 msgid "No such command."
 msgstr "そのようなコマンドはありません"
 
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "入力エラー:  そのコマンドに対する引数の数が間違っています"
 
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
 msgid "Your command failed for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
 msgid "That command only works in chats, not IMs."
 msgstr "そのコマンドは IM ではなくチャットでのみ動作します"
 
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
 msgid "That command only works in IMs, not chats."
 msgstr "そのコマンドはチャットではなく IM でのみ動作します"
 
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
 msgid "That command doesn't work on this protocol."
 msgstr "そのコマンドは、このプロトコルでは動作しません"
 
-#: ../console/gntconv.c:130
+#: ../finch/gntconv.c:131
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "まだコマンドはサポートしていません (メッセージを送信しませんでした)"
 
-#: ../console/gntconv.c:232
+#: ../finch/gntconv.c:217
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:255
+#: ../finch/gntconv.c:240
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
 #, c-format
 msgid ""
 "\n"
@@ -593,24 +678,24 @@ msgstr ""
 "\n"
 "%s さんが何か入力しています..."
 
-#: ../console/gntconv.c:399
+#: ../finch/gntconv.c:390
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:501
+#: ../finch/gntconv.c:492
 msgid "List of users:\n"
 msgstr "ユーザの一覧\n"
 
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
 msgid "Supported debug options are:  version"
 msgstr "サポートするデバッグ・オプションは:  バージョン"
 
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
 msgid "No such command (in this context)."
 msgstr "(このコンテキストには) そのようなコマンドはありません"
 
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -619,7 +704,7 @@ msgstr ""
 "\"/help &lt;command&gt;\" を使用して下さい。\n"
 "このコンテキストでは次のコマンドが利用可能です:\n"
 
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -627,13 +712,13 @@ msgstr ""
 "say &lt;メッセージ&gt;:  コマンドを利用していない場合でもメッセージを送信しま"
 "す"
 
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;アクション&gt;:  仲間またはチャットへ IRC スタイルのアクションを送信し"
 "ます"
 
-#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -641,39 +726,39 @@ msgstr ""
 "debug &lt;オプション&gt;:  利用中の会話ウィンドウへいろいろなデバッグ情報を送"
 "信します"
 
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
 msgid "clear: Clears the conversation scrollback."
 msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
 
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;コマンド&gt;:  特定のコマンドに対するヘルプを表示します"
 
-#: ../console/gntconv.c:719
+#: ../finch/gntconv.c:710
 msgid "plugins: Show the plugins window."
 msgstr "plugins: プラグイン・ウィンドウを表示する"
 
-#: ../console/gntconv.c:722
+#: ../finch/gntconv.c:713
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 仲間リストを表示する"
 
-#: ../console/gntconv.c:725
+#: ../finch/gntconv.c:716
 msgid "accounts: Show the accounts window."
 msgstr "accounts: アカウント・ウィンドウを表示する"
 
-#: ../console/gntconv.c:728
+#: ../finch/gntconv.c:719
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: デバッグ・ウィンドウを表示する"
 
-#: ../console/gntconv.c:731
+#: ../finch/gntconv.c:722
 msgid "prefs: Show the preference window."
 msgstr "prefs: 設定ウィンドウを表示する"
 
-#: ../console/gntconv.c:734
+#: ../finch/gntconv.c:725
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: 保存状態のウィンドウを表示する"
 
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
 msgid "Debug Window"
 msgstr "デバッグ・ウィンドウ"
 
@@ -681,113 +766,180 @@ msgstr "デバッグ・ウィンドウ"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
 msgid "Clear"
 msgstr "クリア"
 
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
 msgid "Timestamps"
 msgstr "タイムスタンプ"
 
-#: ../console/gntgaim.c:227
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
-msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s (詳しい情報は `%s -h' と入力して下さい)\n"
+msgid "File Transfers - %d%% of %d files"
+msgstr "ファイル転送 - %d%% / %d個のファイル"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "ファイルの転送"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "進捗"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "ファイル名"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "サイズ"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "速度"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "残り"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1201
+#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:802
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:2650
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3034
+#: ../pidgin/gtkblist.c:3047 ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+msgid "Status"
+msgstr "状態"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "転送が完了したら全てのウィンドウを閉じる"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "完了した転送をクリアする"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "停止する"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "閉じる"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "転送開始を待っています"
+
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "キャンセルしました"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "失敗しました"
 
-#: ../console/gntgaim.c:229
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
 #, c-format
-msgid ""
-"%s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s\n"
-"用法: %s [オプション]...\n"
-"\n"
-"  -c, --config=DIR    DIR にある設定ファイルを使用する\n"
-"  -d, --debug         デバッグ情報を標準出力に表示する\n"
-"  -h, --help          このヘルプを表示して終了する\n"
-"  -n, --nologin       自動的にサイン・インしない\n"
-"  -v, --version       現在使用しているバージョンを表示して終了する\n"
+msgid "%.2f KB/s"
+msgstr "%.2f Kバイト/秒"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "完了しました"
 
-#: ../console/gntnotify.c:146
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "転送しています"
+
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "E-メール"
 
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
 msgid "You have mail!"
 msgstr "メールが届きました！"
 
-#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "差出人"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "件名"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "閉じる"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) には %d通の新しいメッセージがあります"
 msgstr[1] "%s (%s) には %d通の新しいメッセージがあります"
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "新着メール"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "%s さんの情報"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "仲間の情報"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "続行する"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "情報"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "IM"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "参加する"
 
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "招待する"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -804,290 +956,460 @@ msgstr ""
 "配布元: %s\n"
 "ファイル名: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "それを設定する前に適切なプラグインを読み込んで下さい"
 
-#: ../console/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../console/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "まだ何かしなければならないことがあるようです"
-
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr "このプラグインに対するオプションが設定されていません"
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
 msgstr "次の一覧にあるプラグインを読み込んだり読み込みを解除できます"
 
-#: ../console/gntplugin.c:264
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "プラグインの設定"
 
-#: ../console/gntprefs.c:122
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:541 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "設定"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+msgid "Please enter a buddy to pounce."
+msgstr "つかむ仲間を入力して下さい。"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "New Buddy Pounce"
+msgstr "新しい仲間をつかむ"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "Edit Buddy Pounce"
+msgstr "つかむ仲間の編集"
+
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "誰をつかむか..."
+
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5405
+#: ../pidgin/gtkblist.c:5721
+msgid "Account:"
+msgstr "アカウント:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "つかむ仲間(_B):"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+msgid "Pounce When Buddy..."
+msgstr "いつ仲間をつかむか..."
+
+#: ../finch/gntpounce.c:373
+msgid "Signs on"
+msgstr "サイン・インした時"
+
+#: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "サイン・アウトした時"
+
+#: ../finch/gntpounce.c:375
+msgid "Goes away"
+msgstr "離席中になった時"
+
+#: ../finch/gntpounce.c:376
+msgid "Returns from away"
+msgstr "離席中から戻った時"
+
+#: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "待機中になった時"
+
+#: ../finch/gntpounce.c:378
+msgid "Is no longer idle"
+msgstr "待機中から復帰した時"
+
+#: ../finch/gntpounce.c:379
+msgid "Starts typing"
+msgstr "入力を開始した時"
+
+#: ../finch/gntpounce.c:380
+msgid "Pauses while typing"
+msgstr "入力を一旦停止した時"
+
+#: ../finch/gntpounce.c:381
+msgid "Stops typing"
+msgstr "入力を止めた時"
+
+#: ../finch/gntpounce.c:382
+msgid "Sends a message"
+msgstr "メッセージを送信する時"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+msgid "Action"
+msgstr "つかんだら何をするか..."
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "会話ウィンドウを開く"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "ポップアップして通知する"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "メッセージを送信する"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "コマンドを実行する"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "サウンドを演奏する"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "自分の状態を変更できない時にだけつかむ"
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+msgid "Recurring"
+msgstr "繰り返す"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "本当にアカウント %s で %s さんに対する \"つかむ\" 設定を削除しますか？"
+
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+msgid "Buddy Pounces"
+msgstr "仲間をつかむ"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s さんが入力を開始しました (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s さんが入力を一停止しました (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s さんがサイン・インしました (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s さんが待機中から戻ってきました (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s さんが離席中から戻ってきました (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s さんが入力を停止しました (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s さんがサイン・アウトしました (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s さんが待機中になりました (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s さんが離席しました (%s)"
+
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s さんがあなたにメッセージを送信しました (%s)"
+
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+msgid "Unknown pounce event. Please report this!"
+msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい！"
+
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+msgid "From last sent message"
+msgstr "最後にメッセージを送信した後"
+
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "しない"
+
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "待機中の時間を表示する"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "オフラインの仲間を表示する"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "タイムスタンプを表示する"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "メッセージを入力中であることを仲間に通知する"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "ログの書式"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "IM をログに記録する"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "チャットをログに記録する"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "ログの状態の変更イベント"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "会話ウィンドウ"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "ログの記録"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "設定"
-
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "まだ実装していません"
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
+msgid "Save File..."
+msgstr "ファイルの保存..."
+
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
+msgid "Open File..."
+msgstr "ファイルを開く..."
+
+#: ../finch/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "本当に %s さんを削除してもよろしいですか？"
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:138
 msgid "Delete Status"
 msgstr "状態の削除"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "保存した状態"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:931
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "題名"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "種類"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1227
-#: ../libgaim/protocols/jabber/jabber.c:1237
-#: ../libgaim/protocols/jabber/jabber.c:1247
-#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/jabber/jabber.c:1267
-#: ../libgaim/protocols/jabber/jabber.c:1279
-#: ../libgaim/protocols/novell/novell.c:2873
-#: ../libgaim/protocols/novell/novell.c:2976
-#: ../libgaim/protocols/novell/novell.c:2982
-#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/oscar/oscar.c:5501
-#: ../libgaim/protocols/oscar/oscar.c:5729
-#: ../libgaim/protocols/oscar/oscar.c:5741
-#: ../libgaim/protocols/oscar/oscar.c:5754
-#: ../libgaim/protocols/oscar/oscar.c:5761
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1233
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5463
+#: ../libpurple/protocols/oscar/oscar.c:5681
+#: ../libpurple/protocols/oscar/oscar.c:5695
+#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "メッセージ"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "使う"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "不正なタイトルです"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "ステータスのタイトルを空にしないで下さい"
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "タイトルが重複しています"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "別のタイトルを入力して下さい:"
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "サブステータス"
 
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
-msgid "Account:"
-msgstr "アカウント:"
-
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "状態:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "メッセージ"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "状態の編集"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:674
-#: ../libgaim/protocols/jabber/jabber.c:1195
-#: ../libgaim/protocols/msn/msn.c:547
-#: ../libgaim/protocols/novell/novell.c:2870
-#: ../libgaim/protocols/oscar/oscar.c:800
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:2655
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "状態"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "次のアカウントで別の状態を使用する"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "保存して使う"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:83
 msgid "Statuses"
 msgstr "状態"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "クリップボードのプラグイン"
+
+#: ../finch/plugins/gntclipboard.c:152
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"Gnt クリップボードの内容が変更されたら、その内容がＸで利用可能になります (可"
+"能であれば)。"
+
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s さんがサイン・インしました"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s さんがサイン・アウトしました"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s さんがメッセージを送信してきました"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s さんがあだ名を呼びました (%s)"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s さんがあなたにメッセージを送信しました (%s)"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "仲間がサイン・イン/アウトした時"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "IM を受け取る時"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "チャットで誰かがあなたを呼んだ時"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "チャットで誰かがあなたの名前を入力した時"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr "Notify with a toaster when"
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr "Beep too!"
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr "端末のウィンドウ属性が URGENT になった時"
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr "Gaim (端末版) の \"トースター\" プラグイン"
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+msgid "Toaster plugin"
+msgstr "\"トースター\" プラグイン"
 
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>%s さんと %s の会話</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "ログ機能は \"履歴プラグイン\" で必要です"
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1099,4624 +1421,230 @@ msgstr ""
 "インスタント・メッセージやチャットのログを記録しておくと、履歴プラグインの機"
 "能を利用できるようになります。"
 
-#: ../console/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "新しい会話を始める時に最近ログに記録した会話を挿入します"
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr "新しい会話を開始したら前回会話した最後のメッセージを先頭に追加します。"
 
-#: ../console/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "最後のログ"
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "最後のログ: 過去のログにある部分文字列を検索します"
 
-#: ../console/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr "Gaim (端末版) の最後のログ・プラグインです"
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "向き"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "トレイの向きです"
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "別名(_A)"
-
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "参加(_J)"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "タブを閉じる(_T)"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "IM(_M)"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "情報の取得(_G)"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "招待(_I)"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "変更(_M)"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "メールを開く(_O)"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "一時停止(_P)"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "ログインのオプション"
-
-#: ../gtk/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "別名:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:554
-msgid "User Options"
-msgstr "ユーザのオプション"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr "次の仲間アイコンを使用する:"
-
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:684
-#, c-format
-msgid "%s Options"
-msgstr "%s のオプション"
-
-#: ../gtk/gtkaccount.c:881
-msgid "Use GNOME Proxy Settings"
-msgstr "GNOME のプロキシ設定を使う"
-
-#: ../gtk/gtkaccount.c:882
-msgid "Use Global Proxy Settings"
-msgstr "グローバルなプロキシ設定を使う"
-
-#: ../gtk/gtkaccount.c:888
-msgid "No Proxy"
-msgstr "プロキシなし"
-
-#: ../gtk/gtkaccount.c:894
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:900
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:906
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "環境設定を使う"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:951
-msgid "If you look real closely"
-msgstr "近づいてよく見れば"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:954
-msgid "you can see the butterflies mating"
-msgstr "蝶が仲間になっているのが分かります"
-
-#: ../gtk/gtkaccount.c:975
-msgid "Proxy Options"
-msgstr "プロキシのオプション"
-
-#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "プロキシの種類(_T):"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "ホスト名(_H):"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "ポート番号(_P):"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "ユーザ名(_U):"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "パスワード(_S):"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "アカウントの追加"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "基本(_B)"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "拡張(_A)"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
-msgid "Register"
-msgstr "登録"
-
-#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
-msgid "Enabled"
-msgstr "有効"
-
-#: ../gtk/gtkaccount.c:1961
-msgid "Protocol"
-msgstr "プロトコル"
-
-#: ../gtk/gtkaccount.c:2133
-msgid ""
-"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-"<span size='larger' weight='bold'>Gaim へようこそ！</span>\n"
-"\n"
-"未だ IM 用のアカウントを設定していません。Gaim を使って接続を始める場合は下に"
-"ある <b>追加</b> ボタンをクリックして、アカウント情報を入力して下さい。Gaim "
-"を使って複数の IM アカウントに接続する場合は、各アカウント毎に <b>追加</b> ボ"
-"タンをクリックして設定して下さい。\n"
-"\n"
-"仲間リストのウィンドウにある <b>アカウント->追加/編集</b> メニューからも、こ"
-"の画面を開くことができます。"
-
-#: ../gtk/gtkaccount.c:2483
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s さんが %s さんを仲間リスト%s%s に追加したがっています"
-
-#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
-msgid "Authorize buddy?"
-msgstr "仲間として承認しますか？"
-
-#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
-msgid "Authorize"
-msgstr "承認する"
-
-#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
-msgid "Deny"
-msgstr "拒否する"
-
-#: ../gtk/gtkblist.c:709
-msgid "Join a Chat"
-msgstr "チャットに参加"
-
-#: ../gtk/gtkblist.c:730
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "参加するチャットについて適切な情報を入力して下さい。\n"
-
-#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
-msgid "_Account:"
-msgstr "アカウント(_A):"
-
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "拒否する(_B)"
-
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr "拒否しない(_B)"
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "情報の取得(_I)"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "ファイルの送信(_S)"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr "つかむ仲間の追加(_P)"
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "ログの表示(_L)"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "別名..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "別名(_A)..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "削除(_R)"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "仲間の追加(_B)"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "チャットの追加(_H)"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "グループの削除(_D)"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "名前の変更(_R)"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "自動参加"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr "畳む(_C)"
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr "広げる(_E)"
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "/ツール/ミュート"
-
-#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "現在、仲間の追加が可能なアカウントでサイン・インしていません。"
-
-#. Buddies menu
-#: ../gtk/gtkblist.c:2567
-msgid "/_Buddies"
-msgstr "/仲間(_B)"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "/仲間/新しいインスタント・メッセージ(_I)..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/仲間/チャットに参加(_C)..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/仲間/ユーザ情報の取得(_I)..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/仲間/ユーザ・ログの表示(_L)..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/仲間/オフラインの仲間を表示する(_O)"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/仲間/空グループを表示する(_E)"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/仲間/仲間の詳細を表示する(_D)"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/仲間/待機中の時間を表示する(_T)"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/仲間/仲間の並び替え(_S)"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/仲間/仲間の追加(_A)..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/仲間/チャットの追加(_H)..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/仲間/グループの追加(_G)..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/仲間/終了(_Q)"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/アカウント(_A)"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
-msgid "/Accounts/Add\\/Edit"
-msgstr "/アカウント/追加\\/編集"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/ツール(_T)"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/ツール/仲間をつかむ(_P)"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/ツール/プラグイン(_G)"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/ツール/設定(_E)"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/ツール/個人情報(_I)"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/ツール/ファイルの転送(_F)"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/ツール/チャットルームの一覧(_O)"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/ツール/システム・ログ(_L)"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/ツール/ミュート(_S)"
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/ヘルプ(_H)"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/ヘルプ/オンライン・ヘルプ(_H)"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/ヘルプ/デバッグ・ウィンドウ(_D)"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/ヘルプ/情報(_A)"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>アカウント:</b> %s"
-
-#: ../gtk/gtkblist.c:2722
-msgid "Buddy Alias"
-msgstr "仲間の別名"
-
-#: ../gtk/gtkblist.c:2743
-msgid "Logged In"
-msgstr "既にログインしています"
-
-#: ../gtk/gtkblist.c:2789
-msgid "Last Seen"
-msgstr "最後にお会いしたのは"
-
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1401
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
-#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
-#: ../libgaim/status.c:154
-msgid "Offline"
-msgstr "オフライン"
-
-#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "説明"
-
-#: ../gtk/gtkblist.c:2809
-msgid "Spooky"
-msgstr "不気味"
-
-#: ../gtk/gtkblist.c:2811
-msgid "Awesome"
-msgstr "サイコー"
-
-#: ../gtk/gtkblist.c:2813
-msgid "Rockin'"
-msgstr "グレイト！"
-
-#: ../gtk/gtkblist.c:3302
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "待機中 %dh %02dm"
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "待機中 %dm"
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "/仲間/新しいインスタント・メッセージ..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/仲間/チャットに参加..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/仲間/ユーザ情報の取得..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/仲間/仲間の追加..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/仲間/チャットの追加..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/仲間/グループの追加..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/ツール/仲間をつかむ"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/ツール/個人情報"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/ツール/チャットルームの一覧"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%2$s さんから %1$d個の未読のメッセージがあります\n"
-msgstr[1] "%2$s さんから %1$d個の未読のメッセージがあります\n"
-
-#: ../gtk/gtkblist.c:3654
-msgid "Manually"
-msgstr "手動"
-
-#: ../gtk/gtkblist.c:3656
-msgid "Alphabetically"
-msgstr "アルファベット順"
-
-#: ../gtk/gtkblist.c:3657
-msgid "By status"
-msgstr "状態順"
-
-#: ../gtk/gtkblist.c:3658
-msgid "By log size"
-msgstr "ログ・サイズ順"
-
-#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "%s さんは接続を切りました"
-
-#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
-msgid "Connect"
-msgstr "接続"
-
-#: ../gtk/gtkblist.c:3869
-msgid "Re-enable Account"
-msgstr "アカウントを再び有効にする"
-
-#: ../gtk/gtkblist.c:3890
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s さんは接続を切りました: %s</span>"
-
-#: ../gtk/gtkblist.c:4027
-msgid "<b>Username:</b>"
-msgstr "<b>ユーザ名</b>:"
-
-#: ../gtk/gtkblist.c:4034
-msgid "<b>Password:</b>"
-msgstr "<b>パスワード</b>:"
-
-#: ../gtk/gtkblist.c:4045
-msgid "_Login"
-msgstr "ログイン(_L)"
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/アカウント"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-"<span weight='bold' size='larger'>Gaim へようこそ！</span>\n"
-"\n"
-"まだアカウントを有効にしていません。<b>アカウント->追加/編集</b> メニューか"
-"ら <b>アカウント</b> ウィンドウを開いて IM のアカウントを有効にして下さい。ア"
-"カウントを有効にすると、サイン・インして状態をセットし仲間と話しができます。"
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/仲間/オフラインの仲間を表示する"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/仲間/空のグループを表示する"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/仲間/仲間の詳細を表示する"
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/仲間/待機中の時間を表示する"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "仲間"
-
-#: ../gtk/gtkblist.c:5207
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"仲間リストに追加したい相手のスクリーン名を入力して下さい。オプションで仲間の"
-"別名またはあだ名を入力できます。別名は可能な限りスクリーン名の代わりに表示さ"
-"れます。\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "グループ:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr "このプロトコルではチャット・ルームをサポートしていません。"
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "チャットが可能なプロトコルでサイン・インしていません。"
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"このチャットの別名と仲間リストに追加する際の妥当な情報を入力して下さい:\n"
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "追加するグループの名前を入力して下さい:"
-
-#: ../gtk/gtkblist.c:6299
-msgid "<GaimMain>/Accounts/"
-msgstr "<GaimMain>/アカウント/"
-
-#: ../gtk/gtkblist.c:6324
-msgid "_Edit Account"
-msgstr "アカウントの編集(_E)"
-
-#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr "利用可能なアクションはありません"
-
-#: ../gtk/gtkblist.c:6371
-msgid "_Disable"
-msgstr "無効にする(_D)"
-
-#: ../gtk/gtkblist.c:6383
-msgid "Enable Account"
-msgstr "アカウントを有効にする"
-
-#: ../gtk/gtkblist.c:6389
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr "<GaimMain>/アカウント/アカウントを有効にする"
-
-#: ../gtk/gtkblist.c:6438
-msgid "/Tools"
-msgstr "/ツール"
-
-#: ../gtk/gtkblist.c:6508
-msgid "/Buddies/Sort Buddies"
-msgstr "/仲間/仲間の並び替え"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"エラーを解決しアカウントをもう一度有効にするまで再接続しません。"
-
-#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "その仲間は、このチャットの同一プロトコル上にいません"
-
-#: ../gtk/gtkconv.c:786
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr "現在、その仲間を招待できるアカウントでサイン・インしていません"
-
-#: ../gtk/gtkconv.c:839
-msgid "Invite Buddy Into Chat Room"
-msgstr "仲間をチャット・ルームへ招待"
-
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:869
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
-
-#: ../gtk/gtkconv.c:890
-msgid "_Buddy:"
-msgstr "仲間(_B):"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "メッセージ(_M):"
-
-#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "ファイルを開けません"
-
-#: ../gtk/gtkconv.c:973
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>%s さんとの会話</h1>\n"
-
-#: ../gtk/gtkconv.c:997
-msgid "Save Conversation"
-msgstr "会話の保存"
-
-#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "検索"
-
-#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "検索する単語(_S):"
-
-#: ../gtk/gtkconv.c:1341
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "ログの記録を開始しました。これ以降の会話がログに記録されます。"
-
-#: ../gtk/gtkconv.c:1349
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "ログの記録を停止しました。これ以降の会話はログに記録されません。"
-
-#: ../gtk/gtkconv.c:1617
-msgid "Un-Ignore"
-msgstr "無視しない"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Ignore"
-msgstr "無視する対象"
-
-#: ../gtk/gtkconv.c:1640
-msgid "Get Away Message"
-msgstr "離席メッセージの取得"
-
-#: ../gtk/gtkconv.c:1663
-msgid "Last said"
-msgstr "最後のメッセージ:"
-
-#: ../gtk/gtkconv.c:2428
-msgid "Unable to save icon file to disk."
-msgstr "アイコン・ファイルを保存できません。"
-
-#: ../gtk/gtkconv.c:2498
-msgid "Save Icon"
-msgstr "アイコンの保存"
-
-#: ../gtk/gtkconv.c:2547
-msgid "Animate"
-msgstr "アニメーションを有効にする"
-
-#: ../gtk/gtkconv.c:2552
-msgid "Hide Icon"
-msgstr "アイコンを隠す"
-
-#: ../gtk/gtkconv.c:2555
-msgid "Save Icon As..."
-msgstr "アイコンを別名で保存..."
-
-#: ../gtk/gtkconv.c:2559
-msgid "Set Custom Icon..."
-msgstr "独自アイコンのセット..."
-
-#: ../gtk/gtkconv.c:2566
-msgid "Remove Custom Icon"
-msgstr "独自アイコンの削除"
-
-#. Conversation menu
-#: ../gtk/gtkconv.c:2707
-msgid "/_Conversation"
-msgstr "/会話(_C)"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/会話/新しいインスタント・メッセージ(_M)..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/会話/検索(_F)..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/会話/ログの表示(_L)"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/会話/別名で保存(_S)..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/会話/クリア(_R)"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/会話/ファイルの送信(_N)..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/会話/つかむ仲間に追加する(_P)..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/会話/情報の取得(_G)"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/会話/招待(_V)..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/会話/その他(_O)"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/会話/別名(_I)..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/会話/拒否(_B)..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/会話/追加(_A)..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/会話/削除(_R)..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/会話/リンクの挿入(_K)..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/会話/画像の挿入(_E)..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/会話/閉じる(_C)"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/オプション(_O)"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/オプション/ログを記録する(_L)"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/オプション/サウンドを有効にする(_S)"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/オプション/仲間アイコンを表示する(_I)"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/オプション/書式ツールバーを表示する(_T)"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/オプション/タイムスタンプを表示する(_M)"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/会話/その他(_O)"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/会話"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/会話/ログの表示"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/会話/ファイルの送信..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/会話/つかむ仲間に追加する..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/会話/情報の取得"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/会話/招待..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/会話/別名..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/会話/拒否..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/会話/追加..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/会話/削除..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/会話/リンクの挿入..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/会話/画像の挿入..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/オプション/ログを記録する"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/オプション/サウンドを有効にする"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/オプション/書式ツールバーを表示する"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/オプション/タイムスタンプを表示する"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/オプション/仲間アイコンを表示する"
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "ユーザが何か入力しています..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "ユーザは何か入力して一時停止中です"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "送信先(_S)"
-
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "送信する(_S)"
-
-#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
-msgid "Topic:"
-msgstr "トピック:"
-
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4115
-msgid "0 people in room"
-msgstr "誰もいません"
-
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "チャットルームに %d人にいます"
-msgstr[1] "チャットルームに %d人にいます"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "入力中です"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "入力を止めたようです"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr "Nick Said"
-
-#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "メッセージの送信"
-
-#: ../gtk/gtkconv.c:5876
-msgid "New Event"
-msgstr "新しいイベント"
-
-#: ../gtk/gtkconv.c:6997
-msgid "Confirm close"
-msgstr "クローズの確認"
-
-#: ../gtk/gtkconv.c:7029
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr ""
-"まだ未読のメッセージがあります。本当にウィンドウを閉じてもよろしいですか？"
-
-#: ../gtk/gtkconv.c:7564
-msgid "Close other tabs"
-msgstr "他のタブを閉じる"
-
-#: ../gtk/gtkconv.c:7570
-msgid "Close all tabs"
-msgstr "全てのタブを閉じる"
-
-#: ../gtk/gtkconv.c:7578
-msgid "Detach this tab"
-msgstr "このタブを取り外す"
-
-#: ../gtk/gtkconv.c:7584
-msgid "Close this tab"
-msgstr "このタブを閉じる"
-
-#: ../gtk/gtkconv.c:7855
-msgid "Close conversation"
-msgstr "会話ウィンドウを閉じます"
-
-#: ../gtk/gtkconv.c:8319
-msgid "Last created window"
-msgstr "最後に生成したウィンドウを再利用する"
-
-#: ../gtk/gtkconv.c:8321
-msgid "Separate IM and Chat windows"
-msgstr "IM とチャット・ウィンドウを分割する"
-
-#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
-msgid "New window"
-msgstr "新しいウィンドウで開く"
-
-#: ../gtk/gtkconv.c:8325
-msgid "By group"
-msgstr "グループ毎に共有する"
-
-#: ../gtk/gtkconv.c:8327
-msgid "By account"
-msgstr "アカウント毎に共有する"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "デバッグ・ログの保存"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr "結果を反転する"
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr "一致する単語を強調表示する"
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "アイコンのみ(_I)"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "ラベルのみ(_T)"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "両方(_B)"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr "フィルタ"
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "右クリックで追加オプションを表示します"
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "レベル"
-
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr "デバッグ・フィルタのレベルを選択して下さい:"
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "全て"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "その他"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "警告"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "エラー"
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "致命的なエラー"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "メインの開発者"
-
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
-msgid "developer"
-msgstr "開発者"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "開発者/ウェブマスタ"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "サポート"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "サポート/QA"
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "Win32 のポーティング"
-
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "メンテナ"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "libfaim のメンテナ"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
-msgid "hacker and designated driver [lazy bum]"
-msgstr "ハッカーと指定したドライバ [lazy bum]"
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber の開発者"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "オリジナルの作者"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "アラビア語"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "ブルガリア語"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "ベンガル語"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "ボスニア語"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "カタラン語"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "バレンシア-カタロニア語"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "チェコ語"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "デンマーク語"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "ドイツ語"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr "ゾンカ語"
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "ギリシア語"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "英語 (オーストラリア)"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "英語 (カナダ)"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "英語 (英国)"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "エスペラント語"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "スペイン語"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "エウシカラ (バスク語)"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "ペルシア語"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "フィンランド語"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "フランス語"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "ガルシア語"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "グジャラート語"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "ヒンズー語"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "イタリア語"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "日本語"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "グルジア語"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "韓国語"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr "クルド語"
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "リトアニア語"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "マケドニア語"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "ネパール語"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "オランダ/フランダース語"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "ノルウェー語"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "ポーランド語"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "ポルトガル語"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "ポルトガル・ブラジル語"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "ルーマニア語"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "ロシア語"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "セルビア語"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "スロバキア語"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "スロベニア語"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "アルバニア語"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "スウェーデン語"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "タミル語"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr "テルグ語"
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "タイ語"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "トルコ語"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "ベトナム語"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh と Gnome-Vi チーム"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "簡体字中国語"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "繁体字中国語"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr "アムハラ語"
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "Gaim について"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim は AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、SIP/SIMPLE、Novell "
-"GroupWise、Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコル"
-"を全て同時に利用できる、GTK+ ツールキットを採用したモジュール型のメッセージ・"
-"クライアントです。<BR><BR>GPL ライセンス (第二版、あるいはそれ以降の版) が定"
-"める条項の下で再頒布または変更することができます。GPL の複写が本 Gaim パッ"
-"ケージの中に 'COPYING' というファイル名として含まれています。Gaim のコピーラ"
-"イトはその貢献者に帰属します。この貢献者の詳細な一覧については 'COPYRIGHT' を"
-"御覧下さい。本プログラムは完全無保証です。<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #wingaim チャンネル<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #gaim チャンネル<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:359
-msgid "Current Developers"
-msgstr "現在の開発者"
-
-#: ../gtk/gtkdialogs.c:374
-msgid "Crazy Patch Writers"
-msgstr "Crazy なパッチの作者"
-
-#: ../gtk/gtkdialogs.c:389
-msgid "Retired Developers"
-msgstr "開発者 (旧バージョン)"
-
-#: ../gtk/gtkdialogs.c:404
-msgid "Current Translators"
-msgstr "翻訳者 (最新バージョン)"
-
-#: ../gtk/gtkdialogs.c:424
-msgid "Past Translators"
-msgstr "翻訳者 (旧バージョン)"
-
-#: ../gtk/gtkdialogs.c:442
-msgid "Debugging Information"
-msgstr "デバッグする際の参考情報"
-
-#: ../gtk/gtkdialogs.c:816
-msgid "Get User Info"
-msgstr "ユーザ情報の取得"
-
-#: ../gtk/gtkdialogs.c:818
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "情報を表示する相手のスクリーン名または別名を入力して下さい:"
-
-#: ../gtk/gtkdialogs.c:907
-msgid "View User Log"
-msgstr "ユーザ・ログの表示"
-
-#: ../gtk/gtkdialogs.c:909
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "ログを表示する相手のスクリーン名または別名を入力して下さい:"
-
-#: ../gtk/gtkdialogs.c:928
-msgid "Alias Contact"
-msgstr "コンタクトの別名"
-
-#: ../gtk/gtkdialogs.c:929
-msgid "Enter an alias for this contact."
-msgstr "このコンタクトの別名を入力して下さい:"
-
-#: ../gtk/gtkdialogs.c:949
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "%s の別名を入力して下さい:"
-
-#: ../gtk/gtkdialogs.c:951
-msgid "Alias Buddy"
-msgstr "仲間の別名"
-
-#: ../gtk/gtkdialogs.c:970
-msgid "Alias Chat"
-msgstr "チャットの別名"
-
-#: ../gtk/gtkdialogs.c:971
-msgid "Enter an alias for this chat."
-msgstr "このチャットの別名を入力して下さい:"
-
-#: ../gtk/gtkdialogs.c:1008
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
-"ろしいですか？"
-msgstr[1] ""
-"仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
-"ろしいですか？"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "コンタクトの削除"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "削除する(_R)"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"%s というグループと %s というグループを一つにまとめようとしています。続行して"
-"もよろしいですか？"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "グループの統合"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "グループを統合する(_M)"
-
-#: ../gtk/gtkdialogs.c:1105
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"仲間リストからグループ %s とそのメンバを削除しようとしています。続行してもよ"
-"ろしいですか？"
-
-#: ../gtk/gtkdialogs.c:1108
-msgid "Remove Group"
-msgstr "グループの削除"
-
-#: ../gtk/gtkdialogs.c:1109
-msgid "_Remove Group"
-msgstr "削除する(_R)"
-
-#: ../gtk/gtkdialogs.c:1142
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "仲間リストから %s を削除しようとしています。続行してもよろしいですか？"
-
-#: ../gtk/gtkdialogs.c:1145
-msgid "Remove Buddy"
-msgstr "仲間の削除"
-
-#: ../gtk/gtkdialogs.c:1146
-msgid "_Remove Buddy"
-msgstr "削除する(_R)"
-
-#: ../gtk/gtkdialogs.c:1167
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
-"か？"
-
-#: ../gtk/gtkdialogs.c:1170
-msgid "Remove Chat"
-msgstr "チャットの削除"
-
-#: ../gtk/gtkdialogs.c:1171
-msgid "_Remove Chat"
-msgstr "削除する(_R)"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr "さらに未読のメッセージを表示する場合は右クリックして下さい...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "状態の変更"
-
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2851
-#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
-msgid "Available"
-msgstr "在席しています"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:226
-#: ../libgaim/protocols/jabber/buddy.c:1407
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4498
-#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3353
-#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
-msgid "Away"
-msgstr "離席中"
-
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
-#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
-#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "隠れています"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr "仲間リストの表示"
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "新しいメッセージ..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "ミュート"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr "メッセージが届いたら点滅させる"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/gtkdocklet.c:567
-msgid "Quit"
-msgstr "終了"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f Kバイト/秒"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "開始していません"
-
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:1397
-#: ../libgaim/protocols/jabber/buddy.c:1414
-#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "不明"
-
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
-msgid "Finished"
-msgstr "完了しました"
-
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
-msgid "Canceled"
-msgstr "キャンセルしました"
-
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "転送開始を待っています"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "ファイル転送 - %d%% / %d個のファイル"
-
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "ファイルの転送"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>受信レート:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>受信元:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>送信先:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>送信レート:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr ""
-"この種類のファイルをオープンするために設定されたアプリケーションがありませ"
-"ん。"
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "ファイルをオープンする際にエラーが発生しました。"
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "%s を起動する際にエラー: %s"
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr "%s を実行する際にエラー"
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr "プロセスがエラー・コード %d を返してきました"
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "進捗"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "ファイル名"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "サイズ"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "残り"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "ファイル名:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "ローカル・ファイル:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "速度:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "経過時間:"
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "残り時間:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "転送が完了したらダイアログを閉じる(_F)"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "完了した転送をクリアする(_L)"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "ファイル転送の詳細(_D)"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "復帰(_R)"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "失敗しました"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "文字列として貼り付け(_T)"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "書式のリセット(_R)"
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "ハイパーリンクの色"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "ハイパーリンクを描画する色です"
-
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr "ハイパーリンク (prelight) の色"
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "ハイパーリンクの上にマウスをのせた時の色です"
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "E-メール・アドレスのコピー(_C)"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "リンク先をブラウザで開く(_O)"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "リンク先のコピー(_C)"
-
-#: ../gtk/gtkimhtml.c:3271
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>不明なファイルの種類</span>\n"
-"\n"
-"デフォルトの PNG 画像として扱います。"
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ファイルの種類が不明です。\n"
-"\n"
-"デフォルトの PNG 画像として扱います。"
-
-#: ../gtk/gtkimhtml.c:3287
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>画像を保存する際にエラー</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"画像を保存する際にエラー\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "画像の保存"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "画像の保存(_S)..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "フォントの選択"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "メッセージの色の選択"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "背景色の選択"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "URL(_U)"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "説明(_D)"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"挿入するリンクの URL とその説明を入力して下さい (説明はオプションです):"
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "挿入するリンクの URL を入力して下さい:"
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "リンクの挿入"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "挿入(_I)"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "画像の格納に失敗しました: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "画像の挿入"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "このテーマには利用可能なスマイリーがありません。"
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "スマイリー (顔文字) ！"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "太字にする"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "イタリックにする"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "下線を付ける"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "フォントのサイズを大きくします"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "フォントのサイズを小さくします"
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "フォントの種類"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "メッセージの色を変更します"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "背景色を変更します"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "書式をリセットします"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "リンクを挿入します"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "画像を挿入します"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "スマイリー (顔文字) を挿入します"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>%s での会話 (%s)</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>%s さんとの会話 (%s)</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%Y年%B"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"システム・イベントのログは、設定ダイアログで \"状態の変更を全てシステム・ログ"
-"に記録する\" が有効な場合にのみ記録します。"
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"インスタント・メッセージのログは、設定ダイアログで \"インスタント・メッセージ"
-"を全てログに記録する\" が有効な場合にのみ記録します。"
-
-#: ../gtk/gtklog.c:338
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"チャットのログは、設定ダイアログで \"チャットを全てシステム・ログに記録する"
-"\" が有効な場合にのみログを記録します。"
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "ログが見つかりませんでした"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr "ログ・フォルダの参照(_B)"
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "ログの合計サイズ:"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "%s さんとの会話"
-
-#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "%s さんとの会話"
-
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "システム・ログ"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "gaim %s (詳しい情報は `%s -h' と入力して下さい)\n"
-
-#: ../gtk/gtkmain.c:346
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"用法: %s [オプション]...\n"
-"\n"
-"  -c, --config=DIR    DIR にある設定ファイルを使用する\n"
-"  -d, --debug         デバッグ情報を標準出力に表示する\n"
-"  -h, --help          このヘルプを表示して終了する\n"
-"  -n, --nologin       自動的にサイン・インしない\n"
-"  -l, --login[=NAME]  自動的にサイン・インする (NAME にアカウント名を指定する"
-"と\n"
-"                      それを使用する - コンマで区切って複数指定することも"
-"可)\n"
-"  -v, --version       現在使用しているバージョンを表示して終了する\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-"セグメンテーション・フォルトが発生したため、Gaim が\n"
-"core ファイルの出力を試みました。これはソフトウェアの\n"
-"バグであり、ユーザの落ち度ではありません。\n"
-"\n"
-"この問題を再現できるのであれば、次のサイトから\n"
-"Gaim の開発者にバグとして報告して下さい:\n"
-"%sbug.php\n"
-"\n"
-"問題を再現するための手順と core ファイルからの\n"
-"バックトレース情報も添付して下さい。\n"
-"バックトレース情報の取得方法がわからない場合は\n"
-"次のサイトにある説明を参照してみて下さい:\n"
-"%sgdb.php\n"
-"\n"
-"さらにヘルプが必要なら、IM で\n"
-"SeanEgn 氏または LSchiere 氏 (共に AIM 経由) に\n"
-"声をかけてみて下さい。その他のプロトコル経由については\n"
-"次のサイトを参照してみて下さい:\n"
-"%scontactinfo.php\n"
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "全てのメッセージを開く"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります！</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "送信者"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s には %d通の新しいメッセージがあります。"
-msgstr[1] "%s には %d通の新しいメッセージがあります。"
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>%d通の新しいメールがあります</b>"
-msgstr[1] "<b>%d通の新しいメールがあります</b>"
-
-#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
-msgid "Search Results"
-msgstr "検索結果"
-
-#: ../gtk/gtknotify.c:899
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "ブラウザを起動するコマンド \"%s\" が正しくありません。"
-
-#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
-#: ../gtk/gtknotify.c:1054
-msgid "Unable to open URL"
-msgstr "URL を開けません"
-
-#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "\"%s\" を起動する際にエラー: %s"
-
-#: ../gtk/gtknotify.c:1055
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"ブラウザのコマンドを '手動設定' したようですが、コマンドが指定されていませ"
-"ん。"
-
-#: ../gtk/gtkplugin.c:264
-msgid "The following plugins will be unloaded."
-msgstr "次のプラグインを解放します。"
-
-#: ../gtk/gtkplugin.c:283
-msgid "Multiple plugins will be unloaded."
-msgstr "複数個のプラグインを解放します。"
-
-#: ../gtk/gtkplugin.c:285
-msgid "Unload Plugins"
-msgstr "プラグインの解放"
-
-#: ../gtk/gtkplugin.c:397
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">作者:</span> %s\n"
-"<span weight=\"bold\">配布元:</span> %s\n"
-"<span weight=\"bold\">ファイル名:</span> %s"
-
-#: ../gtk/gtkplugin.c:407
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">エラー: %s\n"
-"アップデートが提供されていないか配布元で確認して下さい。</span>"
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "プラグインの設定(_U)"
-
-#: ../gtk/gtkplugin.c:596
-msgid "<b>Plugin Details</b>"
-msgstr "<b>プラグインの詳細</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "ファイルの選択"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "つかむ仲間を入力して下さい。"
-
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr "新しい仲間をつかむ"
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr "つかむ仲間の編集"
-
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr "誰が仲間をつかむか..."
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "仲間の名前(_B):"
-
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "いつ仲間をつかむか..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "サイン・インした時(_G)"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "サイン・アウトした時(_F)"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "離席中になった時(_W)"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "離席中から戻った時(_U)"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "待機中になった時(_I)"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "待機中から復帰した時(_D)"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "仲間が入力し始めた時(_T)"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "入力を一旦停止した時(_A)"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "仲間が入力を止めた時(_Y)"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "メッセージを送信する時(_M)"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "つかんだら何をするか..."
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "会話ウィンドウを開く(_N)"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "ポップアップして通知する(_P)"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "メッセージを送信する(_M)"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "コマンドを実行する(_X)"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "サウンドを演奏する(_L)"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "参照(_E)..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "参照(_O)..."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "プレビュー(_V)"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "自分の状態を指定できない時にだけつかむ(_O)"
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "繰り返す(_R)"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "本当に %2$s さんを %1$s につかむ設定を削除してもよろしいですか？"
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr "つかむ相手"
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "繰り返す"
-
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "仲間をつかむ"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s さんが入力を開始しました (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "%s さんが入力を一停止しました (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s さんがサイン・インしました (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s さんが待機中から戻ってきました (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s さんが離席中から戻ってきました (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s さんが入力を停止しました (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s さんがサイン・アウトしました (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s さんが待機中になりました (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s さんが離席しました (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s さんがあなたにメッセージを送信しました (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい！"
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr "スマイリーのテーマを展開できませんでした"
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"下の一覧から使用するスマイリー (顔文字) のテーマを選択して下さい。この一覧の"
-"中へ新しいテーマをドラッグ＆ドロップするとインストールすることができます。"
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "アイコン"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "システム・トレイのアイコン"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "いつアイコンを表示するか...(_S):"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "離席中の時"
-
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
-#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
-#: ../libgaim/plugins/autoreply.c:360
-msgid "Never"
-msgstr "しない"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "メッセージが届いた時"
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "会話ウィンドウを隠す"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
-msgid "When away"
-msgstr "離席する時だけ"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "タブ"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "タブ付きのウィンドウの中に IM とチャットを表示する(_T)"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "タブに閉じるボタンを表示する(_U)"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "タブの位置(_P):"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "上側"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "下側"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "左側"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "右側"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "左側に縦向き"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "右側に縦向き"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "新しい会話ウィンドウ(_E):"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "受信したメッセージの書式を有効にして表示する(_F)"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "仲間アイコンを表示する(_I)"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "仲間アイコンのアニメーションを有効にする(_O)"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "メッセージを入力中であることを仲間に通知する(_N)"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "スペル間違いを強調表示する(_M)"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "スクロールを滑らかにする"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "デフォルトの書式"
-
-#: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"これは書式をサポートするプロトコルを利用する際に、送信したメッセージがどのよ"
-"うに表示されるかを示すものです :)"
-
-#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3701
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP-アドレス"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "STUN サーバ(_U):"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">例: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "IP-アドレスを自動的に検出する(_A)"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "パブリック IP(_I):"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "ポート"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "監視するポート番号の範囲を指定する(_M)"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "開始のポート番号(_S):"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "終了のポート番号(_E):"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "プロキシ・サーバ"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "プロキシなし"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "ユーザ名(_U):"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Opera"
-msgstr "Opera"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "GNOME Default"
-msgstr "GNOME のデフォルト"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../gtk/gtkprefs.c:1225
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1234
-msgid "Manual"
-msgstr "手動設定"
-
-#: ../gtk/gtkprefs.c:1287
-msgid "Browser Selection"
-msgstr "ブラウザの選択"
-
-#: ../gtk/gtkprefs.c:1291
-msgid "_Browser:"
-msgstr "ブラウザ(_B):"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "リンクを開く方法(_O):"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Browser default"
-msgstr "ブラウザの設定に従う"
-
-#: ../gtk/gtkprefs.c:1302
-msgid "Existing window"
-msgstr "既存のウィンドウで開く"
-
-#: ../gtk/gtkprefs.c:1304
-msgid "New tab"
-msgstr "新しいタブで開く"
-
-#: ../gtk/gtkprefs.c:1318
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"手動設定(_M):\n"
-"(URL は %s で指定)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "ログの書式(_F):"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "メッセージを全てログに記録する(_L)"
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr "チャットを全てログに記録する(_H)"
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr "状態の変更を全てログに記録する(_S)"
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "サウンドの選択"
-
-#: ../gtk/gtkprefs.c:1521
-msgid "Quietest"
-msgstr "一番静か"
-
-#: ../gtk/gtkprefs.c:1523
-msgid "Quieter"
-msgstr "まあまあ静か"
-
-#: ../gtk/gtkprefs.c:1525
-msgid "Quiet"
-msgstr "静か"
-
-#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "標準"
-
-#: ../gtk/gtkprefs.c:1529
-msgid "Loud"
-msgstr "大きい"
-
-#: ../gtk/gtkprefs.c:1531
-msgid "Louder"
-msgstr "まあまあ大きい"
-
-#: ../gtk/gtkprefs.c:1533
-msgid "Loudest"
-msgstr "一番大きい"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "サウンド出力の方法"
-
-#: ../gtk/gtkprefs.c:1597
-msgid "_Method:"
-msgstr "方法(_M):"
-
-#: ../gtk/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "ビープ音"
-
-#: ../gtk/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "自動選択"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "Command"
-msgstr "コマンド指定"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "No sounds"
-msgstr "サウンドなし"
-
-#: ../gtk/gtkprefs.c:1613
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"サウンド・コマンド(_O)\n"
-"(ファイル名は %s で指定)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "サウンドのオプション"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
-
-#: ../gtk/gtkprefs.c:1642
-msgid "Enable sounds:"
-msgstr "いつサウンドを有効にするか...:"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "在席している時だけ"
-
-#: ../gtk/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "不在の時だけ"
-
-#: ../gtk/gtkprefs.c:1653
-msgid "Volume:"
-msgstr "音量:"
-
-#: ../gtk/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "イベント毎のサウンド"
-
-#: ../gtk/gtkprefs.c:1732
-msgid "Play"
-msgstr "演奏"
-
-#: ../gtk/gtkprefs.c:1739
-msgid "Event"
-msgstr "イベント"
-
-#: ../gtk/gtkprefs.c:1758
-msgid "Test"
-msgstr "テスト"
-
-#: ../gtk/gtkprefs.c:1762
-msgid "Reset"
-msgstr "リセット"
-
-#: ../gtk/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "選択..."
-
-#: ../gtk/gtkprefs.c:1809
-msgid "_Report idle time:"
-msgstr "いつ待機時間を報告するか...(_R):"
-
-#: ../gtk/gtkprefs.c:1812
-msgid "From last sent message"
-msgstr "最後にメッセージを送信した後"
-
-#: ../gtk/gtkprefs.c:1814
-msgid "Based on keyboard or mouse use"
-msgstr "キーボードやマウスを操作し始めた時"
-
-#: ../gtk/gtkprefs.c:1823
-msgid "_Auto-reply:"
-msgstr "自動応答(_A):"
-
-#: ../gtk/gtkprefs.c:1827
-msgid "When both away and idle"
-msgstr "離席中で待機中の時"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1833
-msgid "Auto-away"
-msgstr "自動離席"
-
-#: ../gtk/gtkprefs.c:1835
-msgid "Change status when _idle"
-msgstr "待機中になったら状態を変更する(_I)"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "状態を変更するまでの時間(分)(_M):"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "次の状態に変更する(_S):"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1868
-msgid "Status at Startup"
-msgstr "起動時の状態"
-
-#: ../gtk/gtkprefs.c:1870
-msgid "Use status from last _exit at startup"
-msgstr "最後に終了した時の状態を継承する(_E)"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "起動時に適用する状態(_P):"
-
-#: ../gtk/gtkprefs.c:1914
-msgid "Interface"
-msgstr "インタフェース"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Smiley Themes"
-msgstr "顔文字のテーマ"
-
-#: ../gtk/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "サウンド"
-
-#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "ネットワーク"
-
-#: ../gtk/gtkprefs.c:1923
-msgid "Browser"
-msgstr "ブラウザ"
-
-#: ../gtk/gtkprefs.c:1927
-msgid "Status / Idle"
-msgstr "状態/待機"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "全てのユーザからのコンタクトを許可する"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "仲間リストに登録されているユーザのみ許可する"
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "次のユーザのみ許可する"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "全てのユーザを拒否する"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "次のユーザのみ拒否する"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "個人情報"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "個人情報の設定はすぐに反映されます。"
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "設定する個人情報:"
-
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "許可するユーザ"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "コンタクトを許可するユーザを入力して下さい。"
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "コンタクトを許可したいユーザの名前を入力して下さい。"
-
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "許可する(_P)"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "%s さんからのコンタクトを許可しますか？"
-
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "本当に %s さんにコンタクトを許可しますか？"
-
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "ユーザの拒否"
-
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "拒否するユーザを入力して下さい。"
-
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "拒否したいユーザの名前を入力して下さい。"
-
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "%s さんを拒否しますか？"
-
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "本当に %s さんを拒否しますか？"
-
-#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
-#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "はい"
-
-#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
-#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-msgid "No"
-msgstr "いいえ"
-
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "適用"
-
-#: ../gtk/gtkrequest.c:1469
-msgid "That file already exists"
-msgstr "既にそのファイルは存在します"
-
-#: ../gtk/gtkrequest.c:1470
-msgid "Would you like to overwrite it?"
-msgstr "上書きしてもよろしいですか？"
-
-#: ../gtk/gtkrequest.c:1471
-msgid "Overwrite"
-msgstr "上書きする"
-
-#: ../gtk/gtkrequest.c:1472
-msgid "Choose New Name"
-msgstr "別の名前を付ける"
-
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
-msgid "Save File..."
-msgstr "ファイルの保存..."
-
-#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
-msgid "Open File..."
-msgstr "ファイルを開く..."
-
-#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
-msgid "Select Folder..."
-msgstr "フォルダの選択..."
-
-#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
-msgid "_Add"
-msgstr "追加(_A)"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "ルームの一覧"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "一覧の取得(_G)"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "チャットの追加(_A)"
-
-#: ../gtk/gtksavedstatuses.c:331
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "本当に選択した保存済みの状態を削除してもよろしいですか？"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
-msgid "_Use"
-msgstr "使う(_U)"
-
-#: ../gtk/gtksavedstatuses.c:725
-msgid "Title already in use.  You must choose a unique title."
-msgstr "その題名は既に使用中です。重複しない題名を選択して下さい。"
-
-#: ../gtk/gtksavedstatuses.c:913
-msgid "Different"
-msgstr "別の状態"
-
-#: ../gtk/gtksavedstatuses.c:1106
-msgid "_Title:"
-msgstr "題名(_T):"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "状態(_S):"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "同じアカウントで別の状態を利用する(_D)"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "保存して使う(_V)"
-
-#: ../gtk/gtksavedstatuses.c:1427
-#, c-format
-msgid "Status for %s"
-msgstr "%s の状態"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "仲間がログインしました"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "仲間がログアウトしました"
-
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "メッセージを受信しました"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "受信したメッセージと会話と開始しました"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "メッセージを送信しました"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "チャットに参加してきました"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "チャットから離れました"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "チャットで話しました"
-
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "他の人がチャットで話しました"
-
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "チャットで誰かがあなたを呼びました"
-
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer のエラー"
-
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer の初期化に失敗しました"
-
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1021
-#: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2183
-#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
-#: ../libgaim/protocols/sametime/sametime.c:3742
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1621
-msgid "Connecting"
-msgstr "接続中です"
-
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "ネットワークの接続待ちです"
-
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "%s を読み込む際に次のエラーが発生しました: %s"
-
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "画像の読み込みに失敗しました"
-
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "フォルダ %s は転送できません"
-
-#: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"Gaim ではフォルダそのものを転送できません。ファイルを別個に転送して下さい。"
-
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "ドラッグしたのは画像です"
-
-#: ../gtk/gtkutils.c:1441
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
-"のユーザの仲間アイコンに利用できます。"
-
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr "仲間アイコンにする"
-
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "ファイルとして転送する"
-
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "メッセージの中に埋め込む"
-
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "このユーザの仲間アイコンとして画像をセットしてもよろしいですか？"
-
-#: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
-"のユーザの仲間アイコンに利用できます。"
-
-#: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"この画像をメッセージの中に埋め込んだり、このユーザの仲間アイコンに利用できま"
-"す"
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../gtk/gtkutils.c:1511
-msgid "Cannot send launcher"
-msgstr "ランチャは転送できません"
-
-#: ../gtk/gtkutils.c:1511
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
-"ンチャが指しているオブジェクトを転送したいのでしょう。"
-
-#: ../gtk/gtkutils.c:2343
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>ファイル:</b> %s\n"
-"<b>サイズ:</b> %s\n"
-"<b>画像のサイズ:</b> %dx%d"
-
-#. Label
-#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
-#: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:618
-msgid "Buddy Icon"
-msgstr "仲間アイコン"
-
-#: ../gtk/gtkutils.c:2653
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-"ファイル '%s' は %s では大きすぎます。もっと小さい画像でトライしてみて下さ"
-"い。\n"
-
-#: ../gtk/gtkutils.c:2655
-msgid "Icon Error"
-msgstr "アイコンのエラー"
-
-#: ../gtk/gtkutils.c:2656
-msgid "Could not set icon"
-msgstr "アイコンを送信できませんでした"
-
-#: ../gtk/gtkutils.c:2757
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "ファイル '%s' を開けませんでした: %s"
-
-#: ../gtk/gtkutils.c:2806
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"画像 '%s' の読み込みに失敗しました: 原因は不明ですが、おそらく画像ファイルが"
-"壊れているようです"
-
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "ファイルの保存"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "色の選択"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "統計情報"
-
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "応答の見込み"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "統計情報の設定"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr "最大応答のタイムアウト:"
-
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
-msgid "minutes"
-msgstr "分間"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr "最大 last-seen difference:"
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "しきい値:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/cap/cap.c:931
-msgid "Contact Availability Prediction"
-msgstr "コンタクトの可能性の予測"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr "仲間と会話する可能性を予測するプラグインです"
-
-#. *  summary
-#: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"コンタクトの可能性を予測するプラグイン (CAP) を使って仲間と会話した統計情報か"
-"ら経験値を表示します。"
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "待機中の仲間"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "離席中の仲間"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "\"長時間\" 離席中の仲間"
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "移動中の仲間"
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "オフラインの仲間"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "状態別のスコア"
-
-#: ../gtk/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr "<i>一番大きなスコア</i> を持つ仲間がコンタクトの中で優先されます。\n"
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "スコアが同じ値の時は最後の仲間を優先する"
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "アカウント別のスコア"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "コンタクトの優先度"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "仲間のいろいろな状態に合わせて優先度を調節できます"
-
-#. *< description
-#: ../gtk/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"コンタクトの優先度を計算する時に仲間の状態 (待機中/離席中/オフラインなど) の"
-"スコアを変更できます。"
-
-#: ../gtk/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "メッセージの色"
-
-#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "会話ウィンドウの中に表示するメッセージの色をカスタマイズします"
-
-#: ../gtk/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "エラー・メッセージ"
-
-#: ../gtk/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "強調表示したメッセージ"
-
-#: ../gtk/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "システムのメッセージ"
-
-#: ../gtk/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "送信したメッセージ"
-
-#: ../gtk/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "受信したメッセージ"
-
-#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "%s に使用する色の選択"
-
-#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1532
-msgid "General"
-msgstr "全般"
-
-#: ../gtk/plugins/convcolors.c:301
-msgid "Ignore incoming format"
-msgstr "受信したメッセージの書式を無視する"
-
-#: ../gtk/plugins/convcolors.c:302
-msgid "Apply in Chats"
-msgstr "チャットに適用する"
-
-#: ../gtk/plugins/convcolors.c:303
-msgid "Apply in IMs"
-msgstr "IM のメッセージに適用する"
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "会話の回数順に並べる"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "会話タブの配置"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "ウィンドウ毎の会話タブの数"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "会話タブを番号順に配置する時に IM とチャット・ウィンドウを分割する"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "会話タブの配置"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "会話タブを追加する時のオプションです"
-
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"会話ウィンドウ毎に会話タブの個数を制限し、オプションで IM とチャットのウィン"
-"ドウを分割します。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim のデモ・プラグイン"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "いろいろなことを実行するサンプル・プラグインです (説明をご覧下さい)"
-
-#. *  description
-#: ../gtk/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"これはいろいろなことを実行する、ホントにクールなプラグインです:\n"
-"- ログインしたらプログラムの作者を伝えてくれます\n"
-"- 受信した全てのテキストを反転します\n"
-"- サイン・インしたら仲間リストの人たちにメッセージを速攻で送信します"
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "カーソルの色"
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "二番目のカーソルの色"
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "ハイパーリンクの色"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView のエキスパンダの大きさ"
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView の水平方向のセパレータ"
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "メッセージの文字"
-
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "会話履歴の文字"
-
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "ログ・ビューアの文字"
-
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "質問ダイアログの文字"
-
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "通知ダイアログの文字"
-
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView のエキスパンダを字下げして描画する"
-
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "色の選択"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "%s に使用するフォントの選択"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "フォントの選択"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
-msgstr "GTK+ インタフェースで使用するフォント"
-
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ テキストのショートカットのテーマ"
-
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "インタフェースの色"
-
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "ウィジットの大きさ"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "フォント"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "ツール"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "これらの設定を \"%s%sgtkrc-2.0\" に書き込む"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "この \"gtkrc\" ファイルを読み込む"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "GTK+ テーマのカスタマイズ"
-
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "\"gtkrc\" の設定にアクセスする機能を提供します"
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "マウス・ジェスチャの設定"
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "マウスの中ボタン"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "マウスの右ボタン"
-
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "ジェスチャを視覚的に表示する(_V)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "マウス・ジェスチャ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "マウス・ジェスチャの機能を提供します"
-
-#. *  description
-#: ../gtk/plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"会話ウィンドウでマウス・ジェスチャの機能を提供します。\n"
-"次のアクションを実行する場合は、マウスの中ボタンをドラッグして下さい:\n"
-"\n"
-"下→右にドラッグすると会話を閉じます。\n"
-"上→左にドラッグすると前の会話に移動します。\n"
-"上→右にドラッグすると次の会話に移動します。"
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "インスタント・メッセンジャー"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
-msgid "Select a person from your address book below, or add a new person."
-msgstr "下のアドレス帳から仲間を選択するか、または仲間を新規に追加して下さい:"
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1760
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
-#: ../libgaim/protocols/qq/sys_msg.c:250
-#: ../libgaim/protocols/sametime/sametime.c:5621
-msgid "Search"
-msgstr "検索"
-
-#. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
-#: ../gtk/plugins/gevolution/assoc-buddy.c:469
-#: ../gtk/plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "新しい仲間"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "仲間の選択"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"アドレス帳から追加する仲間を選択するか、または新しい仲間を作成して下さい:"
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "ユーザの詳細(_D)"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "仲間との連携(_A)"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1162
-msgid "None"
-msgstr "なし"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "E-メールを送信できません"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr "環境変数 PATH の中から Evolution の実行形式が見つかりませんでした。"
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr "この仲間の E-メール・アドレスがありません"
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "アドレス帳へ追加する"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "E-メールを送信する"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Evolution との連携の設定"
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "自動的に仲間として追加するアカウントを全て選択して下さい:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Evolution との連携"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Evolution との連携機能を提供します"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "ユーザ情報を入力して下さい。"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "仲間のスクリーン名とアカウントの種類を入力して下さい。"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "アカウントの種類:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "追加の情報:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "名:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "姓:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-メール:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK シグナルのテスト"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "全ての UI シグナルが正常に動作しているかテストします"
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "履歴"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "離席時にアイコン化"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "席を離れたら仲間リストと会話ウィンドウをアイコン化します"
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "メール・チェッカ"
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "新しいローカル・メールをチェックします"
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"新着メールがあれば、それを表示するための小さな箱を仲間リストへ追加します。"
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "下線の付与"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "会話ウィンドウの中にある新着メッセージに下線を描画します"
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "下線を付与する場所"
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "IM ウィンドウ(_I)"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "チャット・ウィンドウ(_H)"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"楽曲メッセージのセッションを要求しました。受け入れる場合は MM アイコンをク"
-"リックして下さい。"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "楽曲メッセージのセッションに入りました。"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "楽曲メッセージ"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "実行中のコマンドで衝突が起りました:"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "エディタの起動エラー"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "次のエラーが発生しました:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "楽曲メッセージの設定"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "スコア・エディタのパス名:"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "適用(_A)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "コラボレートするための楽曲メッセージ・プラグインです"
-
-#. *  summary
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"リアルタイムで共通スコアを編集することにより、複数の仲間との間で、楽曲を一部"
-"分を同時に演奏することを可能にする楽曲メッセージのプラグインです。"
-
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:670
-msgid "Notify For"
-msgstr "通知先"
-
-#: ../gtk/plugins/notify.c:689
-msgid "\t_Only when someone says your screen name"
-msgstr "\t誰かがあなたのスクリーン名を呼んだ時だけ(_O)"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "フォーカスしたウィンドウ(_F)"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "通知方法"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "文字列をウィンドウ・タイトルの先頭に追加する(_S):"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "新しいメッセージ数をウィンドウのタイトルに挿入する(_O)"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "新しいメッセージ数をＸのプロパティに挿入する(_X)"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "ウィンドウ・マネージャに \"URGENT (緊急)\" ヒントをセットする(_U)"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "会話ウィンドウを前面に出す(_A)"
-
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:767
-msgid "Notification Removal"
-msgstr "通知を削除する時期"
-
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:772
-msgid "Remove when conversation window _gains focus"
-msgstr "会話ウィンドウがフォーカスされたら(_G)"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "会話ウィンドウをクリックしたら(_R)"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "会話ウィンドウで何か入力したら(_T)"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "メッセージを送信したら(_M)"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "会話ウィンドのタブが切り替わったら(_B)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "メッセージの通知"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "未読メッセージを通知するいろいろな方法を提供します"
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "生データ"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "生データをテキスト形式のプロトコルに送信できます"
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"入力した生データをテキスト形式のプロトコル (Jabber, MSN, IRC, TOC) へ送信でき"
-"ます。送信する際は入力ボックスの中で [ENTER] キーを押して下さい。デバッグ・"
-"ウィンドウで送信内容を監視して下さい。"
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "お使いのバージョンは %s です。最新バージョンは %s です。<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>変更履歴:</b>\n"
-"%s<br><br>"
-
-#: ../gtk/plugins/relnot.c:80
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"バージョン %s は次のサイトから入手できます:<br><a href=\"http://gaim."
-"sourceforge.net/\">http://gaim.sourceforge.net</a>"
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "最新バージョンのお知らせ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "リリース通知"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "最新リリースの情報を周期的にチェックします"
-
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"最新リリースを周期的にチェックして変更履歴 (ChangeLog) をユーザに通知します。"
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "文字列が重複しています"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "指定した文字列は既に一覧にあります"
-
-#: ../gtk/plugins/spellchk.c:2180
-msgid "Text Replacements"
-msgstr "文字列の置換"
-
-#: ../gtk/plugins/spellchk.c:2203
-msgid "You type"
-msgstr "入力した文字列"
-
-#: ../gtk/plugins/spellchk.c:2217
-msgid "You send"
-msgstr "実際に送信する文字列"
-
-#: ../gtk/plugins/spellchk.c:2231
-msgid "Whole words only"
-msgstr "単語だけ"
-
-#: ../gtk/plugins/spellchk.c:2243
-msgid "Case sensitive"
-msgstr "大/小文字を区別する"
-
-#: ../gtk/plugins/spellchk.c:2269
-msgid "Add a new text replacement"
-msgstr "新しい置換の追加"
-
-#: ../gtk/plugins/spellchk.c:2285
-msgid "You _type:"
-msgstr "入力した文字列(_T):"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "実際に送信する文字列(_S):"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2314
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "大/小文字を区別する(_E)"
-
-#: ../gtk/plugins/spellchk.c:2316
-msgid "Only replace _whole words"
-msgstr "単語が一致した時に置換する(_W)"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "一般的な文字列の置換オプション"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "送信時にまとめて置換する"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "メッセージの置換"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "ユーザが定義した規則に従って、実際に送信するメッセージを書き換えます"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "仲間表示器"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "仲間リストを水平方向にスクロールするバージョンです"
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "タイムスタンプを表示する間隔"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "タイムスタンプ"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "iChat 形式のタイムスタンプを表示します"
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "iChat 形式のタイムスタンプを N分おきに会話の中に挿入します"
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "タイムスタンプの書式オプション"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "強制的に 24時間制にする(_F)"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "表示する条件:"
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "会話ウィンドウ(_N):"
-
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "メッセージが遅延した時"
-
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "メッセージが遅延しかつチャットの時"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "メッセージのログ(_M):"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "メッセージ・タイムスタンプの書式"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "メッセージに付与するタイムスタンプの書式をカスタマイズします"
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"このプラグインを使えば、会話やログのメッセージに付与するタイムスタンプの書式"
-"をカスタマイズできます。"
-
-#: ../gtk/plugins/xmppconsole.c:665
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>サインアウトしました</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/xmppconsole.c:745 ../gtk/plugins/xmppconsole.c:841
-#: ../gtk/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "XMPP のコンソール"
-
-#: ../gtk/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "アカウント: "
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "Lastlog のプラグインです"
 
-#: ../gtk/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>XMPP に接続していません</font>"
-
-#: ../gtk/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/> スタンザを挿入します"
-
-#: ../gtk/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> スタンザを挿入します"
-
-#: ../gtk/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "<message/> スタンザを挿入します"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr "低レベルの XMPP スタンザを送信したり受信します"
-
-#. *  description
-#: ../gtk/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "不透明度:"
-
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "IM の会話ウィンドウ"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "会話ウィンドウの透明度(_I)"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "会話ウィンドウの中にスライダ・バーを表示する(_S)"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "フォーカスされたら会話ウィンドウの透明度を解除する"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "常に前面に配置する"
-
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "仲間リストのウィンドウ"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "仲間リストの透明度(_B)"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "フォーカスされたら仲間リストの透明度を解除する"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "透明度"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "仲間リストと会話ウィンドウを段階的に透明化します"
-
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"このプラグインは可変式α透過を使って仲間リストと会話ウィンドウを透明にしま"
-"す。\n"
-"\n"
-"* 注記: このプラグインは Windows 2000 以上で動作します。"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ ラインタイムのバージョン"
-
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "スタートアップ"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr "Windows スタートアップで Gaim を起動する(_S)"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr "仲間リストを格納式にする(_D)"
-
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "仲間リストを前面に配置したままにする(_K):"
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
-msgstr "格納した時にだけ"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr "チャットでメッセージを受け取ったらウィンドウを点滅させる(_F)"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "WinGaim のオプション"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "Windows 版 Gaim 専用のオプション機能を提供します"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr ""
-"Windows 版の Gaim に特化したオプション機能 (会話ウィンドウの組み込みなど) を"
-"提供します"
-
-#: ../libgaim/account.c:769
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "アカウント"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "サイン・インするにはパスワードが必要です。"
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "%s (%s) のパスワードを入力して下さい"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "パスワードの入力"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "パスワードの保存"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "プロトコル %s のプラグインがありません"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1317
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "New passwords do not match."
 msgstr "新しいパスワードが一致しません。"
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "全てのフィールドを完全に埋めて下さい。"
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "元のパスワード"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "新しいパスワード (確認用)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "%s のパスワードの変更"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "現在使用しているパスワードと新しいパスワードを入力して下さい。"
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "%s のユーザ情報の変更"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "ユーザ情報のセット"
 
-#: ../libgaim/blist.c:548
-msgid "buddy list"
-msgstr "仲間リスト"
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "不明"
 
-#: ../libgaim/blist.c:1919
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d個のアカウントが無効またはオフライン状態のため、そのアカウントをグループ %"
-"s から削除できませんでした。その仲間とグループは削除しません。\n"
-msgstr[1] ""
-"%d個のアカウントが無効またはオフライン状態のため、それらのアカウントをグルー"
-"プ %s から削除できませんでした。それらの仲間とグループは削除しません。\n"
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5201 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "仲間"
 
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "グループを削除できません"
+#: ../libpurple/blist.c:550
+msgid "buddy list"
+msgstr "仲間リスト"
 
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "登録エラー"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s さんがサイン・インしました"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s さんがサイン・アウトしました"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "原因不明のエラー"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "メッセージの送信に失敗: メッセージが長すぎます"
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "%s さんにメッセージを送信できません"
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr "メッセージが長すぎます"
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr "メッセージを送信できません"
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1160
 msgid "Send Message"
 msgstr "メッセージの送信"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1163
 msgid "_Send Message"
 msgstr "メッセージの送信(_S)"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
 msgstr "%s さんがチャットルームに入りました"
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] さんがチャットルームに入りました"
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
 msgstr "あなたは %s と認識されました"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s さんは %s と認識されました"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1767
 #, c-format
 msgid "%s left the room."
 msgstr "%s さんがチャットルームから退室しました"
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s さんがチャットルーム (%s) から退室しました"
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "名前なし"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "新しい接続を開けません: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "名前の取得に失敗しました: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "サーバ名の取得に失敗しました: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple の D-BUS サーバが次に示す理由で起動されていません:"
+
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "名前なし"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "新しいレゾルバ・プロセスを生成できません\n"
 
-#: ../libgaim/dnsquery.c:496
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr "レゾルバ・プロセスに要求を出せません\n"
 
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -5725,13 +1653,13 @@ msgstr ""
 "%s を解決する際にエラー:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "%s を解決する際にエラー: %d"
 
-#: ../libgaim/dnsquery.c:554
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -5740,20 +1668,20 @@ msgstr ""
 "レゾルバ・プロセスから読み込む際にエラー:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:558
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr "レゾルバ・プロセスから読み込んでいる際に EOF"
 
-#: ../libgaim/dnsquery.c:735
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "スレッドの生成に失敗しました: %s"
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "原因は不明です"
 
-#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5762,7 +1690,7 @@ msgstr ""
 "%s を読み込む際にエラー: \n"
 "%s\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5771,7 +1699,7 @@ msgstr ""
 "%s へ書き込む際にエラー: \n"
 "%s\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5780,39 +1708,39 @@ msgstr ""
 "%s にアクセスする際にエラー:\n"
 "%s\n"
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:248
 msgid "Directory is not writable."
 msgstr "ディレクトリに書き込む権限がありません"
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 バイトのファイルは送信できません。"
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:273
 msgid "Cannot send a directory."
 msgstr "フォルダは送信できません。"
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:282
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s は妥当なファイルではありません。上書きを拒否することにします。\n"
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s さんが %s (%s) を送信したがっています"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s さんがファイルを転送したがっています"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "%s さんからのファイル転送要求を承諾しますか？"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5823,136 +1751,136 @@ msgstr ""
 "リモート・ホスト: %s\n"
 "リモート・ポート: %d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s さんがファイル %s の送信を要求しています"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s は正しいファイル名ではありません。\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s を %s へ送信する旨を伝えています"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s を %s から転送を開始しています"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "ファイル %s の転送が完了しました"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "ファイルの転送が完了しました"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s の転送をキャンセルしました"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "ファイルの転送がキャンセルされました"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s さんは %s の転送をキャンセルしました"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s さんはファイルの転送をキャンセルしました"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "%s へのファイルの転送が失敗しました。"
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "%s からのファイルの転送が失敗しました。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "端末からコマンドを起動する"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "\"aim\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "\"gg\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "\"icq\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "\"irc\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
 "\"msnim\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "\"sip\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
 "\"xmpp\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
 "\"ymsgr\" の URL を処理する際に使用するコマンドです (利用可能であれば)。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "\"aim\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "\"icq\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "\"irc\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "\"msnim\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "\"sip\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "\"xmpp\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "\"ymsgr\" 向けのハンドラ"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -5960,7 +1888,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"aim\" の URL を処理する場合は TRUE で"
 "す。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -5968,7 +1896,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"gg\" の URL を処理する場合は TRUE で"
 "す。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -5976,7 +1904,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"icq\" の URL を処理する場合は TRUE で"
 "す。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -5984,7 +1912,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"irc\" の URL を処理する場合は TRUE で"
 "す。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -5992,7 +1920,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"msnim\" の URL を処理する場合は TRUE "
 "です。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -6000,7 +1928,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"sip\" の URL を処理する場合は TRUE で"
 "す。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -6008,7 +1936,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"xmpp\" の URL を処理する場合は TRUE で"
 "す。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -6016,7 +1944,7 @@ msgstr ""
 "\"command\" キーで指定したコマンドで \"ymsgr\" の URL を処理する場合は TRUE "
 "です。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -6024,63 +1952,63 @@ msgstr ""
 "この種類の URL を処理するために使用するコマンドを端末から起動する場合は TRUE "
 "です。"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "指定したコマンドで \"aim\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "指定したコマンドで \"gg\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "指定したコマンドで \"icq\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "指定したコマンドで \"irc\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "指定したコマンドで \"msnim\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "指定したコマンドで \"sip\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "指定したコマンドで \"xmpp\" の URL を処理するかどうか"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "指定したコマンドで \"ymsgr\" の URL を処理するかどうか"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">ログ記録には読み込み関数がありません</font></b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML 形式"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "通常のテキスト"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "古い Gaim"
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr "古い形式"
 
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:732
 msgid "Logging of this conversation failed."
 msgstr "このメッセージのログを記録できませんでした"
 
-#: ../libgaim/log.c:1041
+#: ../libpurple/log.c:1175
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
+#: ../libpurple/log.c:1251
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6089,7 +2017,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6098,47 +2026,44 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>ログ・ファイルが見つかりません！</b></font>"
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>ファイルを読み込めませんでした: %s</b></font>"
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "原因不明のエラー"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s を使用していますが、このプラグインには %s が必要です。"
 
-#: ../libgaim/plugin.c:434
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr "このプラグインは ID を定義していません。"
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "プラグインのマジック番号 (%d) が一致しません: 要マジック番号 %d"
 
-#: ../libgaim/plugin.c:451
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI のバージョン番号 (%d.%d.x) が一致しません: 要バージョン %d.%d.x"
 
-#: ../libgaim/plugin.c:468
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "プラグインが必要な全ての関数を実装していません"
 
-#: ../libgaim/plugin.c:533
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -6147,90 +2072,89 @@ msgstr ""
 "要求されたプラグイン %s が見つかりませんでした。このプラグインをインストール"
 "して、もう一度実行して下さい。"
 
-#: ../libgaim/plugin.c:538
-msgid "Gaim encountered errors loading the plugin."
-msgstr "プラグインを読み込む際にエラーが発生しました。"
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "プラグインを読み込めませんでした"
 
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "要求されたプラグイン %s を読み込めませんでした。"
+msgstr "指定したプラグイン %s を読み込めませんでした"
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr "プラグインを読み込めませんでした。"
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "お使いのプラグインを読み込めません"
 
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "依存性のあるプラグイン %s の解放に失敗しました"
 
-#: ../libgaim/plugin.c:669
-msgid "Gaim encountered errors unloading the plugin."
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
 msgstr "プラグインを解放する際にエラーが発生しました"
 
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "自動受け入れ"
 
-#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "選択したユーザからのファイル転送要求を自動的に受け入れます"
 
-#: ../libgaim/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "\"%2$s\" さんから \"%1$s\" のファイル転送の受け入れを完了しました"
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "受け入れの完了"
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "%s さんからファイル転送要求を受け取ったら、"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "自動受け入れの設定"
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
-#: ../libgaim/protocols/oscar/oscar.c:2234
-#: ../libgaim/protocols/oscar/oscar.c:2280
-#: ../libgaim/protocols/oscar/oscar.c:5838
-#: ../libgaim/protocols/oscar/oscar.c:5890
-#: ../libgaim/protocols/oscar/oscar.c:6068
-#: ../libgaim/protocols/oscar/oscar.c:6124
-#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "問い合わせる"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "自動的に受け取る"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "拒否する"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "ファイル転送の自動受け入れ..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -6238,11 +2162,11 @@ msgstr ""
 "ファイルを保存する場所\n"
 "(絶対パスで指定すること)"
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "仲間リストに無いユーザからの要求は拒否する"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -6250,141 +2174,39 @@ msgstr ""
 "自動受け入れによるファイルの転送が完了したらポップアップで知らせる\n"
 "(ファイルを送信した側と会話が無い場合にのみ)"
 
-#: ../libgaim/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "自動応答"
-
-#: ../libgaim/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "全てのプロトコルに自動応答します"
-
-#: ../libgaim/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"このプラグインを使うと、どんな種類のプロトコルにでも自動的に応答できるように"
-"なります。[プラグインの設定] で共通して使用する自動応答のメッセージを指定でき"
-"ます。特定の仲間に対して自動応答のメッセージを指定するには、仲間リストの仲間"
-"の上で右クリックして下さい。アカウント毎に自動応答のメッセージを指定するに"
-"は、アカウントの編集ダイアログの \"拡張\" タブを開いてみて下さい。"
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "%s さんに対する自動応答メッセージ"
-
-#: ../libgaim/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "自動応答のメッセージの設定"
-
-#: ../libgaim/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"自動応答を有効にしている時に仲間がメッセージを送信してきたら、次のメッセージ"
-"を相手に送信します:"
-
-#: ../libgaim/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "自動応答メッセージの設定(_A)"
-
-#: ../libgaim/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "自動応答のメッセージ"
-
-#: ../libgaim/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "自動応答メッセージを送信する時期"
-
-#: ../libgaim/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "自分が離席中になった時(_A)"
-
-#: ../libgaim/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "自分が待機中になった時(_I)"
-
-#: ../libgaim/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "デフォルトの応答(_D)"
-
-#: ../libgaim/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "状態のメッセージ"
-
-#: ../libgaim/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "状態メッセージ付きで自動応答:"
-
-#: ../libgaim/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "常にする"
-
-#: ../libgaim/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "自動応答がない時だけ"
-
-#: ../libgaim/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "自動応答の間隔"
-
-#: ../libgaim/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "間隔 (分)(_M)"
-
-#: ../libgaim/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "自動応答する回数"
-
-#: ../libgaim/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "最大値(_X)"
-
-#: ../libgaim/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-"ただ今、私は応答できる状態ではありませんので、メッセージを残しておいて下さ"
-"い。できるだけ早めに返事を送ります。"
-
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Notes"
 msgstr "備考"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "書き置きするメモを入力して下さい..."
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "メモの編集..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "仲間のメモ"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr "特定の仲間に書き置きします"
 
-#. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "仲間リストにいる仲間にメモを書き置きするための機能を追加します。"
 
@@ -6394,7 +2216,7 @@ msgstr "仲間リストにいる仲間にメモを書き置きするための機
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "暗号化のテスト"
 
@@ -6402,8 +2224,8 @@ msgstr "暗号化のテスト"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
 msgstr "暗号化機能が一緒に提供されているか確認します"
 
 #. *< type
@@ -6412,7 +2234,7 @@ msgstr "暗号化機能が一緒に提供されているか確認します"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus のサンプル"
 
@@ -6420,7 +2242,8 @@ msgstr "DBus のサンプル"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus のサンプル・プラグインです"
 
@@ -6430,58 +2253,58 @@ msgstr "DBus のサンプル・プラグインです"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim のファイル制御"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "ファイルの制御"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Gaime のコマンドをファイルに記述しておくことで Gaim 自体を制御できます"
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "ファイルにコマンドを記述して pidgin を制御できるようにします"
 
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "アイドル・メーカ"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "待機 (アイドル) 時間の設定"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "待機中のアカウントはありません。"
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "待機時間の解除"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "解除(_U)"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "全てのアカウントに対して待機時間をセットする"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "待機中の全てのアカウントに対して待機時間を解除する"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "待機中の時間を手動でセットできます"
 
@@ -6491,19 +2314,19 @@ msgstr "待機中の時間を手動でセットできます"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC のテスト用クライアント"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "クライアント側で IPC をサポートするテスト用プラグインです"
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
+#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -6517,119 +2340,163 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC のテスト用サーバ"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "サーバ側で IPC をサポートするテスト用プラグインです"
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "サーバ側で IPC をサポートするテスト用プラグインです。これは IPC コマンドを登"
 "録します。"
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "設定"
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "部屋の大きさ (最小値)"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr "待機中になるまでの時間 (分単位)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr "入/退出メッセージの制限"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr "場違いな入/退出のメッセージを隠します"
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:275
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"これは大きな部屋に入/退出する際のメッセージを隠すプラグインです (ユーザが会話"
+"に参加している場合は除く)"
+
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "ユーザはオフラインです"
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "自動応答の送信:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s さんがサイン・アウトしました。"
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "一つ以上のメッセージが配送不可能な状態になっています"
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "サーバが接続を切りました"
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 "現在接続していません。ログインするまでメッセージを受け取ることはできません。"
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "メッセージの最大サイズを超えたため送信できませんでした"
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "メッセージを送信することができませんでした"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "メッセンジャー Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN メッセンジャー"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "全般"
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "サイズを高速に計算する"
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr "名前形式のヒューリスティックを使う"
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "ログを記録するフォルダ"
 
@@ -6639,19 +2506,19 @@ msgstr "ログを記録するフォルダ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "ログ・リーダ"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "他の IM クライアントのログをログ・ビューアで表示します"
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6666,12 +2533,12 @@ msgstr ""
 "注意: このプラグインはアルファ版なので頻繁にクラッシュする可能性があります。"
 "ご利用は自己責任で！"
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono プラグイン・ローダ"
 
-#: ../libgaim/plugins/mono/loader/mono.c:215
-#: ../libgaim/plugins/mono/loader/mono.c:216
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Mono 用の .NET プラグインを読み込みます"
 
@@ -6684,18 +2551,18 @@ msgstr "Mono 用の .NET プラグインを読み込みます"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "改行の挿入"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "表示したメッセージの前に改行を挿入します"
 
-#. *  summary
-#: ../libgaim/plugins/newline.c:71
+#. *< summary
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -6703,15 +2570,15 @@ msgstr ""
 "メッセージの前に改行を挿入して、会話ウインドウのスクリーン名の下にメッセージ"
 "の残りの部分を表示するようにします。"
 
-#: ../libgaim/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "オフライン・メッセージ"
 
-#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "オフラインのユーザに送信できなかったメッセージを保存します"
 
-#: ../libgaim/plugins/offlinemsg.c:95
+#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -6719,7 +2586,7 @@ msgstr ""
 "送信できなかった残りのメッセージを保存します。\"仲間をつかむ\" ダイアログで編"
 "集や削除が行えます。"
 
-#: ../libgaim/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -6728,19 +2595,39 @@ msgstr ""
 "\"%s\" さんは現在オフラインです。送信できなかった残りのメッセージを保存してお"
 "き、\"%s\" さんが再びログオンした時に自動的に再送しますか？"
 
-#: ../libgaim/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "オフラインのメッセージ"
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "\"仲間をつかむ\" ダイアログで編集や削除が行えます。"
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "はい"
+
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "いいえ"
+
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "オフライン時のメッセージの保存"
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "常に保存しておく"
 
@@ -6750,26 +2637,26 @@ msgstr "常に保存しておく"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:596
 msgid "Perl Plugin Loader"
 msgstr "Perl プラグイン・ローダ"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:598 ../libpurple/plugins/perl/perl.c:599
 msgid "Provides support for loading perl plugins."
 msgstr "Perl プラグインを読み込む機能を提供します"
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "サイキック・モード"
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "受信した会話をサイキック・モードで表示します"
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -6777,23 +2664,23 @@ msgstr ""
 "仲間が入力したメッセージを会話ウィンドウに直接表示します (AIM、ICQ、Jabber、"
 "Sametime、Yahoo!で動作します)。"
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "フォースによって混乱させられた気分になります..."
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "仲間リストに登録されているユーザのみ許可する"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "離席したら無効にする"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "会話ウィンドウの中に通知メッセージも表示する"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "サイキックな会話を前面に出す"
 
@@ -6803,7 +2690,7 @@ msgstr "サイキックな会話を前面に出す"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "シグナルのテスト"
 
@@ -6811,7 +2698,8 @@ msgstr "シグナルのテスト"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "全てのシグナルが正常に動作しているかテストします"
 
@@ -6821,7 +2709,7 @@ msgstr "全てのシグナルが正常に動作しているかテストします
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "シンプルなプラグイン"
 
@@ -6829,7 +2717,7 @@ msgstr "シンプルなプラグイン"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "主要な機能が動作しているかどうかテストします"
 
@@ -6839,7 +2727,7 @@ msgstr "主要な機能が動作しているかどうかテストします"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6847,7 +2735,7 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL ライブラリのラッパーを提供します"
 
@@ -6857,7 +2745,7 @@ msgstr "SSL ライブラリのラッパーを提供します"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6865,8 +2753,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS を介した SSL 機能を提供します"
 
@@ -6876,7 +2764,7 @@ msgstr "GNUTLS を介した SSL 機能を提供します"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -6884,48 +2772,49 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mozilla が提供する NSS を介して SSL 機能を提供します"
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s さんは在席しています。"
 
-#: ../libgaim/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s さんが離席しました。"
 
-#: ../libgaim/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s さんが待機中になりました。"
 
-#: ../libgaim/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s さんが待機中から復帰しました。"
 
-#: ../libgaim/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s さんがサイン・インしました。"
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "通知する時期"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "仲間が離席中の時(_A)"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "仲間が待機中の時(_I)"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "仲間がサイン・イン/アウトした時(_S)"
 
@@ -6935,7 +2824,7 @@ msgstr "仲間がサイン・イン/アウトした時(_S)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "仲間の状態の通知"
 
@@ -6943,7 +2832,8 @@ msgstr "仲間の状態の通知"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -6951,15 +2841,15 @@ msgstr ""
 "会話の相手が離席したり、待機中から復帰もしくは在席していたら会話ウィンドウに"
 "通知します"
 
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl プラグイン・ローダ"
 
-#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl プラグインを読み込む機能を提供します"
 
-#: ../libgaim/plugins/tcl/tcl.c:481
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -6969,17 +2859,36 @@ msgstr ""
 "い。\n"
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "受信した IM 接続を確立できませんでした\n"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "ローカルの mDNS サーバを使った接続は確立できませんでした。サーバは正しく起動"
 "されていますか？"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:459 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
+msgid "Away"
+msgstr "離席中"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6990,384 +2899,414 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour プロトコルのプラグイン"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:474
-#: ../libgaim/protocols/bonjour/bonjour.c:482
-#: ../libgaim/protocols/bonjour/bonjour.c:540
-#: ../libgaim/protocols/silc/silc.c:300
-msgid "Gaim User"
-msgstr "Gaim ユーザ"
+#: ../libpurple/protocols/bonjour/bonjour.c:463
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:528
+msgid "Purple Person"
+msgstr "Purple な人物"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "ホスト名"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "名"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "姓"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:797
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-メール:"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:580
 msgid "AIM Account"
 msgstr "AIM のアカウント"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:583
 msgid "Jabber Account"
 msgstr "Jabber のアカウント"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s さんが会話ウインドウを閉じました"
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "ソケットを開けません"
 
-#: ../libgaim/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "ソケットにオプションをセットできません"
 
-#: ../libgaim/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "ポートにソケットを割り当てられませんでした"
 
-#: ../libgaim/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "ソケットを監視できませんでした"
 
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "メッセージを送信できません (会話を開始できませんでした)"
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "不正なプロキシ設定"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "指定したプロキシに対するホスト名またはポート番号が正しくありません。"
 
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "トークンのエラー"
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "トークンを取得できません。\n"
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "仲間リストの保存..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "仲間リストが空なので、ファイルには何も書き込まれませんでした。"
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "ファイルを開けませんでした。"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "仲間リストの保存が完了しました！"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "仲間リストを読み込めませんでした。"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "仲間リストの読み込み..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "仲間リストの読み込みが完了しました！"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "仲間リストの保存..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "登録情報の書き込みに失敗しました。"
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "新しいアカウントを登録できません。エラーが発生しました。\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新しい Gadu-Gadu のアカウントを登録しました。"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "登録が完了しました！"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:786
-#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Password"
 msgstr "パスワード"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "パスワード (確認用)"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "現在のトークンを入力して下さい"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "現在のトークン"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "新しい Gadu-Gadu アカウントの登録"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "次の欄を埋めて下さい:"
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
-#: ../libgaim/protocols/oscar/oscar.c:3764
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "町"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "誕生年"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "性別"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "男/女"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男性"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "女性"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "オンラインのみ"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "仲間の検索"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "検索条件を入力して下さい"
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "次の欄を埋めて下さい:"
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "現在使用しているパスワードと指定したパスワードが一致しませんでした。"
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "パスワードを変更できません。エラーが発生しました。\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Gadu-Gadu アカウントのパスワードの変更"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "パスワードの変更が完了しました！"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "現在使用しているパスワードと UIN の新しいパスワードを入力して下さい:"
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu のパスワードの変更"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "チャットの選択: %s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "チャットの追加..."
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3034 ../pidgin/gtkblist.c:3358
+#: ../pidgin/gtkdocklet.c:467 ../pidgin/gtkstatusbox.c:1054
+msgid "Offline"
+msgstr "オフライン"
+
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:455 ../pidgin/gtkstatusbox.c:1051
+msgid "Available"
+msgstr "在席しています"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2649
+#: ../libpurple/protocols/oscar/oscar.c:3680
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1558
-#: ../libgaim/protocols/jabber/buddy.c:1734
-#: ../libgaim/protocols/oscar/oscar.c:3704
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "誕生年"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Unable to display the search results."
 msgstr "検索結果を表示できません"
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu の公開フォルダ"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "検索結果"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "一致するユーザが見つかりませんでした"
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "検索条件に一致するユーザが存在しませんでした。"
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "ソケットを読めません"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "仲間リストをダウンロードしました"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "仲間リストをサーバからダウンロードしました。"
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "仲間リストをアップロードしました"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "仲間リストをサーバに格納しました。"
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "接続に失敗しました"
 
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
 msgid "Blocked"
 msgstr "拒否しているか"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "拒否しない"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "拒否する"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "チャット名(_N):"
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "チャットのエラー"
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "そのチャット名は既に使用されています。"
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "サーバへ接続していません。"
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "仲間の検索..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Change password..."
 msgstr "パスワードの変更..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2030
 msgid "Upload buddylist to Server"
 msgstr "仲間リストのアップロード"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "仲間リストのダウンロード"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "サーバから仲間リストの削除"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "仲間リストの保存..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "仲間リストのインポート..."
 
@@ -7382,122 +3321,147 @@ msgstr "仲間リストのインポート..."
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu プロトコルのプラグイン"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "ポーランドで人気のある IM です"
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ユーザ"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "不明なコマンド: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在のトピック: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "トピックが設定されていません"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "ファイルの転送が失敗しました"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr "Gaim は監視するポートを開けませんでした。"
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "監視するポートを開けませんでした"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "MOTD を表示する際にエラーが発生しました"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "MOTD を利用できません"
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "この接続に関連した MOTD がありません。"
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s の MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
 msgid "Server has disconnected"
 msgstr "サーバが接続を切りました"
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "MOTD の表示"
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "チャンネル(_C):"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC のニックネームには空白が含まれていないかもしれません"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
-#: ../libgaim/protocols/jabber/jabber.c:927
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+msgid "Connecting"
+msgstr "接続中です"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:595
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "SSL サポートは無効です"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1265
 msgid "Couldn't connect to host"
 msgstr "ホストへ接続できませんでした"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL のハンドシェイクに失敗しました"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
 msgid "Read error"
 msgstr "読み込みエラーです"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "ユーザ数"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "トピック"
 
@@ -7509,204 +3473,212 @@ msgstr "トピック"
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "IRC プロトコル・プラグイン"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC プロトコルのプラグイン (Sucks Less)"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1984
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2122
+#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "サーバ"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "ポート番号"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "エンコーディング"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:782
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "氏名"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "SSL を使う"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:178
 msgid "Bad mode"
 msgstr "モードが間違っています"
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:189
 #, c-format
 msgid "You are banned from %s."
 msgstr "あなたは %s さんに締め出されました。"
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:190
 msgid "Banned"
 msgstr "締め出されました"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:207
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "%s を締め出せません: 締め出しリストが一杯です"
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:292
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:293
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:294
+#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "あだ名"
 
-#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "チャンネル"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:325
 msgid "Idle for"
 msgstr "待機中"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:328
 msgid "Online since"
 msgstr "入室した日時"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>形容詞の定義:</b>"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "Glorious"
 msgstr "Glorious"
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s さんがトピックを変更しました: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s さんがトピックをクリアしました"
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:418
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s のトピック: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:436
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明なメッセージ '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:437
 msgid "Unknown message"
 msgstr "不明なメッセージ"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim が送信したメッセージを IRC サーバは理解しませんでした。"
+#: ../libpurple/protocols/irc/msgs.c:437
+msgid "The IRC server received a message it did not understand."
+msgstr "送信したメッセージを IRC サーバが処理しませんでした"
 
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:458
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s のユーザ数: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:555
 msgid "Time Response"
 msgstr "時間応答"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:556
 msgid "The IRC server's local time is:"
 msgstr "IRC サーバのローカル・タイム:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:567
 msgid "No such channel"
 msgstr "そのようなチャンネルはありません"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "no such channel"
 msgstr "そのようなチャンネルはありません"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:581
 msgid "User is not logged in"
 msgstr "ユーザはログインしていません"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:586
 msgid "No such nick or channel"
 msgstr "そのようなニックネームまたはチャンネルはありません"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "Could not send"
 msgstr "送信できませんでした"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:662
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s に参加するには招待する必要があります。"
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:663
 msgid "Invitation only"
 msgstr "招待だけ"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:775
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "あなたは %s に蹴られました: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s (%s) に蹴られました"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "モード (%s %s) by %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
 msgid "Invalid nickname"
 msgstr "あだ名が間違っています"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:890
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7714,7 +3686,7 @@ msgstr ""
 "指定したあだ名がサーバ側で拒否されました。おそらく不正な文字が含まれていると"
 "思われます。"
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:895
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7722,51 +3694,52 @@ msgstr ""
 "指定したアカウント名がサーバ側で拒否されました。おそらく不正な文字が含まれて"
 "いると思われます。"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Cannot change nick"
 msgstr "ニックネームを変更できません"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Could not change nick"
 msgstr "ニックネームを変更できませんでした"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:955
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "チャンネル %s%s から離脱しました"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:997
 msgid "Error: invalid PONG from server"
 msgstr "エラー: サーバからの不正な PONG です"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:999
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 応答 -- Lag: %lu 秒"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1080
 #, c-format
 msgid "Cannot join %s:"
 msgstr "%s に参加できません:"
 
-#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "チャンネルに参加できません"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1115
 msgid "Nick or channel is temporarily unavailable."
 msgstr "一時的にあだ名またはチャンネルを利用できません。"
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1127
 #, c-format
 msgid "Wallops from %s"
 msgstr "%s さんからの wallops です"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;実行するアクション&gt;:  アクションを実行します"
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -7774,11 +3747,11 @@ msgstr ""
 "away [メッセージ]:  離席中のメッセージをセットする、または離席中から戻ったこ"
 "とを示すためにセットしたメッセージを解除します"
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: コマンドを chanserv へ送信します"
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -7786,7 +3759,7 @@ msgstr ""
 "deop &lt;あだ名１&gt; [あだ名２] ...:  チャンネル操作権を剥奪します (これを行"
 "うには、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -7796,7 +3769,7 @@ msgstr ""
 "ルがモデレート (+m) した時に発言しないようにします (これを行うには、自分自身"
 "がチャンネル操作権を持っていなければなりません)"
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -7804,7 +3777,7 @@ msgstr ""
 "invite &lt;あだ名&gt; [チャットルーム]:  指定したチャンネル、または現在のチャ"
 "ンネルに招待します"
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -7813,7 +3786,7 @@ msgstr ""
 "[,...]]:  一つ以上のチャンネルを指定すると、必要に応じて、追加でそれぞれの"
 "チャンネル・キーを提供します"
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -7822,7 +3795,7 @@ msgstr ""
 "[,...]]:  一つ以上のチャンネルを指定すると、必要に応じて、追加でそれぞれの"
 "チャンネル・キーを提供します"
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -7830,7 +3803,7 @@ msgstr ""
 "kick &lt;あだ名&gt; [メッセージ]:  チャンネルから追い出します (これを行うに"
 "は、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -7838,15 +3811,15 @@ msgstr ""
 "list:  ネットワーク上のチャットルームを一覧表示します。<i>【注意】これを行う"
 "と接続を切断するサーバがいくつかあります。</i>"
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;実行するアクション&gt;:  指定したアクションを実行します"
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: コマンドを memoserv へ送信します"
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -7854,7 +3827,7 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;あだ名|チャンネル&gt;:  チャンネルまたは"
 "ユーザ・モードを設定または解除します"
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -7862,20 +3835,20 @@ msgstr ""
 "msg &lt;あだ名&gt; &lt;メッセージ&gt;:  あるユーザへ (チャンネルとは別に) 個"
 "人的なメッセージを送信します"
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [チャンネル]:  チャンネルに現在いるユーザを一覧表示します"
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1800
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新しいあだ名&gt;:  あだ名を変更します"
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: コマンドを nickserv へ送信します"
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -7883,7 +3856,7 @@ msgstr ""
 "op &lt;あだ名１&gt; [あだ名２] ...:  チャンネル操作権を与えます (これを行うに"
 "は、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -7891,11 +3864,11 @@ msgstr ""
 "operwall &lt;メッセージ&gt;:  (このコマンドが何を行うか知らない場合は、おそら"
 "く使うことは無いでしょう:)"
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: コマンドを operserv へ送信します"
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -7903,7 +3876,7 @@ msgstr ""
 "part [チャットルーム] [メッセージ]:  現在のチャンネルまたは指定したチャンネル"
 "からメッセージを残して退出します"
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -7911,7 +3884,7 @@ msgstr ""
 "ping [あだ名]:  ユーザ (または、ユーザが指定されない場合はサーバ) とどれくら"
 "いズレがあるか問い合わせます"
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -7919,15 +3892,15 @@ msgstr ""
 "query &lt;あだ名&gt; &lt;メッセージ&gt;:  あるユーザへ (チャンネルとは別に) "
 "個人的なメッセージを送信します"
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [メッセージ]:  メッセージを残してサーバとの接続を切断します"
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  サーバへ低レベル・コマンドを送信します"
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -7935,23 +3908,23 @@ msgstr ""
 "remove &lt;あだ名&gt; [メッセージ]:  チャット・ルームからあだ名の人を追い出し"
 "ます (これを行うには、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: IRC サーバの現在時刻 (ローカルタイム) を表示します"
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新しいトピック]:  チャンネル・トピックを表示したり変更します"
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ユーザ・モードを設定または解除します"
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [あだ名]: ユーザに CTCP VERSION 要求を送信します"
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -7959,7 +3932,7 @@ msgstr ""
 "voice &lt;あだ名１&gt; [あだ名２] ...:  チャンネル・ボイス権を与えます (これ"
 "を行うには、自分自身がチャンネル操作権を持っていなければなりません)"
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -7967,55 +3940,56 @@ msgstr ""
 "wallops &lt;メッセージ&gt;:  (このコマンドが何を行うか知らない場合は、おそら"
 "く使うことは無いでしょう:)"
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [サーバ名] &lt;あだ名&gt;:  ユーザ情報を取得します"
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;あだ名&gt;: サイン・アウトしたユーザ情報を取得します"
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s からの応答時間: %lu 秒"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "CTCP PING 応答"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "切断されました"
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
 "ていません。"
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
 
-#: ../libgaim/protocols/jabber/auth.c:232
-msgid "Server couldn't authenticate you without a password"
-msgstr "サーバはパスワードの無いあなたを認証できませんでした"
-
-#: ../libgaim/protocols/jabber/auth.c:235
-#: ../libgaim/protocols/jabber/auth.c:236
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:295
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:481
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "プレーンテキスト認証"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -8023,127 +3997,136 @@ msgstr ""
 "サーバが、暗号化されていないストリーム接続を介したプレーンテキスト認証を要求"
 "しています。これを許可し認証を続行しますか？"
 
-#: ../libgaim/protocols/jabber/auth.c:243
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:306
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "サーバはサポートしている認証手法を利用しません"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:434
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "サーバからの応答が不正です。"
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "サーバからの不正な challenge です"
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "SASL のエラー"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:783
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "氏名"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:796
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "苗字"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "名前"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "住所"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "その他"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "区"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "州"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "郵便番号"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:869
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "国"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:880
-#: ../libgaim/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "電話番号"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:906
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-メール"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "組織名"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "担当部署"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "役職"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/oscar/oscar.c:3730
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3045
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "説明"
+
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCard の編集"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -8151,113 +4134,113 @@ msgstr ""
 "次のアイテムは全てオプションです。快適に操作できると思われる情報のみ入力して"
 "下さい。"
 
-#: ../libgaim/protocols/jabber/buddy.c:652
-#: ../libgaim/protocols/jabber/buddy.c:691
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "クライアント"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "オペレーティング・システム"
 
-#: ../libgaim/protocols/jabber/buddy.c:666
-#: ../libgaim/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr "リソース"
 
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1226
-#: ../libgaim/protocols/jabber/jabber.c:1236
-#: ../libgaim/protocols/jabber/jabber.c:1246
-#: ../libgaim/protocols/jabber/jabber.c:1256
-#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1232
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
 msgid "Priority"
 msgstr "優先順位"
 
-#: ../libgaim/protocols/jabber/buddy.c:804
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "ミドル・ネーム"
 
-#: ../libgaim/protocols/jabber/buddy.c:837
-#: ../libgaim/protocols/jabber/jabber.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3763
-#: ../libgaim/protocols/oscar/oscar.c:3776
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "住所"
 
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "郵便箱"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "写真"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../libgaim/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "ここからは隠さない"
 
-#: ../libgaim/protocols/jabber/buddy.c:1348
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "一時的にここから隠す"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1356
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "存在通知をやめる"
 
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "認証の (再) 要求"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1372
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "購読の取り消し"
 
-#: ../libgaim/protocols/jabber/buddy.c:1405
-#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/buddy.c:1407
+#: ../libpurple/protocols/jabber/jabber.c:1241
 msgid "Chatty"
 msgstr "チャッティー"
 
-#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
 msgid "Extended Away"
 msgstr "逃走中"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1265
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5760
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1560
-#: ../libgaim/protocols/jabber/buddy.c:1739
-#: ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libgaim/protocols/jabber/buddy.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "検索結果です"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1667
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -8265,562 +4248,588 @@ msgstr ""
 "指定した項目に対する検索条件を入力してコンタクトを検索します。注意: 各項目は"
 "ワイルドカードを使った検索 (%) をサポートしています。"
 
-#: ../libgaim/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "ディレクトリの検索に失敗しました"
 
-#: ../libgaim/protocols/jabber/buddy.c:1688
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "ディレクトリ・サーバを検索できませんでした"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "サーバの情報: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Jabber ユーザを検索するには一つ以上の欄を埋めて下さい:"
 
-#: ../libgaim/protocols/jabber/buddy.c:1749
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3708
-#: ../libgaim/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
-#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "Jabber ユーザの検索"
 
-#: ../libgaim/protocols/jabber/buddy.c:1773
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "検索"
+
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
 msgstr "ディレクトリが間違っています"
 
-#: ../libgaim/protocols/jabber/buddy.c:1790
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
 msgstr "ユーザ・ディレクトリを入力して下さい"
 
-#: ../libgaim/protocols/jabber/buddy.c:1791
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
 msgstr "検索するユーザ・ディレクトリの選択"
 
-#: ../libgaim/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
 msgstr "検索するディレクトリ"
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5228
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "ルーム(_R):"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "サーバ(_S):"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "ハンドル(_H):"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s は正しいルーム名ではありません"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "不正なルーム名"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s は正しいサーバ名ではありません"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "不正なサーバ名"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s は正しいルーム・ハンドルではありません"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "不正なルーム・ハンドル"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "設定エラー"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:407
+#: ../libpurple/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "設定できません"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "ルームの設定エラー"
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "この部屋は設定できません"
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:472
+#: ../libpurple/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "登録エラー"
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "non-MUC チャットルームでのニックネーム変更はサポートしていません"
 
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:680
+#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "ルーム一覧を取得する際にエラー"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "不正なサーバ名"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "会議サーバの入力"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "問い合わせる会議サーバの選択"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "部屋の検索"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "セッションの初期化でエラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:294
-#: ../libgaim/protocols/jabber/jabber.c:322
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:390
-#: ../libgaim/protocols/jabber/jabber.c:427
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "読み込みエラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:504
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr "ソケットを生成できません"
 
-#: ../libgaim/protocols/jabber/jabber.c:552
-#: ../libgaim/protocols/jabber/jabber.c:895
+#: ../libpurple/protocols/jabber/jabber.c:565
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "不正な Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s の登録が完了しました"
 
-#: ../libgaim/protocols/jabber/jabber.c:625
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "登録の完了"
 
-#: ../libgaim/protocols/jabber/jabber.c:632
-#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Unknown Error"
 msgstr "不明なエラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:634
-#: ../libgaim/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "登録の失敗"
 
-#: ../libgaim/protocols/jabber/jabber.c:750
-#: ../libgaim/protocols/jabber/jabber.c:751
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "既に登録されています"
 
-#: ../libgaim/protocols/jabber/jabber.c:827
-#: ../libgaim/protocols/oscar/oscar.c:3765
-#: ../libgaim/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "State"
 msgstr "州"
 
-#: ../libgaim/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../libgaim/protocols/jabber/jabber.c:837
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "電話番号"
 
-#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "日付"
 
-#: ../libgaim/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr "新しいアカウントを登録するには、次の情報を全て入力して下さい。"
 
-#: ../libgaim/protocols/jabber/jabber.c:858
-#: ../libgaim/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "新しい Jabber アカウントの登録"
 
-#: ../libgaim/protocols/jabber/jabber.c:1025
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+msgid "Register"
+msgstr "登録"
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Initializing Stream"
 msgstr "ストリームの初期化中"
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認証中"
 
-#: ../libgaim/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Re-initializing Stream"
 msgstr "ストリームの再初期化中"
 
-#: ../libgaim/protocols/jabber/jabber.c:1109
-#: ../libgaim/protocols/jabber/jabber.c:1479
-#: ../libgaim/protocols/jabber/jabber.c:1520
-#: ../libgaim/protocols/jabber/jabber.c:1554
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/jabber/jabber.c:1115
+#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:5511
 msgid "Not Authorized"
 msgstr "認証されていません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1157
 msgid "Both"
 msgstr "両方"
 
-#: ../libgaim/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "To"
 
-#: ../libgaim/protocols/jabber/jabber.c:1160
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "なし"
+
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
 msgstr "購読"
 
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libpurple/protocols/jabber/jabber.c:1301
 msgid "Password Changed"
 msgstr "パスワードの変更"
 
-#: ../libgaim/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Your password has been changed."
 msgstr "パスワードを変更しました。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1307
 msgid "Error changing password"
 msgstr "パスワードを変更する際にエラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/jabber/jabber.c:1363
 msgid "Password (again)"
 msgstr "パスワード (確認用)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Change Jabber Password"
 msgstr "Jabber パスワードの変更"
 
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
 msgstr "新しいパスワードを入力して下さい"
 
-#: ../libgaim/protocols/jabber/jabber.c:1373
-#: ../libgaim/protocols/oscar/oscar.c:6355
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "ユーザ情報のセット..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6366
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "パスワードの変更..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1391
 msgid "Search for Users..."
 msgstr "ユーザの検索..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Bad Request"
 msgstr "おかしな要求です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Conflict"
 msgstr "衝突してます"
 
-#: ../libgaim/protocols/jabber/jabber.c:1463
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Feature Not Implemented"
 msgstr "まだ実装していません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Forbidden"
 msgstr "隠れています"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Gone"
 msgstr "逝ってます"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Internal Server Error"
 msgstr "サーバの内部エラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Item Not Found"
 msgstr "アイテムが見つかりません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Malformed Jabber ID"
 msgstr "おかしな Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Acceptable"
 msgstr "受信できません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Not Allowed"
 msgstr "許可していません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Payment Required"
 msgstr "有料です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1493
 msgid "Recipient Unavailable"
 msgstr "受信者がいません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Registration Required"
 msgstr "登録が必要です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "Remote Server Not Found"
 msgstr "リモート・サーバが見つかりません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Remote Server Timeout"
 msgstr "リモート・サーバがタイムアウトしました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Server Overloaded"
 msgstr "サーバがオーバーロードです"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Service Unavailable"
 msgstr "サービスは利用できません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Subscription Required"
 msgstr "購読の申し込みが必要です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Unexpected Request"
 msgstr "予期しないリクエストです"
 
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Authorization Aborted"
 msgstr "認証が拒否されました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Incorrect encoding in authorization"
 msgstr "認証で不正なエンコーディングです"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1521
 msgid "Invalid authzid"
 msgstr "不正な authzid です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Invalid Authorization Mechanism"
 msgstr "不正な認証メカニズムです"
 
-#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Authorization mechanism too weak"
 msgstr "認証メカニズムが不十分です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1532
 msgid "Temporary Authentication Failure"
 msgstr "テンポラリな認証に失敗しました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authentication Failure"
 msgstr "認証に失敗しました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Bad Format"
 msgstr "おかしなフォーマット"
 
-#: ../libgaim/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Bad Namespace Prefix"
 msgstr "おかしな名前空間の接頭子"
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "接続がタイムアウトしました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Gone"
 msgstr "ホストがお亡くなりになりました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Host Unknown"
 msgstr "ホストが不明です"
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Improper Addressing"
 msgstr "適切ではないアドレス設定"
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Invalid ID"
 msgstr "不正な ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Invalid Namespace"
 msgstr "不正な名前空間"
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid XML"
 msgstr "不正な XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Non-matching Hosts"
 msgstr "一致しないホスト"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Policy Violation"
 msgstr "ポリシー違反"
 
-#: ../libgaim/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Remote Connection Failed"
 msgstr "リモート接続に失敗しました"
 
-#: ../libgaim/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Resource Constraint"
 msgstr "リソース制限"
 
-#: ../libgaim/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Restricted XML"
 msgstr "制限付き XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "See Other Host"
 msgstr "他のホストを表示する"
 
-#: ../libgaim/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "System Shutdown"
 msgstr "システム・シャットダウン"
 
-#: ../libgaim/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "Undefined Condition"
 msgstr "定義していない条件"
 
-#: ../libgaim/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Encoding"
 msgstr "サポートしていないエンコーディング"
 
-#: ../libgaim/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Stanza Type"
 msgstr "サポートしていない Stanza 型"
 
-#: ../libgaim/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Version"
 msgstr "サポートしていないバージョン"
 
-#: ../libgaim/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "XML Not Well Formed"
 msgstr "ウェル・フォームド XML ではありません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Stream Error"
 msgstr "ストリーム・エラー"
 
-#: ../libgaim/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1657
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "ユーザの %s さんを追い出せません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明な会員: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1682
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "ユーザの %s さんを \"%s\" として仲間に追加できません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明な役割: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1708
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "ユーザに役割 \"%s\" をセットできません: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/jabber/jabber.c:1761
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "ユーザの %s さんをキックできません"
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1792
 msgid "config:  Configure a chat room."
 msgstr "config:  チャット・ルームを設定します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1796
 msgid "configure:  Configure a chat room."
 msgstr "configure:  チャット・ルームを設定します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "part [room]:  Leave the room."
 msgstr "part [部屋]:  部屋から退出します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1810
 msgid "register:  Register with a chat room."
 msgstr "register:  チャット・ルームを登録します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/jabber/jabber.c:1816
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新しいトピック]:  トピックを表示したり変更します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;ユーザ&gt; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
 "す"
 
-#: ../libgaim/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1828
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -8828,7 +4837,7 @@ msgstr ""
 "affiliate &lt;ユーザ&gt; &lt;owner|admin|member|outcast|none&gt;: ユーザの関"
 "係をセットします"
 
-#: ../libgaim/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1834
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -8836,21 +4845,21 @@ msgstr ""
 "role &lt;ユーザ&gt; &lt;moderator|participant|visitor|none&gt;: チャトルーム"
 "での役割をセットします"
 
-#: ../libgaim/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;ユーザ&gt; [メッセージ]:  ユーザをルームに招待します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;ルーム&gt; [サーバ]:  指定したサーバのチャットへ参加します"
 
-#: ../libgaim/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;ユーザ&gt; [ルーム]:  指定したユーザをチャット・ルームから追い出しま"
 "す"
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -8867,73 +4876,73 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1962
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber プロトコルのプラグイン"
 
-#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "古い SSL (ポート番号:5223) を強制的に使用する"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証を許可する"
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "接続するポート番号"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2004
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1848
 msgid "Connect server"
 msgstr "サーバへ接続"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "%s さんからのメッセージ"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s はトピックをセットしました: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "トピック: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "%s さんへのメッセージの配送に失敗: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Jabber メッセージ・エラー"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (コード %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "XML 解析エラー"
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "新しいチャット・ルームの生成"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8941,41 +4950,42 @@ msgstr ""
 "新しいチャット・ルームを生成します。チャット・ルームの設定を行いますか？ それ"
 "ともデフォルト値を適用しますか？"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "ルームの設定(_C)"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "デフォルト値を適用する(_A)"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "チャット %s でエラー"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "チャット %s に参加する際にエラー"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
 "ん)"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "ファイル送信の失敗"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) で仲間リストの同期が発生しました"
 
-#: ../libgaim/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -8985,7 +4995,7 @@ msgstr ""
 "すが、サーバ上のリストではそうなっていません。サーバ上のリストで、この仲間を"
 "追加してよろしいですか？"
 
-#: ../libgaim/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -8994,266 +5004,268 @@ msgstr ""
 "ローカルの仲間リストに記述されている %s さんはサーバ上のリストに存在しませ"
 "ん。サーバ上のリストで、この仲間を追加してもよろしいですか？"
 
-#: ../libgaim/protocols/msn/error.c:35
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr "メッセージを解読できません"
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "文法エラー (おそらく Gaim のバグ)"
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "文法エラー (おそらくクライアント側のバグ)"
 
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "E-メール・アドレスが間違っています"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "ユーザがいません"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "FQDN (完全修飾ドメイン名) がありません"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "既にサインインしています"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "無効なスクリーン名です"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "無効な公開名です"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "リストがいっぱいです"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "既にそこにいます"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "リストにありません"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "ユーザはオフラインです"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "既にそのモードにいます"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "既にリストの反対にいます"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "グループが多すぎます"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "無効なグループ名"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "ユーザがグループにありません"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "グループ名が長すぎます"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "グループ 0 は削除できません"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "存在しないグループにユーザを追加しようとしました"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "スイッチボードに失敗しました"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "通知の転送に失敗しました"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "必要なフィールドがありません"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "FND にヒットしすぎです"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "ログインしていません"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "一時的にサービスを利用できません"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "データベース・サーバのエラー"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "コマンドが無効です"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "ファイル操作のエラー"
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "メモリ確保のエラー"
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "間違った CHL 値がサーバに送信されました"
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "サーバがビジーです"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "サーバを利用できません"
 
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr "ピア通知サーバがダウンしています"
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "データベース接続エラーです"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "サーバがダウンしています (見捨てましょう)"
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "接続を開始する際にエラー"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR パラメータが不明または許可されていません"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "書き込めません"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "セッションの負荷が過剰です"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "ユーザがアクティブすぎます"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "セッションが多すぎです"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "パスポートは確認されていません"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr "おかしな仲間ファイル"
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "予想していないデータ"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "公開する名前が短すぎます"
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "サーバがとてもビジーです"
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "オフラインの時は許可できません"
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "新しいユーザを受け入れていません"
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "親の承諾がない Kids パスポートです"
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "まだパスポートのアカウントは確認されていません"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "おかしなチケットです"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "不明なエラー・コード %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN エラー: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr "今、合図を送りました！"
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr "新しい MSN の公開名が長すぎます"
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr "公開する名前をセットして下さい"
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "MSN の他の仲間があなたを見るときに表示される名前です:"
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "自宅の電話番号を設定して下さい"
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "オフィスの電話番号を設定して下さい"
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "携帯電話の番号を設定して下さい"
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN モバイル・ページを許可しますか？"
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:314
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -9261,303 +5273,317 @@ msgstr ""
 "仲間が携帯電話などのモバイル機器へ MSN モバイル・ページを送信することを許可し"
 "ますか？"
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "許可する"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "許可しない"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr "この Hotmail のアカウントは有効でないようです。"
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "モバイル・メッセージを送信します。"
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "ページ"
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:529
 msgid "Has you"
 msgstr "あなたを仲間リストに登録しているか"
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "もうすぐ帰ってきます"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "取り込み中です"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:567
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "電話中です"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:571
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "食事に出かけています"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:599
 msgid "Set Friendly Name..."
 msgstr "公開する名前の設定..."
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Home Phone Number..."
 msgstr "自宅の電話番号の設定..."
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Work Phone Number..."
 msgstr "オフィスの電話番号の設定..."
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Set Mobile Phone Number..."
 msgstr "携帯の電話番号の設定..."
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:618
 msgid "Enable/Disable Mobile Devices..."
 msgstr "モバイル機器の有効/無効..."
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:623
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "モバイル・ページの許可/非許可...."
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:657
 msgid "Send to Mobile"
 msgstr "モバイル機器へ送信"
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "チャットの開始(_C)"
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
+#: ../libpurple/protocols/msn/msn.c:705
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"MSN では SSL サポートが必要です。サポートする SSL ライブラリをインストールし"
-"て下さい。詳細な情報は http://gaim.sf.net/faq-ssl.php をご覧下さい。"
+"MSN では SSL サポートが必要です (サポートする SSL ライブラリをインストールし"
+"て下さい)"
 
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:730
 msgid "Failed to connect to server."
 msgstr "サーバへの接続に失敗しました"
 
-#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "プロフィールを取得する際にエラー"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
-#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "全般"
+
+#: ../libpurple/protocols/msn/msn.c:1528
+#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齢"
 
-#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libgaim/protocols/msn/msn.c:1542
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1214
 msgid "Location"
 msgstr "場所"
 
-#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
-#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
 msgid "Hobbies and Interests"
 msgstr "趣味と興味のあること"
 
-#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
-#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
-#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
 msgid "A Little About Me"
 msgstr "ちょっとしたプロフィール"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1559
 msgid "Social"
 msgstr "パーティ"
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "既婚/未婚"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1562
 msgid "Interests"
 msgstr "趣味"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1563
 msgid "Pets"
 msgstr "ペット"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1564
 msgid "Hometown"
 msgstr "出身地"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1565
 msgid "Places Lived"
 msgstr "現住所"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1566
 msgid "Fashion"
 msgstr "ファッション"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Humor"
 msgstr "ユーモア"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Music"
 msgstr "音楽"
 
-#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
-#: ../libgaim/protocols/msn/msn.c:1767
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右の銘"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Contact Info"
 msgstr "連絡先の情報"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1587
 msgid "Personal"
 msgstr "個人"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1590
 msgid "Significant Other"
 msgstr "大切な人"
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Home Phone"
 msgstr "ホームページ"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Home Phone 2"
 msgstr "ホームページ２"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Personal Mobile"
 msgstr "携帯 (個人)"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Home Fax"
 msgstr "自宅の FAX"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal E-Mail"
 msgstr "個人の E-メール"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Personal IM"
 msgstr "個人の IM"
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Anniversary"
 msgstr "記念日"
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work"
 msgstr "職種"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "肩書"
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Company"
 msgstr "勤務先"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "部署"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Profession"
 msgstr "職業"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Work Phone"
 msgstr "勤務先の電話番号"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Work Phone 2"
 msgstr "勤務先の電話番号２"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:3787
 msgid "Work Address"
 msgstr "勤務先の住所"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work Mobile"
 msgstr "携帯 (仕事)"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Work Fax"
 msgstr "勤務先の FAX"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Work E-Mail"
 msgstr "勤務先の E-メール"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work IM"
 msgstr "勤務先の IM"
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Start Date"
 msgstr "開始日"
 
-#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
-#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "Favorite Things"
 msgstr "お気に入りのもの"
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Last Updated"
 msgstr "最終更新日"
 
-#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "このユーザはプロフィールを公開していません"
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -9567,16 +5593,16 @@ msgstr ""
 "ユーザが存在しないか、あるいはユーザは存在しますがプロフィールは公開していな"
 "いかのどちらかです。"
 
-#: ../libgaim/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
 msgstr ""
 "ユーザのプロフィールから情報を取得できませんでした。そのユーザはおそらく存在"
 "していないと思われます。"
 
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "プロフィールの URL"
 
@@ -9590,96 +5616,96 @@ msgstr "プロフィールの URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
 msgid "MSN Protocol Plugin"
 msgstr "MSN プロトコルのプラグイン"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2131
 msgid "Use HTTP Method"
 msgstr "HTTP メソッドを利用する"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2136
 msgid "Show custom smileys"
 msgstr "独自のスマイリーを表示する"
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "nudge: nudge a user to get their attention"
 msgstr "合図: ユーザに向けて警告音を鳴らす"
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "接続できません"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s は正しいグループではありません"
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "原因不明のエラーです"
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s) の %1$s"
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) のユーザを追加できません"
 
-#: ../libgaim/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) のユーザをブロックできません"
 
-#: ../libgaim/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) のユーザを許可できません"
 
-#: ../libgaim/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "仲間リストが満杯なので、%s さんを追加できませんでした"
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s さんのパスポート・アカウントは正しくありません"
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "サービスを一時的に利用できません"
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "グループ名を変更できません"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ../libgaim/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -9706,15 +5732,15 @@ msgstr[1] ""
 "\n"
 "メンテナンスが完了したら、またサイン・インできるようになります。"
 
-#: ../libgaim/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "書き込み時にエラー"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "読み込み時にエラー"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -9723,213 +5749,209 @@ msgstr ""
 "サーバ %s で接続エラー:\n"
 "%s"
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "サーバはこのプロトコルをサポートしていません"
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "HTTP を解析する際にエラーが発生しました"
 
-#: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3467
-#: ../libgaim/protocols/yahoo/yahoo.c:191
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "別の場所からサイン・インしています"
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN サーバが一時的に利用不可になっています。時間をあけて後で試してみて下さ"
 "い。"
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN サーバが一時的にダウンしています"
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "認証できません: %s"
 
-#: ../libgaim/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "お使いの MSN 仲間リストが一時的に利用不可になっています。時間をあけて後で試し"
 "てみて下さい。"
 
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "通信を接続しています"
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr "転送しています"
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "認証を開始しています"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "クッキーを取得しています"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "クッキーを送信しています"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "仲間リストを受信しています"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "コンピュータから離れてます"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "電話中です"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "食事に出かけています"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "タイムアウトになったので、メッセージは送信されませんでした:"
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隠れている間はメッセージを送信できません:"
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "送信先のユーザがオフラインなので、メッセージを送信できませんでした:"
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "接続エラーが発生したので、メッセージを送信できませんでした:"
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "送信するタイミングが早過ぎたので、メッセージを送信できませんでした:"
 
-#: ../libgaim/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "交換機系の接続エラーが発生したので、メッセージを送信できませんでした:"
 
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s さんが合図を送りたがっています！"
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s さんはあなたを仲間リストに追加しています"
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s さんはあなたを仲間リストから削除しています"
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" さんを追加できません"
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr "必要なパラメータが引き渡されていません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr "ネットワークへ書き込めません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr "ネットワークから読み込めません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr "サーバと通信する際にエラーが発生しました"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
 msgstr "会議が見つかりません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
 msgstr "会議が存在しません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
 msgstr "その名前のフォルダは既に存在します"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr "サポートしていません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
 msgstr "パスワードの有効期限が切れています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "パスワードが間違っています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
 msgstr "ユーザが見つかりません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
 msgstr "アカウントが無効になっています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
 msgstr "サーバはディレクトリにアクセスできませんでした"
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr "システム管理者がこの操作を無効にしています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr "サーバを利用できません; あとでもう一度試して下さい"
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr "同じフォルダへコンタクトを二回追加できません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr "あなた自身を追加できません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr "マスター・アーカイブの設定が間違っています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
 msgstr "スクリーン名またはパスワードが間違っています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "入力したスクリーン名のホストを認識できませんでした"
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -9937,84 +5959,84 @@ msgstr ""
 "間違ったパスワードが複数回が入力されたので、お使いのアカウントを無効にしてい"
 "ます"
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr "同一人物を二回会話へ追加できません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "コンタクト可能な数の最大値に到達しました"
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr "間違ったスクリーン名を入力しました"
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
 msgstr "フォルダを更新する際にエラーが発生しました。"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr "互換性のないバージョンのプロトコル"
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
 msgstr "ユーザはあなたをブロックしています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "この評価版では一度に 10 ユーザ以上はログインできません"
 
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1967
 msgid "The user is either offline or you are blocked"
 msgstr "ユーザはオフラインか、あるいはブロックされています"
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1970
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "不明なエラー: 0x%X"
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "ログインに失敗しました (%s)。"
 
-#: ../libgaim/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "メッセージを送信できません。ユーザの詳細情報を取得できませんでした (%s)。"
 
-#: ../libgaim/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "%s さんを仲間リスト (%s) に追加できません"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libgaim/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "メッセージ (%s) を送信できません"
 
-#: ../libgaim/protocols/novell/novell.c:493
-#: ../libgaim/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "ユーザ (%s) を招待できません"
 
-#: ../libgaim/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "%s へメッセージを送信できません。会議 (%s) を作成できませんでした。"
 
-#: ../libgaim/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "メッセージを送信できません。会議 (%s) を作成できませんでした。"
 
-#: ../libgaim/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -10023,7 +6045,7 @@ msgstr ""
 "ユーザ %s をサーバ・サイド・リストにあるフォルダ %s へ移動できません。フォル"
 "ダの作成エラーです (%s)。"
 
-#: ../libgaim/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -10032,106 +6054,106 @@ msgstr ""
 "%s を仲間リストへ追加できません。サーバ・サイド・リスト (%s) のフォルダ作成エ"
 "ラーです。"
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "ユーザの %s (%s) さんの詳細情報を取得できませんでした"
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "ユーザを仲間リスト (%s) へ追加できません"
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s さんを拒否リスト (%s) へ追加できません"
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s さんを許可リスト (%s) へ追加できません"
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s さんをプライバシー・リスト (%s) から削除できません"
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "サーバ・サイド・プライバシー設定 (%s) を変更できません"
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "会議 (%s) を生成できません"
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "サーバとの通信中にエラーです。接続を閉じました。"
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "電話番号"
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "個人的な肩書き"
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "メールストップ"
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ユーザ ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "氏名"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会議 %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "サーバへ SSL 接続できません"
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "サーバへ接続できません"
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "応答待ちです..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s さんが会話ウインドウへ招待されています"
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "会議の招集"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -10142,38 +6164,38 @@ msgstr ""
 "\n"
 "送信先: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "会議に出席しますか？"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "別のワークステーションからログインしているので、強制的にログアウトされまし"
 "た。"
 
-#: ../libgaim/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s さんはオフラインのため、送信したメッセージを受け取りませんでした。"
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "エラーです。SSL サポートがインストールされていません。"
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "この会議は閉会しています。メッセージを送信することはできません。"
 
@@ -10187,33 +6209,33 @@ msgstr "この会議は閉会しています。メッセージを送信するこ
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise メッセンジャー・プロトコルのプラグイン"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "サーバのアドレス"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "サーバのポート"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "サーバが接続を閉じました"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -10222,13 +6244,14 @@ msgstr ""
 "サーバとの接続を失いました:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "サーバと接続する際に不正なデータを受け取りました"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -10247,19 +6270,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM プロトコルのプラグイン"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"ファイルの転送では常に AIM/ICQ プロキシ・サーバを利用する\n"
-"(速度は低下しますが、IP-アドレスは開示されません)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10270,152 +6285,144 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ プロトコル・プラグイン"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"ファイルの転送では常に ICQ プロキシ・サーバを利用する\n"
-"(速度は低下しますが、IP-アドレスは開示されません)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "リモート・ユーザが接続を閉じました"
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "リモート・ユーザはあなたの要求を却下しました"
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "リモート・ユーザとの接続が切れました:<br>%s"
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "リモート・ユーザとの接続で不正なデータを受け取りました"
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "リモート・ユーザとの接続を確立できませんでした"
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Direct IM を確立しました"
 
-#: ../libgaim/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ファイル %s は %s です (%s の最大サイズを超えています)"
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "不正なエラー"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "不正な SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "ホストの速度"
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "クライアントの速度"
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "サービスが利用できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "サービスが定義されていません"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "旧式の SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "ホストではサポートしていません"
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "クライアントではサポートしていません"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "クライアントに拒否されました"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "返信が大きすぎます"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "応答がありません"
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "リクエストが拒否されました"
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "SNAC 格納エリアが壊れました"
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "不十分な要求です"
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "局所的な許可/不許可"
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "とても悪い (送信者)"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "とても悪い (受信者)"
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "ユーザが一時的に無効です"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "マッチしません"
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "リスト溢れ"
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "要求が曖昧です"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "キューが一杯です"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "AOL に居る時はできません"
 
-#: ../libgaim/protocols/oscar/oscar.c:327
+#: ../libpurple/protocols/oscar/oscar.c:329
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -10427,7 +6434,7 @@ msgstr ""
 "ディングがわかるのであれば、アカウント・ダイアログの拡張オプションで指定して"
 "みて下さい。)"
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:438
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -10437,125 +6444,145 @@ msgstr ""
 "ディングで会話しているか、あるいは %s さんがおかしなクライアントを使っている"
 "と思われます。)"
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "仲間アイコン"
+
+#: ../libpurple/protocols/oscar/oscar.c:623
 msgid "Voice"
 msgstr "音声"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:626
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "チャット"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:632
+#: ../libpurple/protocols/oscar/oscar.c:5919
 msgid "Get File"
 msgstr "ファイルの取得"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:639
 msgid "Games"
 msgstr "ゲーム"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Add-Ins"
 msgstr "追加"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Send Buddy List"
 msgstr "仲間リストの送信"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct 接続"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:651
 msgid "AP User"
 msgstr "AP ユーザ"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:654
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Nihilist"
 msgstr "ニヒリスト"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "ICQ Server Relay"
 msgstr "ICQ サーバ中継"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Old ICQ UTF8"
 msgstr "古い ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "Trillian Encryption"
 msgstr "Trillian 暗号化"
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "Hiptop"
 msgstr "ヒップトップ"
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Security Enabled"
 msgstr "セキュリティは有効"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "Video Chat"
 msgstr "ビデオ・チャット"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Live Video"
 msgstr "ライブ・ビデオ"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Camera"
 msgstr "カメラ"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "Free For Chat"
 msgstr "チャットできます"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:710
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "Not Available"
 msgstr "不在です"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:712
+#: ../libpurple/protocols/oscar/oscar.c:5710
 msgid "Occupied"
 msgstr "多忙です"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:716
 msgid "Web Aware"
 msgstr "ウェブは見てます"
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:463 ../pidgin/gtkstatusbox.c:1053
+msgid "Invisible"
+msgstr "隠れています"
+
+#: ../libpurple/protocols/oscar/oscar.c:720
 msgid "Online"
 msgstr "オンライン"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:819
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP-アドレス"
+
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:2840
 msgid "Warning Level"
 msgstr "警告レベル"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:836
 msgid "Buddy Comment"
 msgstr "仲間のコメント"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:976
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10564,7 +6591,7 @@ msgstr ""
 "認証サーバに接続できませんでした:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:984
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10573,20 +6600,20 @@ msgstr ""
 "BOS サーバに接続できませんでした:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1024
 msgid "Screen name sent"
 msgstr "スクリーン名を送信しました"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1029
 msgid "Connection established, cookie sent"
 msgstr "(接続完了) cookie を送信しました"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1058
 msgid "Finalizing connection"
 msgstr "接続の最終調整中"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1242
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10597,28 +6624,28 @@ msgstr ""
 "ませんでした。スクリーン名の先頭は文字にし、文字と数字とスペースのみ、または"
 "数字のみにして下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "無効なスクリーン名です。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "パスワードが間違っています。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "お使いのアカウントは現在停止中です"
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL インスタント・メッセンジャー・サービスは一時的に利用不可です"
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1348
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -10626,45 +6653,44 @@ msgstr ""
 "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1388
 msgid "Could Not Connect"
 msgstr "接続できませんでした"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1393
 msgid "Received authorization"
 msgstr "認証を受信しました"
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1416
 msgid "The SecurID key entered is invalid."
 msgstr "入力したセキュア ID 鍵は不正です。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1430
 msgid "Enter SecurID"
 msgstr "セキュア ID の入力"
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1431
 msgid "Enter the 6 digit number from the digital display."
 msgstr "デジタル表示から６桁の数字を入力して下さい。"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libgaim/protocols/oscar/oscar.c:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5837
-#: ../libgaim/protocols/oscar/oscar.c:6067
-#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:2224
+#: ../libpurple/protocols/oscar/oscar.c:2271
+#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1472
+#: ../libpurple/protocols/oscar/oscar.c:1515
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10673,53 +6699,53 @@ msgstr ""
 "まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新のた"
 "めに、%s をチェックして下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim は正しい AIM ログイン hash を取得することができませんでした。"
+#: ../libpurple/protocols/oscar/oscar.c:1475
+#: ../libpurple/protocols/oscar/oscar.c:1518
+msgid "Unable to get a valid AIM login hash."
+msgstr "妥当な AIM ログインの hash 値を取得することができませんでした。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1604
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim は正しいログイン hash を取得できませんでした。"
+#: ../libpurple/protocols/oscar/oscar.c:1607
+msgid "Unable to get a valid login hash."
+msgstr "妥当なログインの hash 値を取得できませんでした。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1633
 msgid "Password sent"
 msgstr "パスワードの送信中"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1689
 msgid "Unable to initialize connection"
 msgstr "新しい接続を開けません"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2194
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "私があなたを仲間リストに追加できるように承認して下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2222
 msgid "Authorization Request Message:"
 msgstr "承認要求メッセージ:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Please authorize me!"
 msgstr "私を承認してください！"
 
-#: ../libgaim/protocols/oscar/oscar.c:2271
-#: ../libgaim/protocols/oscar/oscar.c:2278
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#: ../libgaim/protocols/oscar/oscar.c:5197
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2263
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "理由はわかりません。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2269
 msgid "Authorization Denied Message:"
 msgstr "承認拒否メッセージ:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2397
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10729,17 +6755,17 @@ msgstr ""
 "ユーザの %u さんが次の理由で仲間リストに追加する要求を拒否しました:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2398
 msgid "ICQ authorization denied."
 msgstr "ICQ 認証が拒否されました。"
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2405
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "ユーザの %u さんが仲間リストに追加するあなたの要求を承認しました。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10752,7 +6778,7 @@ msgstr ""
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10765,7 +6791,7 @@ msgstr ""
 "差出人: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10778,20 +6804,24 @@ msgstr ""
 "メッセージは:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2450
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ユーザの %u さんはあなたに仲間リストを送信しています: %s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2456
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "この相手を仲間リストに追加しますか？"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "_Decline"
 msgstr "断る(_D)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2546
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -10800,7 +6830,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%2$s さんからの %1$hu 通のメッセージは妥当でないので受け取れませんでした。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2555
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -10809,7 +6839,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%2$s さんからの %1$hu 個のメッセージは大きすぎるために受け取れませんでした。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2564
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10822,7 +6852,7 @@ msgstr[1] ""
 "速度制限を上回ったので %2$s さんからの %1$hu通のメッセージを受け取れませんで"
 "した。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2573
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -10833,7 +6863,7 @@ msgstr[1] ""
 "相手が有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れませんで"
 "した。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2582
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -10844,7 +6874,7 @@ msgstr[1] ""
 "あなたが有害すぎたので、%2$s さんからの %1$hu 個のメッセージを受け取れません"
 "でした。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2591
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -10855,67 +6885,62 @@ msgstr[1] ""
 "原因は不明ですが、%2$s さんからの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC スルーのエラー: %s\n"
-
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2746
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "メッセージを送信できません: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2758
-#: ../libgaim/protocols/oscar/oscar.c:2763
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2751
+#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2817
 msgid "Unknown reason."
 msgstr "原因は不明です"
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s さんへメッセージを送信できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2813
 #, c-format
 msgid "User information not available: %s"
 msgstr "ユーザ情報は有効ではありません: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2816
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s のユーザ情報は有効ではありません:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2845
 msgid "Online Since"
 msgstr "サイン・インした日時"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "メンバになった日時"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2855
 msgid "Capabilities"
 msgstr "機能"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "在席中のメッセージ"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Profile"
 msgstr "プロフィール"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が切れたようです"
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3175
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -10923,11 +6948,7 @@ msgstr ""
 "[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表示で"
 "きません]"
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
-msgid "Rate limiting error."
-msgstr "速度制限エラーです"
-
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3378
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -10935,84 +6956,85 @@ msgstr ""
 "速度制限を越えているため最後の操作は実行されませんでした。10 秒間ほど待ってか"
 "ら再度試みて下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3450
 msgid "You have been signed off for an unknown reason."
 msgstr "原因は不明ですが、あなたはサイン・アウトしました"
 
-#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャット・ルーム %s から切断されました"
 
-#: ../libgaim/protocols/oscar/oscar.c:3723
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: ../libgaim/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3740
 msgid "Personal Web Page"
 msgstr "個人的なウェブページ"
 
-#: ../libgaim/protocols/oscar/oscar.c:3758
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: ../libgaim/protocols/oscar/oscar.c:3766
-#: ../libgaim/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Division"
 msgstr "所属"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Position"
 msgstr "役職"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Information"
 msgstr "職業"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libpurple/protocols/oscar/oscar.c:3858
 msgid "Pop-Up Message"
 msgstr "ポップアップ・メッセージ"
 
-#: ../libgaim/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3898
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "次のスクリーン名は %s に関連づけられています"
 msgstr[1] "次のスクリーン名は %s に関連づけられています"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3903
 msgid "Screen name"
 msgstr "スクリーン名"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3929
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "E-メール・アドレス %s に対する結果を得られませんでした"
 
-#: ../libgaim/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s さんを確認するための問い合わせメールを受信して下さい"
 
-#: ../libgaim/protocols/oscar/oscar.c:3946
+#: ../libpurple/protocols/oscar/oscar.c:3952
 msgid "Account Confirmation Requested"
 msgstr "アカウント認証を要求しました"
 
-#: ../libgaim/protocols/oscar/oscar.c:3977
+#: ../libpurple/protocols/oscar/oscar.c:3983
 msgid "Error Changing Account Info"
 msgstr "アカウント情報変更エラー"
 
-#: ../libgaim/protocols/oscar/oscar.c:3980
+#: ../libpurple/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -11021,19 +7043,19 @@ msgstr ""
 "エラー 0x%04x: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "エラー 0x%04x: 要求されたスクリーン名が間違っているので整形できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "エラー 0x%04x: 要求されたスクリーン名が長すぎるので整形できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -11042,7 +7064,7 @@ msgstr ""
 "エラー 0x%04x: このスクリーン名に対して既に要求がきているので E-メール・アド"
 "レスを変更できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -11051,7 +7073,7 @@ msgstr ""
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているので、この E-メー"
 "ル・アドレスには変更できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -11060,42 +7082,32 @@ msgstr ""
 "エラー 0x%04x: このアドレスが間違っているので、この E-メール・アドレスに変更"
 "できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "エラー 0x%04x: 原因不明のエラーです"
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"あなたのスクリーン名は、現在次のように整形されています:\n"
-"%s"
+msgid "The e-mail address for %s is %s"
+msgstr "%s さんの E-メール・アドレスは %s です"
 
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "アカウント情報"
 
-#: ../libgaim/protocols/oscar/oscar.c:4014
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "%s さんの E-メール・アドレスは %s です"
-
-#: ../libgaim/protocols/oscar/oscar.c:4189
+#: ../libpurple/protocols/oscar/oscar.c:4187
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "IM 画像が送信されませんでした。IM 画像を送信するには Direct Connected になっ"
 "て下さい"
 
-#: ../libgaim/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4432
 msgid "Unable to set AIM profile."
 msgstr "AIM プロフィールをセットできません"
 
-#: ../libgaim/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4433
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -11105,37 +7117,37 @@ msgstr ""
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから再度試"
 "して下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
+#: ../libpurple/protocols/oscar/oscar.c:4447
 #, c-format
 msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] "プロフィールの長さが最大値 (%d バイト) に達したので切りつめました"
-msgstr[1] "プロフィールの長さが最大値 (%d バイト) に達したので切りつめました"
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
+msgstr[1] "プロフィールの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libgaim/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4452
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: ../libgaim/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] "離席メッセージの長さが最大値 (%d バイト) に達したので切りつめました"
-msgstr[1] "離席メッセージの長さが最大値 (%d バイト) に達したので切りつめました"
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
+msgstr[1] "離席メッセージの長さが上限値 ( %dバイト) に達したので切りつめました"
 
-#: ../libgaim/protocols/oscar/oscar.c:4510
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Away message too long."
 msgstr "離席メッセージが長すぎます"
 
-#: ../libgaim/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -11145,35 +7157,34 @@ msgstr ""
 "スクリーン名が間違っているため仲間 %s を追加できませんでした。スクリーン名の"
 "先頭は文字にし、文字と数字とスペースのみ、または数字のみにして下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4581
-#: ../libgaim/protocols/oscar/oscar.c:5004
-#: ../libgaim/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:4573
+#: ../libpurple/protocols/oscar/oscar.c:4996
+#: ../libpurple/protocols/oscar/oscar.c:5010
 msgid "Unable To Add"
 msgstr "追加できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4677
 msgid "Unable To Retrieve Buddy List"
 msgstr "仲間リストを取得できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:4686
+#: ../libpurple/protocols/oscar/oscar.c:4678
 msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
 msgstr ""
-"Gaim は一時的に AIM サーバから仲間リストを取得できませんでした。仲間リストは"
-"失われていません。おそらく数時間後には利用できるようになっているでしょう。"
+"一時的に AIM サーバから仲間リストを取得できませんでした。仲間リストは失われて"
+"いません。おそらく数時間後には利用できるようになっているでしょう。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4890
-#: ../libgaim/protocols/oscar/oscar.c:4891
-#: ../libgaim/protocols/oscar/oscar.c:4896
-#: ../libgaim/protocols/oscar/oscar.c:5072
-#: ../libgaim/protocols/oscar/oscar.c:5073
-#: ../libgaim/protocols/oscar/oscar.c:5078
+#: ../libpurple/protocols/oscar/oscar.c:4882
+#: ../libpurple/protocols/oscar/oscar.c:4883
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5065
+#: ../libpurple/protocols/oscar/oscar.c:5070
 msgid "Orphans"
 msgstr "みなしご"
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:4994
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -11182,12 +7193,12 @@ msgstr ""
 "仲間の %s さんを追加することができませんでした。仲間の数が多すぎます。一人削"
 "除して再度挑戦して下さい。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5008
 msgid "(no name)"
 msgstr "(名前無し)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5008
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -11198,7 +7209,7 @@ msgstr ""
 "これは仲間リストに追加可能な仲間の数を越えてしまっているということがあり得ま"
 "す。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -11207,22 +7218,22 @@ msgstr ""
 "ユーザの %s さんがあなたを仲間リストに加えることを許可しました。彼らを加えて"
 "もよろしいですか？"
 
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5108
 msgid "Authorization Given"
 msgstr "承認が得られました"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5188
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ユーザの %s さんは仲間リストに追加するあなたの要求を承認しました"
 
-#: ../libgaim/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5189
 msgid "Authorization Granted"
 msgstr "承認が得られました"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5192
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -11233,47 +7244,52 @@ msgstr ""
 "した:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5193
 msgid "Authorization Denied"
 msgstr "承認は拒否されました"
 
-#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "交換(_E):"
 
-#: ../libgaim/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5269
 msgid "Invalid chat name specified."
 msgstr "不正なチャット名が指定されました"
 
-#: ../libgaim/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5339
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "IM 画像が送信されませんでした。AIM チャットで IM 画像を送信できません。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5516
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5478
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "Away Message"
 msgstr "離席メッセージ"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(取得中)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5683
+msgid "iTunes Music Store Link"
+msgstr "iTunes 楽曲ストアのリンク"
+
+#: ../libpurple/protocols/oscar/oscar.c:5791
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s さんに対する仲間のコメント"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5792
 msgid "Buddy Comment:"
 msgstr "仲間のコメント:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5839
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s を利用した Direct IM 接続の開始を選択しています。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5843
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -11281,68 +7297,64 @@ msgstr ""
 "理由は、あなたの IP-アドレスを開示することになるからです。これにより個人情報"
 "に関する危険性が高まります。続行してもよろしいですか？"
 
-#: ../libgaim/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid "C_onnect"
 msgstr "接続する(_O)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Get AIM Info"
 msgstr "AIM 情報の取得"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Edit Buddy Comment"
 msgstr "仲間のコメントの編集"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5898
 msgid "Get Status Msg"
 msgstr "状態メッセージの取得"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libpurple/protocols/oscar/oscar.c:5911
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Re-request Authorization"
 msgstr "承認の再要求"
 
-#: ../libgaim/protocols/oscar/oscar.c:6032
+#: ../libpurple/protocols/oscar/oscar.c:5992
 msgid "Require authorization"
 msgstr "承認が必要です"
 
-#: ../libgaim/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:5995
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "ウェブは知っている (これを有効にすると SPAM を受け取ることになりますよ！)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6040
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "ICQ Privacy Options"
 msgstr "ICQ プライバシーのオプション"
 
-#: ../libgaim/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6019
 msgid "The new formatting is invalid."
 msgstr "新しい書式が間違っています"
 
-#: ../libgaim/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "スクリーン名の書式は大文字と空白文字しか変更できません"
 
-#: ../libgaim/protocols/oscar/oscar.c:6065
-msgid "New screen name formatting:"
-msgstr "新しいスクリーン名の書式:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6121
+#: ../libpurple/protocols/oscar/oscar.c:6073
 msgid "Change Address To:"
 msgstr "変更するアドレス:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6119
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>あなたは承認を待っていません</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6169
+#: ../libpurple/protocols/oscar/oscar.c:6122
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは次の仲間からの承認を待っています"
 
-#: ../libgaim/protocols/oscar/oscar.c:6170
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11350,96 +7362,100 @@ msgstr ""
 "右クリックして \"認証の再要求\" を選択することで、これらの仲間から認証を再要"
 "求することができます。"
 
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Find Buddy by E-Mail"
 msgstr "E-メールから仲間を捜す"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Search for a buddy by e-mail address"
 msgstr "E-メール・アドレスから仲間を検索します"
 
-#: ../libgaim/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "検索する仲間の E-メール・アドレスを入力して下さい"
 
-#: ../libgaim/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6303
 msgid "Set User Info (URL)..."
 msgstr "ユーザ情報のセット(URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6314
 msgid "Change Password (URL)"
 msgstr "パスワード変更 (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6318
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM フォワーディング (URL) の設定"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6328
 msgid "Set Privacy Options..."
 msgstr "プライバシー・オプションの追加..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6393
-msgid "Format Screen Name..."
-msgstr "スクリーン名の書式..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Confirm Account"
 msgstr "アカウントの確認"
 
-#: ../libgaim/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "Display Currently Registered E-Mail Address"
 msgstr "現在登録されている E-メール・アドレスの表示"
 
-#: ../libgaim/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "現在登録されている E-メール・アドレスの変更..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6412
+#: ../libpurple/protocols/oscar/oscar.c:6350
 msgid "Show Buddies Awaiting Authorization"
 msgstr "承認を待っている仲間を表示"
 
-#: ../libgaim/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "E-メールで仲間の検索..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Search for Buddy by Information"
 msgstr "情報で仲間の検索..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6429
 msgid "Use recent buddies group"
 msgstr "現在のグループを利用する"
 
-#: ../libgaim/protocols/oscar/oscar.c:6494
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Show how long you have been idle"
 msgstr "待機中の時間を表示する"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6584
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"ファイルの転送では常に ICQ プロキシ・サーバを利用する\n"
+"(速度は低下しますが、IP-アドレスは開示されません)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Direct IM で %s は %s:%hu で問い合わせがきています。"
 
-#: ../libgaim/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu にコンタクトを試みています"
 
-#: ../libgaim/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "プロキシ・サーバを介してコンタクトを試みています..."
 
-#: ../libgaim/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s は直接 %s に接続するように要求しました。"
 
-#: ../libgaim/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -11449,393 +7465,400 @@ msgstr ""
 "す。IP アドレスが明らかになるので、プライバシーに対するリスクが発生するかもし"
 "れません。"
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "接続する(_C)"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "主要な情報"
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "個人情報"
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ 番号"
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "国/地方"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "県/州"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "星座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "十二支"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "血液型"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "学歴"
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-メール"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "郵便番号"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "携帯電話の番号"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "電話番号"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "水瓶座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "魚座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "牡羊座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "牡牛座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "双子座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "蟹座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "獅子座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "乙女座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "天秤座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "蠍座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "射手座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "山羊座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "子"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "丑"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "寅"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "卯"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "辰"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "巳"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "午"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "未"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "申"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "酉"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "戌"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "亥"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "その他"
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "情報の変更"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "情報の更新"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "貴方の情報を変更しました"
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
 msgstr ""
-"独自の顔アイコンをセットしようとしました。Gaim では現在のところ標準の顔アイコ"
-"ンのみをサポートしています。次の中から選択して下さい:"
+"顔アイコンの変更は現在サポートしていません。%s から１つ選択して下さい。"
 
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "不正な顔アイコンです"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "%d個の要求を拒否しました"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "理由を入力して下さい:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "要求の拒否"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "すみませんが、私のタイプではありません..."
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:136
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "拒否する"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "認証付きで仲間の追加に失敗しました"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "仲間を削除しました"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "仲間リストからあなた自身を削除しました"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "ユーザ %d さんは認証が必要です"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "ここにリクエストをどうぞ"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "私の友達になってくれますか？"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "送信する"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "%d さんを仲間リストに追加しました"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid のエラー"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "不正な QQid です"
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "グループ ID"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "作成者"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "グループの説明"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "承認"
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libgaim/protocols/qq/group.c:120
+#: ../libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr "外部のグループ ID を入力して下さい"
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "半永久的に使用できる QQ グループのみ検索できます\n"
 
-#: ../libgaim/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "ユーザ %d さんがグループ %d に参加しました"
 
-#: ../libgaim/protocols/qq/group_im.c:123
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "理由: %s"
 
-#: ../libgaim/protocols/qq/group_im.c:130
-#: ../libgaim/protocols/qq/group_im.c:174
-#: ../libgaim/protocols/qq/group_im.c:214
-#: ../libgaim/protocols/qq/group_im.c:249
-#: ../libgaim/protocols/qq/group_im.c:283
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ Qun の操作"
 
-#: ../libgaim/protocols/qq/group_im.c:133
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "承認する"
 
-#: ../libgaim/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "グループ %d に参加するあなたの要求が管理者 %d によって拒否されました"
 
-#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "グループ %d に参加するあなたの要求が管理者 %d によって承認されました"
 
-#: ../libgaim/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "あなた [%d] はグループ \"%d\" から退去しました"
 
-#: ../libgaim/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "あなた [%d] はグループ \"%d\" に追加されました"
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "このグループは仲間リストに追加されています"
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "私はメンバではありません"
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "私はメンバです"
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "I am applying to join"
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "私は管理者です"
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "不明な状態"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr "このグループでは他の人たちの参加を許可していません"
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "グループからの退去が完了しました"
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ グループの認証"
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "認証操作が QQ サーバによって許可されました"
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "入力したグループ ID は範囲外です"
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "この Qun を終了してもよろしいですか？"
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -11843,174 +7866,181 @@ msgstr ""
 "注意: あなたが作成者の場合、\n"
 "この操作によって最終的に Qun が完全に削除されます。"
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "続行する"
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "コード [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr "グループ操作のエラー"
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "その要求を承認しますか？"
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "Qun メンバの変更が完了しました"
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "Qun 情報の変更が完了しました"
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "Qun の生成が完了しました"
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "今すぐ Qun の詳細な情報を入力しますか？"
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "入力する"
 
-#: ../libgaim/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "システム・メッセージ"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "サーバの ACK"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "メールの送信エラー\n"
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr "エラーが連続的に発生しています (接続が切れたと思われます！)"
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr "ログイン要求エラー！"
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "ログインできません (デバッグ・ログを確認して下さい)"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "接続できません"
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "不明な %d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "%s 住所"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "レベル"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: 在席してます"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: 離席中"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: 隠れています"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: オフラインです"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "名前が間違っています"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>現在のオンライン</b>: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Last Refresh</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>接続モード</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>サーバの IP</b>: %s: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>My Public IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>ログインした日時</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>最後にログインした IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>最後にログインした日時</b>: %s\n"
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "ログイン情報"
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "自分の情報の変更"
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr "ログイン情報を表示する"
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr "この QQ Qun を終了する"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "この仲間を拒否する"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -12021,246 +8051,248 @@ msgstr "この QQ Qun を終了する"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ プロトコル\tプラグイン"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "TCP でログインする"
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "ログインを隠す"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr "ソケット送信のエラー"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "接続が拒否されました"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "ソケットのエラー"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "ソケットを読めません"
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d さんがファイル %s を開示しました"
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "ファイルの送信"
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d さんは %s の転送をキャンセルしました"
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "接続を閉じました"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr "ログインに失敗しました (応答無し)"
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "この相手を追加しますか？"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "あなたは %s さんによって追加されました"
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "彼を追加しますか？"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s さんがあなた [%s] を追加しました"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "ユーザの %s さんはあなたの要求を拒否しました"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "ユーザの %s さんがあなたの要求を承認しました"
 
-#: ../libgaim/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s さんがあなた [%s] を友達として追加したがっています"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s さんは仲間リストにはありません"
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "彼を追加しますか？"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "書き込み用の接続を閉じました"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>グループ名:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes のグループ ID:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "グループ \"%s\" の情報"
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes のアドレス帳の情報"
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "グループを会議に招待する..."
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Notes のアドレス帳情報の取得"
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "ハンドシェイクの送信中です"
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "ハンドシェイクの応答を待っています"
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "ハンドシェイクの応答を受け取ったのでログインしています"
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "ログイン処理の応答を待っています"
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "ログイン処理がリダイレクトしました"
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "強制的にログインしています"
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "ログイン処理の応答を受け取りました"
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "サービスの開始"
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "接続しました"
 
-#: ../libgaim/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime 管理者がサーバ %s で次のアナウンスを発表しました"
 
-#: ../libgaim/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理者のアナウンス"
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "接続のリセット"
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "ソケットから読み込む際にエラー: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "ホストに接続できません"
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s からのお知らせ"
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "会議を閉会しました"
 
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "メッセージを送信できません: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place Closed"
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "マイク"
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "スピーカ"
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "ビデオ・カメラ"
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "ファイルの転送"
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "サポート"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "外部のユーザ"
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "ユーザを含めた会議の開催"
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -12269,27 +8301,27 @@ msgstr ""
 "新しい会議で取り上げるトピックを入力し、%s さんに招待のメッセージを送信して下"
 "さい"
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "新しい会議"
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "開催する"
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "参加可能な会議"
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "新しい会議を開催する..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "会議に招待する"
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12299,23 +8331,27 @@ msgstr ""
 "次の一覧からユーザの %s さんを招待する会議を選択して下さい。新しい会議を開催"
 "する場合は \"新しい会議を開催する\" を選択して下さい。"
 
-#: ../libgaim/protocols/sametime/sametime.c:3492
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "会議に招待する"
 
-#: ../libgaim/protocols/sametime/sametime.c:3582
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "会議に招待する..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "TEST 用アナウンスを送信する"
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+msgid "Topic:"
+msgstr "トピック:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Sametime コミュニティ・サーバを指定して下さい"
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -12324,38 +8360,38 @@ msgstr ""
 "アカウント %s に対するホスト名または IP-アドレスが指定されていません。次の欄"
 "に入力してログイン処理を続行して下さい。"
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "接続の設定"
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime コミュニティ・サーバを指定して下さい"
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unknown (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Last Known Client:"
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "ユーザ名"
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "曖昧なユーザ ID が指定されました"
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12364,15 +8400,15 @@ msgstr ""
 "おそらく ID '%s' は次に示すユーザの誰かを参照していると思われます。仲間リスト"
 "に追加する妥当なユーザを次の一覧から選択して下さい。"
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "ユーザの選択"
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "ユーザを追加できません: ユーザが見つかりません"
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -12381,11 +8417,11 @@ msgstr ""
 "ID '%s' に該当するユーザが Sametime コミュニティの中にはいませんでした。仲間"
 "リストからこのエントリを削除しました。"
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "ユーザを追加できません"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12394,63 +8430,63 @@ msgstr ""
 "ファイル %s を読み込む際にエラー: \n"
 "%s\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "リモートにある仲間リスト"
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "仲間リストの格納モード"
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "ローカルの仲間リストだけ"
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "サーバから仲間リストをマージする"
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "仲間リストをマージしてサーバに格納する"
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "サーバの仲間リストと同期する"
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "アカウント %s の Sametime リストを取り込む"
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "アカウント %s の Sametime リストを出力する"
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "グループを追加できません: 既に存在しています"
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "既に '%s' というグループが仲間リストの中にあります"
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "グループを追加できません"
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "一致しそうなもの"
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr "Notes アドレス帳グループの結果"
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12461,15 +8497,15 @@ msgstr ""
 "ると思われます。仲間リストに追加する妥当なグループを次の一覧から選択して下さ"
 "い。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr "Notes アドレス帳の選択"
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "グループを追加できません: 見つかりません"
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -12478,11 +8514,11 @@ msgstr ""
 "ID '%s' に該当するグループが Sametime コミュニティの Notes アドレス帳グループ"
 "の中にはいませんでした。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr "Notes アドレス帳グループ"
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5475
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -12490,12 +8526,12 @@ msgstr ""
 "次の欄に追加する Notes アドレス帳グループの名前を入力して仲間リストにそのグ"
 "ループのメンバを追加して下さい。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "'%s' の検索結果"
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12506,24 +8542,28 @@ msgstr ""
 "のユーザを仲間リストに追加するか、または次のアクション・ボタンを選択して彼ら"
 "にメッセージを送信した方が良いでしょう。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "検索結果"
+
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "見つかりません"
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Sametime コミュニティには ID '%s' に一致するユーザはいませんでした"
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "見つかりません"
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "ユーザの検索"
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -12531,90 +8571,97 @@ msgstr ""
 "次の欄に名前または ID の一部を入力して Sametime コミュニティにいるユーザを検"
 "索して下さい"
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "ユーザの検索"
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr "Sametime リストを取り込む..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr "Sametime リストを出力する..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr "Notes アドレス帳グループを追加する..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "ユーザの検索..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr "強制的にログインする (サーバからのリダイレクトを無視する)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr "クライアントの情報を隠す"
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "ユーザの %s さんはネットワーク上にいません"
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "キーの同意"
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "キーの同意を実行できません"
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "キーに同意する際にエラーが発生しました"
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "キーの同意に失敗しました"
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "キーに同意する際にタイムアウトしました"
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "キーの同意が中断されました"
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "既にキーの同意を開始しています"
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "キーの同意を自分自身では開始できません"
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "リモート・ユーザはネットワーク等に存在しません"
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "%s さんからキーの同意要求を受け取りました。同意してもよろしいですか？"
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12625,60 +8672,69 @@ msgstr ""
 "リモート・ホスト: %s\n"
 "リモート・ポート: %d"
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "キーの同意の要求"
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "パスワード付き IM"
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "IM キーをセットできません"
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "IM パスワードのセット"
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "公開鍵の取得"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:549
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "公開鍵を取得できません"
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "公開鍵の表示"
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "公開鍵を読み込めませんでした"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "ユーザ情報"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:714
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "ユーザ情報を取得できません"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "仲間 %s は信用されていません"
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -12687,16 +8743,16 @@ msgstr ""
 "る際は、ボタン [公開鍵を取得する...] をクリックして下さい。"
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "開く..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "仲間 %s はネットワーク上に存在しません"
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -12704,15 +8760,15 @@ msgstr ""
 "仲間を追加するには公開鍵を取り込まなければなりません。公開鍵を取り込む際は、"
 "ボタン [インポートする...] をクリックして下さい。"
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "インポート(_I).."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "妥当なユーザの選択"
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -12720,7 +8776,7 @@ msgstr ""
 "同じ公開鍵を持ったユーザが一人以上います。仲間リストへ追加する妥当なユーザを"
 "一覧から選択して下さい。"
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -12728,213 +8784,238 @@ msgstr ""
 "同じ名前を持ったユーザが一人以上います。仲間リストへ追加する妥当なユーザを一"
 "覧から選択して下さい。"
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "切り離し済"
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "不適済"
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "起こして下さい"
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "ハイパー・アクティブ"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "ロボット"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "ハッピー"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "悲しむ"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "怒る"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "やきもち"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "恥じる"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "恋愛中"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "眠いよ"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "うんざり"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "心配"
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "ユーザ・モード"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "不機嫌"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "お好みの連絡先"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "お好みの言語"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "デバイス"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "地理的位置"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "IM キーのリセット"
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "キー交換付き IM"
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "パスワード付き IM"
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "公開鍵を取得する..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1667
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "ユーザの強制終了"
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "ホワイトボードに描く"
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "パスフレーズ(_P):"
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "チャンネル %s はネットワーク上に存在しません"
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "チャンネル情報"
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "チャンネル情報を取得できません"
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>チャンネル名:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>ユーザのカウント:</b> %d"
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>チャンネル設立者:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>チャンネル符号:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>チャンネル HMAC:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>チャンネル・トピック:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>チャンネル・モード:</b> "
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者キーの指紋:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者キーの Babbleprint:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "チャンネル公開鍵の追加"
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "公開鍵を開く..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "チャンネルのパスフレーズ"
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "チャンネル公開鍵の一覧"
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12947,319 +9028,333 @@ msgstr ""
 "がセットされていると参加するためのパスフレーズが要求され、チャンネルの公開鍵"
 "がセットされていると、公開鍵が一覧表示されているユーザのみ参加可能です。"
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "チャンネル認証"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "追加 / 削除"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "グループ名"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "チャンネル %s のプライベートなグループ名とパフフレーズを入力して下さい。"
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "プライベートなグループの追加"
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "ユーザの制限"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "チャンネルで制限するユーザをセットして下さい (0: ユーザ制限をクリアします)。"
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "招待リスト"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "追い出しリスト"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "プライベート・グループの追加"
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "永続性 OFF"
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "永続性 ON"
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "ユーザ制限 ON"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "トピック限定 OFF"
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "トピック限定 ON"
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "プライベートなチャンネル OFF"
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "プライベートなチャンネル ON"
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "シークレットなチャンネル OFF"
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "シークレットなチャンネル ON"
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "あなたは <I>%s</I> のチャンネル創設者です"
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> のチャンネル創設者は <I>%s</I> です"
 
-#: ../libgaim/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "プライベートなグループへ参加する前にチャンネル %s へ参加して下さい"
 
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "プライベート・グループへ参加"
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "プライベート・グループへ参加できません"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "コマンドの実行"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "コマンドを実行できません"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "不明なコマンド"
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "セキュアなファイル転送"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "ファイルを転送する際にエラー"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "キーの同意に失敗しました"
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "ファイル転送セッションがありません"
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "ファイル転送セッションがアクティブではありません"
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "既にファイル転送を開始しています"
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "ファイル転送に必要なキーの同意を実行できませんでした"
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "ファイル転送を開始できませんでした"
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "ファイルを送信できません"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s は <I>%s</I> のトピックを %s へ変更しました:"
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> はチャンネル <I>%s</I> のモードを %s へセットしました:"
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> はチャンネル <I>%s</I> の全てのモードを削除しました:"
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> は <I>%s の</I> モードを %s へセットしました:"
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> は <I>%s の</I> 全てのモードを削除しました:"
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "あなたは <I>%s</I> から <I>%s</I> (%s) によって追い出されました:"
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "あなたは %s (%s) によって強制終了させられました:"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "%s (%s) によって強制終了させられました"
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "サーバのサインオフ"
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "個人情報"
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "誕生日"
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "役職"
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "担当部署"
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "グループ"
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "備考"
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "チャットに参加"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "氏名"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "ステータス文"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公開鍵の指紋"
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公開鍵の Babbleprint"
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "詳細(_M)..."
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "サーバから切り離す"
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "切り離せません"
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "トピックをセットできません"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "あだ名の変更に失敗しました"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "部屋のリスト"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "部屋のリストを取得できません"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "公開鍵を受け取っていません"
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "サーバの情報"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "サーバの情報を取得できません"
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "サーバの統計情報"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "サーバの統計情報を取得できません"
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "サーバの統計情報は利用できません"
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -13294,104 +9389,106 @@ msgstr ""
 "サーバのオペレータ数の合計: %d\n"
 "ルータのオペレータ数の合計: %d\n"
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "ネットワークの統計情報"
 
-#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping に失敗しました"
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "サーバから Ping リプライを受け取りました"
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "ユーザを強制終了できませんでした"
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "SILC サーバへ接続する際にエラー"
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr "キーの交換に失敗しました"
 
-#: ../libgaim/protocols/silc/ops.c:1723
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "切り離したセッションの復帰に失敗しました。新しい接続を確立する際は、ボタン "
 "[再接続] をクリックして下さい。"
 
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "サーバが接続を切断しました"
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "セッションの復帰中"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "接続の認証中"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "サーバの公開鍵の検証中"
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "パスフレーズの要求"
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "失敗: リモート側は信用されていなか、お使いの公開鍵をサポートしていません"
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗: リモート側は推奨されている KE グループをサポートしていません"
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗: リモート側は推奨されている Cipher をサポートしていません"
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗: リモート側は推奨されている PKCS をサポートしていません"
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗: リモート側は推奨されているハッシュ機能をサポートしていません"
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗: リモート側は推奨されている HMAC をサポートしていません"
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "失敗: 不正な署名です"
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "失敗: 不正なクッキーです"
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "失敗: 認証に失敗しました"
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -13400,12 +9497,12 @@ msgstr ""
 "%s の公開鍵を受け取りましたが、ローカルの複製と一致しません。この受け取った公"
 "開鍵をまだ受け入れますか？"
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "%s の公開鍵を受け取りました。この受け取った公開鍵を受け入れますか？"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13418,65 +9515,73 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "公開鍵の検証"
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "表示する(_V)..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "サポートしていない公開鍵の種類"
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "接続に失敗"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr "SILC クライアント接続を初期化できません"
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr "鍵の交換の実行中"
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr "名前なし"
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "SILC プロトコルを初期化できません"
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr "~/.silc フォルダが見みつからないかアクセスできません"
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "SILC サーバへ接続中"
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "SILC の鍵ペアを読み込めませんでした: %s"
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr "新しい接続を開けません"
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr "現在の Mood"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+msgid "Normal"
+msgstr "標準"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr "恋愛中"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13484,43 +9589,46 @@ msgstr ""
 "\n"
 "お好みの連絡方法"
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr "ビデオ会議"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "現在のステータス"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr "オンライン・サービス"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr "何のサービスが利用されているか他の人たちに公開して下さい"
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr "どんなコンピュータを利用しているか他の人たちに公開して下さい"
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr "VCard 型式ファイル"
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr "ユーザのオンライン・ステータスの属性"
 
-#: ../libgaim/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/silc.c:739
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -13529,171 +9637,175 @@ msgstr ""
 "あなたのオンライン・ステータス情報と個人情報を他のユーザへ公開することが可能"
 "です。他のユーザに公開したい情報を全て入力して下さい。"
 
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "今日のメッセージ"
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "\"今日のメッセージ\" は利用できません"
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "この接続に対応した \"今日のメッセージ\" はありません"
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "新しい SILC 鍵ペアの生成"
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "新しいパスフレーズが一致しません"
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "鍵ペアの生成が失敗しました"
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "鍵の長さ"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "公開鍵ファイル"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "秘密鍵ファイル"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "パスフレーズ (確認用)"
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "鍵ペアの生成"
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "オンライン・ステータス"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "\"今日のメッセージ\" を表示する"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "SILC 鍵ペアの生成..."
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "ユーザ <I>%s</I> はネットワークに存在しません"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "トピックが長すぎます"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "あだ名を指定して下さい"
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "チャンネル %s が見つかりません"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s のチャンネル・モード: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s ではチャンネル・モードをセットしてません"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "%s のチャンネル・モードのセットに失敗"
 
-#: ../libgaim/protocols/silc/silc.c:1534
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "不明なコマンド: %s (おそらく Gaim のバグ)"
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "不明なコマンド: %s (おそらくクライアント側のバグ)"
 
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [チャンネル]:  指定したチャンネルから退出します"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [チャンネル]:  指定したチャンネルから退出します"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新しいトピック&gt;]:  トピックを表示したり変更します"
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;チャンネル&gt; [&lt;パスワード&gt;]:  このネットワークのチャットへ参"
 "加します"
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  このネットワーク上のチャンネルを一覧表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;あだ名&gt;:  指定したあだ名のユーザ情報を表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;あだ名&gt; &lt;メッセージ&gt;:  指定したあだ名のユーザへ個人的なメッ"
 "セージを送信します"
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;あだ名&gt; [&lt;メッセージ&gt;]:  指定したあだ名のユーザへ個人的な"
 "メッセージを送信します"
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  サーバにある \"今日のメッセージ\" を表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  このセッションを切り離します"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [メッセージ]:  追加でメッセージを残して、このサーバから切断します"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;コマンド&gt;:  SILC クライアント・コマンドを呼び出します"
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;あだ名&gt; [-pubkey|&lt;理由&gt;]:  あだ名のユーザを強制終了します"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新しいあだ名&gt;:  お使いのあだ名を変更します"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;あだ名&gt;:  あだ名のユーザ情報を表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -13701,7 +9813,7 @@ msgstr ""
 "cmode &lt;チャンネル&gt; [+|-&lt;モード&gt;] [引数]:  チャンネルのモードを変"
 "更したり表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -13709,15 +9821,15 @@ msgstr ""
 "cumode &lt;チャンネル&gt; +|-&lt;モード&gt; &lt;あだ名&gt;:  指定したチャンネ"
 "ルのあだ名のユーザのモードを変更します"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;ユーザ・モード&gt;:  ネットワークでのモードをセットします"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;あだ名&gt; [-pubkey]:  サーバのオペレータ特権を取得します"
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -13725,40 +9837,40 @@ msgstr ""
 "invite &lt;チャンネル&gt; [-|+]&lt;あだ名&gt;:  指定したあだ名のユーザを招待"
 "する、または招待リストからそのユーザを追加/削除します"
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;チャンネル&gt; &lt;あだ名&gt; [コメント]:  チャンネルからクライアン"
 "トを追い出します"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [サーバ]:  サーバの管理者の詳細を表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;チャンネル&gt; +|-&lt;あだ名&gt;]:  クアイアントをチャンネルから追い"
 "出します"
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;あだ名|サーバ&gt;:  クライアントまたはサーバの公開鍵を取得します"
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  サーバとネットワークの統計情報を表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  接続しているサーバへ PING を送信します"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;チャンネル&gt;:  チャンネル内のユーザを一覧表示します"
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13775,111 +9887,116 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1816
 msgid "SILC Protocol Plugin"
 msgstr "SILC プロトコルのプラグイン"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1818
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "セキュアなインターネット・ライブ会議 (SILC) プロトコル"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1844 ../pidgin/gtkprefs.c:1920
+msgid "Network"
+msgstr "ネットワーク"
+
+#: ../libpurple/protocols/silc/silc.c:1855
 msgid "Public Key file"
 msgstr "公開鍵ファイル"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1859
 msgid "Private Key file"
 msgstr "秘密鍵ファイル"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1869
 msgid "Cipher"
 msgstr "暗号"
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1879
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1882
 msgid "Public key authentication"
 msgstr "公開鍵を認証する"
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1885
 msgid "Reject watching by other users"
 msgstr "他のユーザからの監視を拒否する"
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1888
 msgid "Block invites"
 msgstr "招待を拒否する"
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1891
 msgid "Block IMs without Key Exchange"
 msgstr "鍵の交換が無い IM を拒否する"
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1894
 msgid "Reject online status attribute requests"
 msgstr "オンライン・ステータスの属性要求を拒否する"
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "ホワイトボードへのメッセージをブロックする"
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "ホワイトボードを自動的に公開する"
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "電子署名して全てのメッセージを検証する"
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "SILC 鍵ペアの生成中..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "氏名: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "ユーザ名: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-メール: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "ホスト名: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "組織: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "アルゴリズム: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "鍵の長さ: \t%d ビット\n"
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -13890,7 +10007,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -13899,38 +10016,39 @@ msgstr ""
 "公開鍵の Babbleprint:\n"
 "%s"
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "公開鍵の情報"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr "ページング"
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:561
 msgid "Video Conferencing"
 msgstr "ビデオ会議"
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "コンピュータ"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "端末"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s さんがホワイトボードにメッセージを送信してきました。そのホワイトボードを公"
 "開してもよろしいですか？"
 
-#: ../libgaim/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -13939,36 +10057,36 @@ msgstr ""
 "%s さんが %s にあるホワイトボードにメッセージを送信してきました。そのホワイト"
 "ボードを公開してもよろしいですか？"
 
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "ホワイトボード"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libgaim/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "書き込めませんでした"
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1486
 msgid "Could not connect"
 msgstr "接続できませんでした"
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "ソケットを生成できませんでした"
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
 msgstr "ホスト名を解決できませんでした"
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP のスクリーン名に空白または @ 記号が含まれていないようです"
 
@@ -13980,157 +10098,157 @@ msgstr "SIP のスクリーン名に空白または @ 記号が含まれてい�
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE プロトコルのプラグイン"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr "状態を公開する (注記: 他のユーザから丸見えになります)"
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "UDP を使用する"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "プロキシを利用する"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr "ユーザ認証"
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr "ドメイン認証"
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "%s の検索中"
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s への接続に失敗しました"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "サイン・イン: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "ファイル %s を書き込めません"
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "ファイル %s を読み込めません"
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "メッセージが長過ぎるので最後の %s バイトを切りつめました"
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s さんは正しくログインしていません"
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s の警告は許されません"
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "サーバの速度制限を越えたためメッセージは落されました"
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s でのチャットはできません"
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "早すぎて %s へメッセージを送信できません"
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "大きすぎるため %s からの IM を無視しました"
 
-#: ../libgaim/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "早く送りすぎたので %s さんからの IM を無視しました"
 
-#: ../libgaim/protocols/toc/toc.c:518
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "失敗しました"
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "一致するものが多すぎます"
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "より多くの修飾語を必要とします"
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "一時的にディレクトリ・サービスが利用できません"
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "E-メール検索が拒否されました"
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "キーワードが無効です"
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "キーワードがありません"
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "フォルダ情報がありません"
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "サポートされていない国です"
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "原因不明の失敗: %s"
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "スクリーン名またはパスワードが間違っています"
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "一時的にサービスが利用できません"
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "ログインする警告レベルが高すぎます"
 
-#: ../libgaim/protocols/toc/toc.c:558
+#: ../libpurple/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -14138,92 +10256,79 @@ msgstr ""
 "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "原因不明のサイン・オン・エラーが起こりました: %s"
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "不明なエラー %d が発生しました (情報: %s)"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "グループ名が間違っています"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "接続を閉じました"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "返答待ちです..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC は一時停止状態から戻りました。メッセージを再送できます。"
 
-#: ../libgaim/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "パスワードの変更が完了しました"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC は PAUSE コマンドを送信しました"
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"これが発生した場合は TOC はメッセージの送信を無視するのでメッセージを送っても"
-"蹴られます。Gaim はすべて抑止します。 一時的ですので我慢して下さい。"
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "グループ(_G):"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "フォルダ情報の取得"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "フォルダ情報の設定"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "書き込みモードで %s を開けません！"
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "転送できませんでした！"
 
-#: ../libgaim/protocols/toc/toc.c:2095
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "ファイルヘッダを書けません。ファイルは送信されません。"
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - 別名で保存..."
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "別名で保存..."
 
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s さんから %s さんへの %d個のファイルの要求: %s (%.2f %s)%s%s"
 msgstr[1] "%s さんから %s さんへの %d個のファイルの要求: %s (%.2f %s)%s%s"
 
-#: ../libgaim/protocols/toc/toc.c:2236
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s さんがファイルを送るよう要求しています"
@@ -14238,35 +10343,35 @@ msgstr "%s さんがファイルを送るよう要求しています"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC プロトコル・プラグイン"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! メッセージを送ることができませんでした。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr "Buzz!!"
+#: ../libpurple/protocols/yahoo/yahoo.c:878
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s さんが合図を送りたがっています！"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s の Yahoo! システム・メッセージ:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "認証拒否メッセージ:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s は仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒否しました。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -14275,26 +10380,26 @@ msgstr ""
 "%s は次の理由のため仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒"
 "否しました\" %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "拒否する仲間の追加"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
 msgstr ""
 "Yahoo サーバが認識できない認証方法の使用を要求してきました。このバージョンの "
-"Gaim はおそらく Yahoo にサイン・オンすることはできないでしょう。%s でアップ"
-"デートできるか確認して下さい。"
+"pidgin ではおそらく Yahoo にサイン・インできないでしょう。%s にアップデートで"
+"きるか確認してみて下さい。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認証に失敗"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -14303,166 +10408,155 @@ msgstr ""
 "%s を無視しようとしましたが、ユーザが仲間リストにあります。そのユーザを仲間リ"
 "ストから削除して無視する場合は、\"はい\" をクリックして下さい。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "仲間を無視しますか？"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "標準の認証に失敗しました！"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"標準の認証方法で失敗しました。これは、お使いのパスワードが間違っているか、あ"
-"るいは Yahoo! の認証手順が変更されたかのどちらかです。Gaim はウェブ・メッセン"
-"ジャー認証方法を利用してログインを試みますが、利用できる機能が少なくなるかも"
-"しれません。"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "お使いのアカウントがロックされています。Yahoo! ウェブサイトへログインして下さ"
 "い。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "グループ %2$s の仲間 %1$s をアカウント %3$s でサーバ・リストに追加できません"
 "でした。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "仲間をサーバ・リストに追加できませんでした"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 演奏可能 %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "接続エラー"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "家に居ません"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "在席していません"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "オフィスに居ません"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "休暇中です"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "ちょっとそこまで"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "サーバ・リストにありません"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr "オンラインのようです"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr "一時的にオフラインのようです"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "在席"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "オフラインのようです"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "チャットへ参加"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "会議に招待"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "在席状態の設定"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr "いたずら書きする"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "どの ID を有効化しますか？"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "どのチャットへ参加しますか？"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "ID の有効化..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "チャットに参加する..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
+msgid "You have just sent a Buzz!"
+msgstr "今、合図を送りました！"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ユーザ宛に警告音を鳴らす"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: いたずら書きを始めることをユーザに要求する"
 
@@ -14476,88 +10570,88 @@ msgstr "doodle: いたずら書きを始めることをユーザに要求する"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo! プロトコル・プラグイン"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan! に接続する"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "ページャのサーバ"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "日本のページャ・サーバ"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "ファイル転送サーバ"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "日本のファイル転送サーバ"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "ファイル転送のポート番号"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "チャット・ルームの場所"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "会議とチャットルームの招待を無視する"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "チャット・ルームの URL リスト"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Yahoo チャット・サーバ"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Yahoo チャットのポート番号"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s は会議招待を部屋 \"%s\" に落としました (理由は \"%s\")。"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "招待が拒否されました"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "チャットへの参加が失敗しました"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "不明なルーム"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "おそらくルームが一杯かも？"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "利用不可"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -14565,68 +10659,68 @@ msgstr ""
 "原因不明のエラーです (ログアウトし 5秒ほど待機してから、もう一度チャトルーム"
 "へ参加して下さい)"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "あなたは %s でチャットしています"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "チャットの仲間に参加できません"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "おそらくチャットには誰もいないかも？"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr "部屋一覧の取得に失敗しました"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr "音声"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr "ウェブカム"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr "部屋一覧を取得できません"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "ユーザの部屋"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Doodle 要求を送信する"
 
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "ファイル・デスクリプタを取得できません"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
 msgid "Write Error"
 msgstr "書き込みエラー"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan プロファイル"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! プロファイル"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -14634,7 +10728,7 @@ msgstr ""
 "すみません、このバージョンでは、アダルト向けコンテンツを含んでいるとマークが"
 "付けられたプロファイルは利用いただけません."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -14642,47 +10736,47 @@ msgstr ""
 "このプロフィールの閲覧を希望する場合は、お使いのウェブ・ブラウザから次のリン"
 "クを訪問して下さい:"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "趣味"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "最新ニュース"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "ホームページ"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "クールなリンク１"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "クールなリンク２"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "クールなリンク３"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "最終更新日"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s のユーザ情報は有効ではありません"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -14690,7 +10784,7 @@ msgstr ""
 "すみません、このプロファイルはこのバージョンではサポートされていない書式/言語"
 "のようです。"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -14698,7 +10792,7 @@ msgstr ""
 "ユーザのプロフィールを取得できませんでした。これは、おそらく一時的なサーバ側"
 "の問題でしょう。後で再試行してみて下さい。"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -14709,15 +10803,15 @@ msgstr ""
 "ることがあります。そのユーザが存在していることが確かならば、後で再試行してみ"
 "て下さい。"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "ユーザのプロフィールが空です。"
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT サーバを使った接続に問題があります。"
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -14726,7 +10820,7 @@ msgstr ""
 "サーバとの接続が切れました\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -14734,86 +10828,86 @@ msgstr ""
 "(このメッセージを変換する際にエラーが発生しました。\t アカウント・エディタの "
 "'エンコード' オプションを確認して下さい)"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "チャット %s,%s,%s へ送信できません"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1203
 msgid "User"
 msgstr "ユーザ"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1209
 msgid "Hidden or not logged-in"
 msgstr "隠れているか、またはサインインしていません"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1211
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s に %s から居ます"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1546
-#: ../libgaim/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1545
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
 msgid "Anyone"
 msgstr "だれでも"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2353
 msgid "_Class:"
 msgstr "クラス(_C):"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr "インスタンス(_I):"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr "受取人(_R):"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "%s,%s,%s への購読の試行に失敗"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2689
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;あだ名&gt;: ユーザの所在地を確認します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2694
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;あだ名&gt;: ユーザの所在地を確認します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2699
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;インスタンス&gt;: このクラスで使用するインスタンスをセットします"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;クラス&gt; &lt;インスタンス&gt; &lt;宛先&gt;: 新しいチャットへ参加し"
 "ます"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;インスタンス&gt;: &lt;メッセージ、<i>インスタンス</i>、*&gt; へメッ"
 "セージを送信します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -14821,7 +10915,7 @@ msgstr ""
 "zci &lt;クラス&gt; &lt;インスタンス&gt;: &lt;<i>クラス</i>、<i>インスタンス</"
 "i>、*&gt; へメッセージを送信します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14829,7 +10923,7 @@ msgstr ""
 "zcir &lt;クラス&gt; &lt;インスタンス&gt; &lt;宛先&gt;: &lt;<i>クラス</i>、<i>"
 "インスタンス</i>、<i>宛先</i>&gt; へメッセージを送信します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -14837,16 +10931,16 @@ msgstr ""
 "zir &lt;インスタンス&gt; &lt;宛先&gt;: &lt;MESSAGE、<i>インスタンス</i>、<i>"
 "宛先</i>&gt; へメッセージを送信します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;クラス&gt;: &lt;<i>クラス</i>,PERSONAL,*&gt; へメッセージを送信します"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr "再購読"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr "サーバから購読を取得します"
 
@@ -14860,45 +10954,45 @@ msgstr "サーバから購読を取得します"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyrプロトコル・プラグイン"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "tzc を使う"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "tzc コマンド"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr ".anyone へエキスポート"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr ".zephyr.subs へエキスポート"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr ".anyone からインポート"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr ".zephyr.subs からインポート"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr "Exposure"
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -14907,68 +11001,68 @@ msgstr ""
 "ソケットを生成できません:\n"
 "%s"
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "HTTP プロキシからの応答を解析できません: %s\n"
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP プロキシの接続エラー %d"
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "アクセスが拒否されました: HTTP プロキシ・サーバがポート番号 %d のトンネリング"
 "を拒否しました"
 
-#: ../libgaim/proxy.c:984
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s を解決する際にエラー"
 
-#: ../libgaim/proxy.c:1676
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
 msgstr "ホスト名を解決できませんでした"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "はい(_Y)"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "いいえ(_N)"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "許可する(_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "今は離席中です"
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "保存した状態"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s さんは %s さんと認識されました\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:670
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14977,73 +11071,73 @@ msgstr ""
 "%s さんが %s さんをチャット・ルーム %s へ招待しています:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:675
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s さんが %s さんをチャット・ルーム %s へ招待しています\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:679
 msgid "Accept chat invitation?"
 msgstr "チャットへの招待を受けますか？"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "解除"
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:156
 msgid "Unavailable"
 msgstr "利用不可"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "移動中"
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s さんがステータスを %s から %s に変更しました"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s さんは %s さんと認識されました"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "もう %s さんは %s さんではありません"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1288
 #, c-format
 msgid "%s became idle"
 msgstr "%s さんが待機中になりました"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1305
 #, c-format
 msgid "%s became unidle"
 msgstr "%s さんが待機中から復帰しました"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1371
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s さんが待機中になりました"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1373
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s さんが待機中から復帰しました"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s を読み込む際にエラー"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -15052,62 +11146,62 @@ msgstr ""
 "%s を読み込む際にエラーが発生しました。その情報は読み込まれません。また、古い"
 "ファイルの名前を \"%s~\" に変更しました。"
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2980
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2983
 msgid "Unknown."
 msgstr "不明です"
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:3009
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 msgstr[1] "%d秒"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:3021
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 msgstr[1] "%d日"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:3029
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d時間"
 msgstr[1] "%s %d時間"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:3035
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 msgstr[1] "%d時間"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:3043
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d分"
 msgstr[1] "%s %d分"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:3049
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 msgstr[1] "%d分"
 
-#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
+#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%s へ接続できません"
 
-#: ../libgaim/util.c:3292
+#: ../libpurple/util.c:3441
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -15116,17 +11210,4182 @@ msgstr ""
 "%s から受け取った情報を格納するためのメモリを確保できません。ウェブ・サーバか"
 "ら何か悪意を持って転送している可能性があります。"
 
-#: ../libgaim/util.c:3327
+#: ../libpurple/util.c:3476
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s からの読み込みでエラー: %s"
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3507
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s へ書き込む際にエラー: %s"
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s へ接続できません: %s"
+
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "インターネット・メッセンジャー"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin インターネット・メッセンジャー"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "複数のプロトコルを介してインスタント・メッセージを送信します"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "向き"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "トレイの向きです"
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:398
+msgid "Login Options"
+msgstr "ログインのオプション"
+
+#: ../pidgin/gtkaccount.c:500
+msgid "Local alias:"
+msgstr "別名:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:562
+msgid "User Options"
+msgstr "ユーザのオプション"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:580
+msgid "Use this buddy icon for this account:"
+msgstr "次の仲間アイコンを使用する:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:700
+#, c-format
+msgid "%s Options"
+msgstr "%s のオプション"
+
+#: ../pidgin/gtkaccount.c:897
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME のプロキシ設定を使う"
+
+#: ../pidgin/gtkaccount.c:898
+msgid "Use Global Proxy Settings"
+msgstr "グローバルなプロキシ設定を使う"
+
+#: ../pidgin/gtkaccount.c:904
+msgid "No Proxy"
+msgstr "プロキシなし"
+
+#: ../pidgin/gtkaccount.c:910
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:916
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:922
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "環境設定を使う"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:967
+msgid "If you look real closely"
+msgstr "近づいてよく見れば"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:970
+msgid "you can see the butterflies mating"
+msgstr "蝶が仲間になっているのが分かります"
+
+#: ../pidgin/gtkaccount.c:991
+msgid "Proxy Options"
+msgstr "プロキシのオプション"
+
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "プロキシの種類(_T):"
+
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "ホスト名(_H):"
+
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "ポート番号(_P):"
+
+#: ../pidgin/gtkaccount.c:1026
+msgid "_Username:"
+msgstr "ユーザ名(_U):"
+
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "パスワード(_S):"
+
+#: ../pidgin/gtkaccount.c:1440
+msgid "Add Account"
+msgstr "アカウントの追加"
+
+#: ../pidgin/gtkaccount.c:1464
+msgid "_Basic"
+msgstr "基本(_B)"
+
+#: ../pidgin/gtkaccount.c:1475
+msgid "_Advanced"
+msgstr "拡張(_A)"
+
+#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "有効"
+
+#: ../pidgin/gtkaccount.c:1975
+msgid "Protocol"
+msgstr "プロトコル"
+
+#: ../pidgin/gtkaccount.c:2169
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>%s へようこそ！</span>\n"
+"\n"
+"未だ IM のアカウントを設定していません。%s を使って接続を開始する前に下にあ"
+"る <b>追加</b> ボタンをクリックして、アカウント情報を入力して下さい。%s を"
+"使って複数のアカウントに接続する場合は、アカウント毎に <b>追加</b> ボタンをク"
+"リックして設定して下さい。\n"
+"\n"
+"仲間リストのウィンドウにある <b>アカウント->追加/編集</b> メニューからも、こ"
+"の画面を開くことができます。"
+
+#: ../pidgin/gtkblist.c:722
+msgid "Join a Chat"
+msgstr "チャットに参加"
+
+#: ../pidgin/gtkblist.c:743
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "参加するチャットについて適切な情報を入力して下さい。\n"
+
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "アカウント(_A):"
+
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
+msgid "_Block"
+msgstr "拒否する(_B)"
+
+#: ../pidgin/gtkblist.c:1028
+msgid "Un_block"
+msgstr "拒否しない(_B)"
+
+#: ../pidgin/gtkblist.c:1079
+msgid "Get _Info"
+msgstr "情報の取得(_I)"
+
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+msgid "I_M"
+msgstr "IM(_M)"
+
+#: ../pidgin/gtkblist.c:1088
+msgid "_Send File"
+msgstr "ファイルの送信(_S)"
+
+#: ../pidgin/gtkblist.c:1095
+msgid "Add Buddy _Pounce"
+msgstr "つかむ仲間の追加(_P)"
+
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1204 ../pidgin/gtkblist.c:1227
+msgid "View _Log"
+msgstr "ログの表示(_L)"
+
+#: ../pidgin/gtkblist.c:1115
+msgid "Alias..."
+msgstr "別名..."
+
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1212
+#: ../pidgin/gtkblist.c:1233
+msgid "_Alias..."
+msgstr "別名(_A)..."
+
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1214
+#: ../pidgin/gtkblist.c:1235
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../pidgin/gtkblist.c:1175
+msgid "Add a _Buddy"
+msgstr "仲間の追加(_B)"
+
+#: ../pidgin/gtkblist.c:1177
+msgid "Add a C_hat"
+msgstr "チャットの追加(_H)"
+
+#: ../pidgin/gtkblist.c:1180
+msgid "_Delete Group"
+msgstr "グループの削除(_D)"
+
+#: ../pidgin/gtkblist.c:1182
+msgid "_Rename"
+msgstr "名前の変更(_R)"
+
+#. join button
+#: ../pidgin/gtkblist.c:1200 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+msgid "_Join"
+msgstr "参加(_J)"
+
+#: ../pidgin/gtkblist.c:1202
+msgid "Auto-Join"
+msgstr "自動参加"
+
+#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1263
+msgid "_Collapse"
+msgstr "畳む(_C)"
+
+#: ../pidgin/gtkblist.c:1268
+msgid "_Expand"
+msgstr "広げる(_E)"
+
+#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1525
+#: ../pidgin/gtkblist.c:4491 ../pidgin/gtkblist.c:4501
+msgid "/Tools/Mute Sounds"
+msgstr "/ツール/ミュート"
+
+#: ../pidgin/gtkblist.c:1985 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "現在、仲間の追加が可能なアカウントでサイン・インしていません。"
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2813
+msgid "/_Buddies"
+msgstr "/仲間(_B)"
+
+#: ../pidgin/gtkblist.c:2814
+msgid "/Buddies/New Instant _Message..."
+msgstr "/仲間/新しいインスタント・メッセージ(_I)..."
+
+#: ../pidgin/gtkblist.c:2815
+msgid "/Buddies/Join a _Chat..."
+msgstr "/仲間/チャットに参加(_C)..."
+
+#: ../pidgin/gtkblist.c:2816
+msgid "/Buddies/Get User _Info..."
+msgstr "/仲間/ユーザ情報の取得(_I)..."
+
+#: ../pidgin/gtkblist.c:2817
+msgid "/Buddies/View User _Log..."
+msgstr "/仲間/ユーザ・ログの表示(_L)..."
+
+#: ../pidgin/gtkblist.c:2819
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/仲間/オフラインの仲間を表示する(_O)"
+
+#: ../pidgin/gtkblist.c:2820
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/仲間/空グループを表示する(_E)"
+
+#: ../pidgin/gtkblist.c:2821
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/仲間/仲間の詳細を表示する(_D)"
+
+#: ../pidgin/gtkblist.c:2822
+msgid "/Buddies/Show Idle _Times"
+msgstr "/仲間/待機中の時間を表示する(_T)"
+
+#: ../pidgin/gtkblist.c:2823
+msgid "/Buddies/_Sort Buddies"
+msgstr "/仲間/仲間の並び替え(_S)"
+
+#: ../pidgin/gtkblist.c:2825
+msgid "/Buddies/_Add Buddy..."
+msgstr "/仲間/仲間の追加(_A)..."
+
+#: ../pidgin/gtkblist.c:2826
+msgid "/Buddies/Add C_hat..."
+msgstr "/仲間/チャットの追加(_H)..."
+
+#: ../pidgin/gtkblist.c:2827
+msgid "/Buddies/Add _Group..."
+msgstr "/仲間/グループの追加(_G)..."
+
+#: ../pidgin/gtkblist.c:2829
+msgid "/Buddies/_Quit"
+msgstr "/仲間/終了(_Q)"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2832
+msgid "/_Accounts"
+msgstr "/アカウント(_A)"
+
+#: ../pidgin/gtkblist.c:2833 ../pidgin/gtkblist.c:6414
+msgid "/Accounts/Add\\/Edit"
+msgstr "/アカウント/追加\\/編集"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2836
+msgid "/_Tools"
+msgstr "/ツール(_T)"
+
+#: ../pidgin/gtkblist.c:2837
+msgid "/Tools/Buddy _Pounces"
+msgstr "/ツール/仲間をつかむ(_P)"
+
+#: ../pidgin/gtkblist.c:2838
+msgid "/Tools/Plu_gins"
+msgstr "/ツール/プラグイン(_G)"
+
+#: ../pidgin/gtkblist.c:2839
+msgid "/Tools/Pr_eferences"
+msgstr "/ツール/設定(_E)"
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Tools/Pr_ivacy"
+msgstr "/ツール/個人情報(_I)"
+
+#: ../pidgin/gtkblist.c:2842
+msgid "/Tools/_File Transfers"
+msgstr "/ツール/ファイルの転送(_F)"
+
+#: ../pidgin/gtkblist.c:2843
+msgid "/Tools/R_oom List"
+msgstr "/ツール/チャットルームの一覧(_O)"
+
+#: ../pidgin/gtkblist.c:2844
+msgid "/Tools/System _Log"
+msgstr "/ツール/システム・ログ(_L)"
+
+#: ../pidgin/gtkblist.c:2846
+msgid "/Tools/Mute _Sounds"
+msgstr "/ツール/ミュート(_S)"
+
+#. Help
+#: ../pidgin/gtkblist.c:2849
+msgid "/_Help"
+msgstr "/ヘルプ(_H)"
+
+#: ../pidgin/gtkblist.c:2850
+msgid "/Help/Online _Help"
+msgstr "/ヘルプ/オンライン・ヘルプ(_H)"
+
+#: ../pidgin/gtkblist.c:2851
+msgid "/Help/_Debug Window"
+msgstr "/ヘルプ/デバッグ・ウィンドウ(_D)"
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Help/_About"
+msgstr "/ヘルプ/情報(_A)"
+
+#: ../pidgin/gtkblist.c:2880
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>アカウント:</b> %s"
+
+#: ../pidgin/gtkblist.c:2958
+msgid "Buddy Alias"
+msgstr "仲間の別名"
+
+#: ../pidgin/gtkblist.c:2979
+msgid "Logged In"
+msgstr "既にログインしています"
+
+#: ../pidgin/gtkblist.c:3025
+msgid "Last Seen"
+msgstr "最後にお会いしたのは"
+
+#: ../pidgin/gtkblist.c:3045
+msgid "Spooky"
+msgstr "不気味"
+
+#: ../pidgin/gtkblist.c:3047
+msgid "Awesome"
+msgstr "サイコー"
+
+#: ../pidgin/gtkblist.c:3049
+msgid "Rockin'"
+msgstr "グレイト！"
+
+#: ../pidgin/gtkblist.c:3374
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "待機中 %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3376
+#, c-format
+msgid "Idle %dm"
+msgstr "待機中 %dm"
+
+#: ../pidgin/gtkblist.c:3513
+msgid "/Buddies/New Instant Message..."
+msgstr "/仲間/新しいインスタント・メッセージ..."
+
+#: ../pidgin/gtkblist.c:3514 ../pidgin/gtkblist.c:3547
+msgid "/Buddies/Join a Chat..."
+msgstr "/仲間/チャットに参加..."
+
+#: ../pidgin/gtkblist.c:3515
+msgid "/Buddies/Get User Info..."
+msgstr "/仲間/ユーザ情報の取得..."
+
+#: ../pidgin/gtkblist.c:3516
+msgid "/Buddies/Add Buddy..."
+msgstr "/仲間/仲間の追加..."
+
+#: ../pidgin/gtkblist.c:3517 ../pidgin/gtkblist.c:3550
+msgid "/Buddies/Add Chat..."
+msgstr "/仲間/チャットの追加..."
+
+#: ../pidgin/gtkblist.c:3518
+msgid "/Buddies/Add Group..."
+msgstr "/仲間/グループの追加..."
+
+#: ../pidgin/gtkblist.c:3553
+msgid "/Tools/Buddy Pounces"
+msgstr "/ツール/仲間をつかむ"
+
+#: ../pidgin/gtkblist.c:3556
+msgid "/Tools/Privacy"
+msgstr "/ツール/個人情報"
+
+#: ../pidgin/gtkblist.c:3559
+msgid "/Tools/Room List"
+msgstr "/ツール/チャットルームの一覧"
+
+#: ../pidgin/gtkblist.c:3656 ../pidgin/gtkdocklet.c:156
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%2$s さんから %1$d個の未読のメッセージがあります\n"
+msgstr[1] "%2$s さんから %1$d個の未読のメッセージがあります\n"
+
+#: ../pidgin/gtkblist.c:3733
+msgid "Manually"
+msgstr "手動"
+
+#: ../pidgin/gtkblist.c:3735
+msgid "Alphabetically"
+msgstr "アルファベット順"
+
+#: ../pidgin/gtkblist.c:3736
+msgid "By status"
+msgstr "状態順"
+
+#: ../pidgin/gtkblist.c:3737
+msgid "By log size"
+msgstr "ログ・サイズ順"
+
+#: ../pidgin/gtkblist.c:3939 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s さんは接続を切りました"
+
+#: ../pidgin/gtkblist.c:3949
+msgid "Re-enable Account"
+msgstr "アカウントを再び有効にする"
+
+#: ../pidgin/gtkblist.c:3970
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s さんは接続を切りました: %s</span>"
+
+#: ../pidgin/gtkblist.c:4123
+msgid "<b>Username:</b>"
+msgstr "<b>ユーザ名</b>:"
+
+#: ../pidgin/gtkblist.c:4130
+msgid "<b>Password:</b>"
+msgstr "<b>パスワード</b>:"
+
+#: ../pidgin/gtkblist.c:4141
+msgid "_Login"
+msgstr "ログイン(_L)"
+
+#: ../pidgin/gtkblist.c:4226
+msgid "/Accounts"
+msgstr "/アカウント"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4240
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>%s へようこそ！</span>\n"
+"\n"
+"まだアカウントを有効にしていません。<b>アカウント->追加/編集</b> メニューか"
+"ら <b>アカウント</b> ウィンドウを開いて IM のアカウントを有効にして下さい。ア"
+"カウントを有効にすると、サイン・インして状態をセットし仲間と会話できます。"
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4485
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/仲間/オフラインの仲間を表示する"
+
+#: ../pidgin/gtkblist.c:4488
+msgid "/Buddies/Show Empty Groups"
+msgstr "/仲間/空のグループを表示する"
+
+#: ../pidgin/gtkblist.c:4494
+msgid "/Buddies/Show Buddy Details"
+msgstr "/仲間/仲間の詳細を表示する"
+
+#: ../pidgin/gtkblist.c:4497
+msgid "/Buddies/Show Idle Times"
+msgstr "/仲間/待機中の時間を表示する"
+
+#: ../pidgin/gtkblist.c:5335
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"仲間リストに追加したい相手のスクリーン名を入力して下さい。オプションで仲間の"
+"別名またはあだ名を入力できます。別名は可能な限りスクリーン名の代わりに表示さ"
+"れます。\n"
+
+#: ../pidgin/gtkblist.c:5395 ../pidgin/gtkblist.c:5756
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "グループ:"
+
+#: ../pidgin/gtkblist.c:5654
+msgid "This protocol does not support chat rooms."
+msgstr "このプロトコルではチャット・ルームをサポートしていません。"
+
+#: ../pidgin/gtkblist.c:5670
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "チャットが可能なプロトコルでサイン・インしていません。"
+
+#: ../pidgin/gtkblist.c:5711
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"このチャットの別名と仲間リストに追加する際の妥当な情報を入力して下さい:\n"
+
+#: ../pidgin/gtkblist.c:5794
+msgid "Please enter the name of the group to be added."
+msgstr "追加するグループの名前を入力して下さい:"
+
+#: ../pidgin/gtkblist.c:6434
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/アカウント/"
+
+#: ../pidgin/gtkblist.c:6458
+msgid "_Edit Account"
+msgstr "アカウントの編集(_E)"
+
+#: ../pidgin/gtkblist.c:6471 ../pidgin/gtkconv.c:2900
+msgid "No actions available"
+msgstr "利用可能なアクションはありません"
+
+#: ../pidgin/gtkblist.c:6479
+msgid "_Disable"
+msgstr "無効にする(_D)"
+
+#: ../pidgin/gtkblist.c:6491
+msgid "Enable Account"
+msgstr "アカウントを有効にする"
+
+#: ../pidgin/gtkblist.c:6497
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/アカウント/アカウントを有効にする"
+
+#: ../pidgin/gtkblist.c:6546
+msgid "/Tools"
+msgstr "/ツール"
+
+#: ../pidgin/gtkblist.c:6616
+msgid "/Buddies/Sort Buddies"
+msgstr "/仲間/仲間の並び替え"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"エラーを解決しアカウントをもう一度有効にするまで %s は再接続しません。"
+
+#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "その仲間は、このチャットの同一プロトコル上にいません"
+
+#: ../pidgin/gtkconv.c:802
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr "現在、その仲間を招待できるアカウントでサイン・インしていません"
+
+#: ../pidgin/gtkconv.c:855
+msgid "Invite Buddy Into Chat Room"
+msgstr "仲間をチャット・ルームへ招待"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:885
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
+
+#: ../pidgin/gtkconv.c:906
+msgid "_Buddy:"
+msgstr "仲間(_B):"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
+msgid "_Message:"
+msgstr "メッセージ(_M):"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "ファイルを開けません"
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>%s さんとの会話</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "会話の保存"
+
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+msgid "Find"
+msgstr "検索"
+
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "検索する単語(_S):"
+
+#: ../pidgin/gtkconv.c:1340
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "ログの記録を開始しました。これ以降の会話がログに記録されます。"
+
+#: ../pidgin/gtkconv.c:1348
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "ログの記録を停止しました。これ以降の会話はログに記録されません。"
+
+#: ../pidgin/gtkconv.c:1596
+msgid "Un-Ignore"
+msgstr "無視しない"
+
+#: ../pidgin/gtkconv.c:1599
+msgid "Ignore"
+msgstr "無視する対象"
+
+#: ../pidgin/gtkconv.c:1619
+msgid "Get Away Message"
+msgstr "離席メッセージの取得"
+
+#: ../pidgin/gtkconv.c:1642
+msgid "Last said"
+msgstr "最後のメッセージ:"
+
+#: ../pidgin/gtkconv.c:2484
+msgid "Unable to save icon file to disk."
+msgstr "アイコン・ファイルを保存できません。"
+
+#: ../pidgin/gtkconv.c:2535
+msgid "Save Icon"
+msgstr "アイコンの保存"
+
+#: ../pidgin/gtkconv.c:2587
+msgid "Animate"
+msgstr "アニメーションを有効にする"
+
+#: ../pidgin/gtkconv.c:2592
+msgid "Hide Icon"
+msgstr "アイコンを隠す"
+
+#: ../pidgin/gtkconv.c:2595
+msgid "Save Icon As..."
+msgstr "アイコンを別名で保存..."
+
+#: ../pidgin/gtkconv.c:2599
+msgid "Set Custom Icon..."
+msgstr "独自アイコンのセット..."
+
+#: ../pidgin/gtkconv.c:2612
+msgid "Remove Custom Icon"
+msgstr "独自アイコンの削除"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2754
+msgid "/_Conversation"
+msgstr "/会話(_C)"
+
+#: ../pidgin/gtkconv.c:2756
+msgid "/Conversation/New Instant _Message..."
+msgstr "/会話/新しいインスタント・メッセージ(_M)..."
+
+#: ../pidgin/gtkconv.c:2761
+msgid "/Conversation/_Find..."
+msgstr "/会話/検索(_F)..."
+
+#: ../pidgin/gtkconv.c:2763
+msgid "/Conversation/View _Log"
+msgstr "/会話/ログの表示(_L)"
+
+#: ../pidgin/gtkconv.c:2764
+msgid "/Conversation/_Save As..."
+msgstr "/会話/別名で保存(_S)..."
+
+#: ../pidgin/gtkconv.c:2766
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/会話/クリア(_R)"
+
+#: ../pidgin/gtkconv.c:2770
+msgid "/Conversation/Se_nd File..."
+msgstr "/会話/ファイルの送信(_N)..."
+
+#: ../pidgin/gtkconv.c:2771
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/会話/つかむ仲間に追加する(_P)..."
+
+#: ../pidgin/gtkconv.c:2773
+msgid "/Conversation/_Get Info"
+msgstr "/会話/情報の取得(_G)"
+
+#: ../pidgin/gtkconv.c:2775
+msgid "/Conversation/In_vite..."
+msgstr "/会話/招待(_V)..."
+
+#: ../pidgin/gtkconv.c:2777
+msgid "/Conversation/M_ore"
+msgstr "/会話/その他(_O)"
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/Al_ias..."
+msgstr "/会話/別名(_I)..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/_Block..."
+msgstr "/会話/拒否(_B)..."
+
+#: ../pidgin/gtkconv.c:2785
+msgid "/Conversation/_Unblock..."
+msgstr "/会話/拒否の解除(_U)..."
+
+#: ../pidgin/gtkconv.c:2787
+msgid "/Conversation/_Add..."
+msgstr "/会話/追加(_A)..."
+
+#: ../pidgin/gtkconv.c:2789
+msgid "/Conversation/_Remove..."
+msgstr "/会話/削除(_R)..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/_Close"
+msgstr "/会話/閉じる(_C)"
+
+#. Options
+#: ../pidgin/gtkconv.c:2798
+msgid "/_Options"
+msgstr "/オプション(_O)"
+
+#: ../pidgin/gtkconv.c:2799
+msgid "/Options/Enable _Logging"
+msgstr "/オプション/ログを記録する(_L)"
+
+#: ../pidgin/gtkconv.c:2800
+msgid "/Options/Enable _Sounds"
+msgstr "/オプション/サウンドを有効にする(_S)"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Options/Show Buddy _Icon"
+msgstr "/オプション/仲間アイコンを表示する(_I)"
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/オプション/書式ツールバーを表示する(_T)"
+
+#: ../pidgin/gtkconv.c:2804
+msgid "/Options/Show Ti_mestamps"
+msgstr "/オプション/タイムスタンプを表示する(_M)"
+
+#: ../pidgin/gtkconv.c:2879
+msgid "/Conversation/More"
+msgstr "/会話/その他(_O)"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+msgid "/Conversation"
+msgstr "/会話"
+
+#: ../pidgin/gtkconv.c:2964
+msgid "/Conversation/View Log"
+msgstr "/会話/ログの表示"
+
+#: ../pidgin/gtkconv.c:2970
+msgid "/Conversation/Send File..."
+msgstr "/会話/ファイルの送信..."
+
+#: ../pidgin/gtkconv.c:2974
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/会話/つかむ仲間に追加する..."
+
+#: ../pidgin/gtkconv.c:2980
+msgid "/Conversation/Get Info"
+msgstr "/会話/情報の取得"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/Invite..."
+msgstr "/会話/招待..."
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Alias..."
+msgstr "/会話/別名..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Block..."
+msgstr "/会話/拒否..."
+
+#: ../pidgin/gtkconv.c:2998
+msgid "/Conversation/Unblock..."
+msgstr "/会話/拒否の解除..."
+
+#: ../pidgin/gtkconv.c:3002
+msgid "/Conversation/Add..."
+msgstr "/会話/追加..."
+
+#: ../pidgin/gtkconv.c:3006
+msgid "/Conversation/Remove..."
+msgstr "/会話/削除..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Options/Enable Logging"
+msgstr "/オプション/ログを記録する"
+
+#: ../pidgin/gtkconv.c:3013
+msgid "/Options/Enable Sounds"
+msgstr "/オプション/サウンドを有効にする"
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/オプション/書式ツールバーを表示する"
+
+#: ../pidgin/gtkconv.c:3029
+msgid "/Options/Show Timestamps"
+msgstr "/オプション/タイムスタンプを表示する"
+
+#: ../pidgin/gtkconv.c:3032
+msgid "/Options/Show Buddy Icon"
+msgstr "/オプション/仲間アイコンを表示する"
+
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+msgid "User is typing..."
+msgstr "ユーザが何か入力しています..."
+
+#: ../pidgin/gtkconv.c:3159
+msgid "User has typed something and stopped"
+msgstr "ユーザは何か入力して一時停止中です"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3341
+msgid "_Send To"
+msgstr "送信先(_S)"
+
+#: ../pidgin/gtkconv.c:4049
+msgid "_Send"
+msgstr "送信する(_S)"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4197
+msgid "0 people in room"
+msgstr "誰もいません"
+
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "チャットルームに %d人にいます"
+msgstr[1] "チャットルームに %d人にいます"
+
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+msgid "Typing"
+msgstr "入力中です"
+
+#: ../pidgin/gtkconv.c:6054
+msgid "Stopped Typing"
+msgstr "入力を止めたようです"
+
+#: ../pidgin/gtkconv.c:6059
+msgid "Nick Said"
+msgstr "Nick Said"
+
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:509
+msgid "Unread Messages"
+msgstr "メッセージの送信"
+
+#: ../pidgin/gtkconv.c:6069
+msgid "New Event"
+msgstr "新しいイベント"
+
+#: ../pidgin/gtkconv.c:7196
+msgid "Confirm close"
+msgstr "クローズの確認"
+
+#: ../pidgin/gtkconv.c:7228
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+"まだ未読のメッセージがあります。本当にウィンドウを閉じてもよろしいですか？"
+
+#: ../pidgin/gtkconv.c:7763
+msgid "Close other tabs"
+msgstr "他のタブを閉じる"
+
+#: ../pidgin/gtkconv.c:7769
+msgid "Close all tabs"
+msgstr "全てのタブを閉じる"
+
+#: ../pidgin/gtkconv.c:7777
+msgid "Detach this tab"
+msgstr "このタブを取り外す"
+
+#: ../pidgin/gtkconv.c:7783
+msgid "Close this tab"
+msgstr "このタブを閉じる"
+
+#: ../pidgin/gtkconv.c:8086
+msgid "Close conversation"
+msgstr "会話ウィンドウを閉じます"
+
+#: ../pidgin/gtkconv.c:8550
+msgid "Last created window"
+msgstr "最後に生成したウィンドウを再利用する"
+
+#: ../pidgin/gtkconv.c:8552
+msgid "Separate IM and Chat windows"
+msgstr "IM とチャット・ウィンドウを分割する"
+
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "新しいウィンドウで開く"
+
+#: ../pidgin/gtkconv.c:8556
+msgid "By group"
+msgstr "グループ毎に共有する"
+
+#: ../pidgin/gtkconv.c:8558
+msgid "By account"
+msgstr "アカウント毎に共有する"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "デバッグ・ログの保存"
+
+#: ../pidgin/gtkdebug.c:596
+msgid "Invert"
+msgstr "結果を反転する"
+
+#: ../pidgin/gtkdebug.c:599
+msgid "Highlight matches"
+msgstr "一致する単語を強調表示する"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Icon Only"
+msgstr "アイコンのみ(_I)"
+
+#: ../pidgin/gtkdebug.c:667
+msgid "_Text Only"
+msgstr "ラベルのみ(_T)"
+
+#: ../pidgin/gtkdebug.c:668
+msgid "_Both Icon & Text"
+msgstr "両方(_B)"
+
+#: ../pidgin/gtkdebug.c:804
+msgid "Filter"
+msgstr "フィルタ"
+
+#: ../pidgin/gtkdebug.c:823
+msgid "Right click for more options."
+msgstr "右クリックで追加オプションを表示します"
+
+#: ../pidgin/gtkdebug.c:853
+msgid "Level "
+msgstr "レベル"
+
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+msgid "Select the debug filter level."
+msgstr "デバッグ・フィルタのレベルを選択して下さい:"
+
+#: ../pidgin/gtkdebug.c:862
+msgid "All"
+msgstr "全て"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Misc"
+msgstr "その他"
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Warning"
+msgstr "警告"
+
+#: ../pidgin/gtkdebug.c:866
+msgid "Error "
+msgstr "エラー"
+
+#: ../pidgin/gtkdebug.c:867
+msgid "Fatal Error"
+msgstr "致命的なエラー"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+msgid "lead developer"
+msgstr "メインの開発者"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
+msgid "developer"
+msgstr "開発者"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "開発者/ウェブマスタ"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support"
+msgstr "サポート"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support/QA"
+msgstr "サポート/QA"
+
+#: ../pidgin/gtkdialogs.c:109
+msgid "win32 port"
+msgstr "Win32 のポーティング"
+
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+msgid "maintainer"
+msgstr "メンテナ"
+
+#: ../pidgin/gtkdialogs.c:112
+msgid "libfaim maintainer"
+msgstr "libfaim のメンテナ"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:114
+msgid "hacker and designated driver [lazy bum]"
+msgstr "ハッカーと指定したドライバ [lazy bum]"
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "Jabber developer"
+msgstr "Jabber の開発者"
+
+#: ../pidgin/gtkdialogs.c:116
+msgid "original author"
+msgstr "オリジナルの作者"
+
+#: ../pidgin/gtkdialogs.c:123
+msgid "Afrikaans"
+msgstr "アフリカーンズ語"
+
+#: ../pidgin/gtkdialogs.c:124
+msgid "Arabic"
+msgstr "アラビア語"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+msgid "Bengali"
+msgstr "ベンガル語"
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "Bosnian"
+msgstr "ボスニア語"
+
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+msgid "Catalan"
+msgstr "カタラン語"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+msgid "Valencian-Catalan"
+msgstr "バレンシア-カタロニア語"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+msgid "Czech"
+msgstr "チェコ語"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+msgid "Danish"
+msgstr "デンマーク語"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "ドイツ語"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
+msgid "Dzongkha"
+msgstr "ゾンカ語"
+
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+msgid "Greek"
+msgstr "ギリシア語"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "英語 (オーストラリア)"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "英語 (カナダ)"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "英語 (英国)"
+
+#: ../pidgin/gtkdialogs.c:148
+msgid "Esperanto"
+msgstr "エスペラント語"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Spanish"
+msgstr "スペイン語"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+msgid "Euskera(Basque)"
+msgstr "エウシカラ (バスク語)"
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+msgid "Persian"
+msgstr "ペルシア語"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "Finnish"
+msgstr "フィンランド語"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+msgid "French"
+msgstr "フランス語"
+
+#: ../pidgin/gtkdialogs.c:157
+msgid "Galician"
+msgstr "ガルシア語"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+msgid "Gujarati"
+msgstr "グジャラート語"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+msgid "Hebrew"
+msgstr "ヘブライ語"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Hindi"
+msgstr "ヒンズー語"
+
+#: ../pidgin/gtkdialogs.c:162
+msgid "Hungarian"
+msgstr "ハンガリー語"
+
+#: ../pidgin/gtkdialogs.c:163
+msgid "Indonesian"
+msgstr "インドネシア語"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Italian"
+msgstr "イタリア語"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+msgid "Japanese"
+msgstr "日本語"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+msgid "Georgian"
+msgstr "グルジア語"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada"
+msgstr "カンナダ語"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+msgid "Korean"
+msgstr "韓国語"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
+msgid "Kurdish"
+msgstr "クルド語"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Lithuanian"
+msgstr "リトアニア語"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Macedonian"
+msgstr "マケドニア語"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "ボックマル・ノルウェー語"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "ネパール語"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Dutch, Flemish"
+msgstr "オランダ/フランダース語"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Norwegian"
+msgstr "ノルウェー語"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+msgid "Polish"
+msgstr "ポーランド語"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Portuguese"
+msgstr "ポルトガル語"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "ポルトガル・ブラジル語"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr "パシュト語"
+
+#: ../pidgin/gtkdialogs.c:184
+msgid "Romanian"
+msgstr "ルーマニア語"
+
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Russian"
+msgstr "ロシア語"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
+msgid "Slovak"
+msgstr "スロバキア語"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+msgid "Slovenian"
+msgstr "スロベニア語"
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Albanian"
+msgstr "アルバニア語"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+msgid "Serbian"
+msgstr "セルビア語"
+
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+msgid "Swedish"
+msgstr "スウェーデン語"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Tamil"
+msgstr "タミル語"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Telugu"
+msgstr "テルグ語"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "タイ語"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "トルコ語"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "ベトナム語"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh と Gnome-Vi チーム"
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+msgid "Simplified Chinese"
+msgstr "簡体字中国語"
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "中国語 (香港)"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
+msgid "Traditional Chinese"
+msgstr "繁体字中国語"
+
+#: ../pidgin/gtkdialogs.c:208
+msgid "Amharic"
+msgstr "アムハラ語"
+
+#: ../pidgin/gtkdialogs.c:327
+#, c-format
+msgid "About %s"
+msgstr "%s について"
+
+#: ../pidgin/gtkdialogs.c:363
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr ""
+"%s は AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、SIP/SIMPLE、Novell "
+"GroupWise、Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコル"
+"を全て同時に利用できる、GTK+ ツールキットを採用したモジュール型のメッセージ・"
+"クライアントです。<BR><BR>GPL ライセンス (第二版、あるいはそれ以降の版) が定"
+"める条項の下で再頒布または変更することができます。GPL の複写が本 %s パッケー"
+"ジの中に 'COPYING' というファイル名として含まれています。%s のコピーライトは"
+"その貢献者に帰属します。この貢献者の詳細な一覧については 'COPYRIGHT' を御覧下"
+"さい。本プログラムは完全無保証です。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:378
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #pidgin-win32 チャンネル"
+"<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #pidgin チャンネル<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:387
+msgid "Current Developers"
+msgstr "現在の開発者"
+
+#: ../pidgin/gtkdialogs.c:402
+msgid "Crazy Patch Writers"
+msgstr "Crazy なパッチの作者"
+
+#: ../pidgin/gtkdialogs.c:417
+msgid "Retired Developers"
+msgstr "開発者 (旧バージョン)"
+
+#: ../pidgin/gtkdialogs.c:432
+msgid "Artists"
+msgstr "アーティスト"
+
+#: ../pidgin/gtkdialogs.c:447
+msgid "Current Translators"
+msgstr "翻訳者 (最新バージョン)"
+
+#: ../pidgin/gtkdialogs.c:467
+msgid "Past Translators"
+msgstr "翻訳者 (旧バージョン)"
+
+#: ../pidgin/gtkdialogs.c:485
+msgid "Debugging Information"
+msgstr "デバッグする際の参考情報"
+
+#: ../pidgin/gtkdialogs.c:854
+msgid "Get User Info"
+msgstr "ユーザ情報の取得"
+
+#: ../pidgin/gtkdialogs.c:856
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr "情報を表示する相手のスクリーン名または別名を入力して下さい:"
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "ユーザ・ログの表示"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr "ログを表示する相手のスクリーン名または別名を入力して下さい:"
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Alias Contact"
+msgstr "コンタクトの別名"
+
+#: ../pidgin/gtkdialogs.c:969
+msgid "Enter an alias for this contact."
+msgstr "このコンタクトの別名を入力して下さい:"
+
+#: ../pidgin/gtkdialogs.c:991
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "%s の別名を入力して下さい:"
+
+#: ../pidgin/gtkdialogs.c:993
+msgid "Alias Buddy"
+msgstr "仲間の別名"
+
+#: ../pidgin/gtkdialogs.c:1014
+msgid "Alias Chat"
+msgstr "チャットの別名"
+
+#: ../pidgin/gtkdialogs.c:1015
+msgid "Enter an alias for this chat."
+msgstr "このチャットの別名を入力して下さい:"
+
+#: ../pidgin/gtkdialogs.c:1054
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
+"ろしいですか？"
+msgstr[1] ""
+"仲間リストから %s さんを含む %d個の仲間を削除しようとしています。続行してもよ"
+"ろしいですか？"
+
+#: ../pidgin/gtkdialogs.c:1062
+msgid "Remove Contact"
+msgstr "コンタクトの削除"
+
+#: ../pidgin/gtkdialogs.c:1065
+msgid "_Remove Contact"
+msgstr "削除する(_R)"
+
+#: ../pidgin/gtkdialogs.c:1096
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"%s というグループと %s というグループを一つにまとめようとしています。続行して"
+"もよろしいですか？"
+
+#: ../pidgin/gtkdialogs.c:1103
+msgid "Merge Groups"
+msgstr "グループの統合"
+
+#: ../pidgin/gtkdialogs.c:1106
+msgid "_Merge Groups"
+msgstr "グループを統合する(_M)"
+
+#: ../pidgin/gtkdialogs.c:1156
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"仲間リストからグループ %s とそのメンバを削除しようとしています。続行してもよ"
+"ろしいですか？"
+
+#: ../pidgin/gtkdialogs.c:1159
+msgid "Remove Group"
+msgstr "グループの削除"
+
+#: ../pidgin/gtkdialogs.c:1162
+msgid "_Remove Group"
+msgstr "削除する(_R)"
+
+#: ../pidgin/gtkdialogs.c:1195
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "仲間リストから %s を削除しようとしています。続行してもよろしいですか？"
+
+#: ../pidgin/gtkdialogs.c:1198
+msgid "Remove Buddy"
+msgstr "仲間の削除"
+
+#: ../pidgin/gtkdialogs.c:1201
+msgid "_Remove Buddy"
+msgstr "削除する(_R)"
+
+#: ../pidgin/gtkdialogs.c:1222
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
+"か？"
+
+#: ../pidgin/gtkdialogs.c:1225
+msgid "Remove Chat"
+msgstr "チャットの削除"
+
+#: ../pidgin/gtkdialogs.c:1228
+msgid "_Remove Chat"
+msgstr "削除する(_R)"
+
+#: ../pidgin/gtkdocklet.c:153
+msgid "Right-click for more unread messages...\n"
+msgstr "さらに未読のメッセージを表示する場合は右クリックして下さい...\n"
+
+#: ../pidgin/gtkdocklet.c:452
+msgid "Change Status"
+msgstr "状態の変更"
+
+#: ../pidgin/gtkdocklet.c:504
+msgid "Show Buddy List"
+msgstr "仲間リストの表示"
+
+#: ../pidgin/gtkdocklet.c:530
+msgid "New Message..."
+msgstr "新しいメッセージ..."
+
+#: ../pidgin/gtkdocklet.c:545
+msgid "Mute Sounds"
+msgstr "ミュート"
+
+#: ../pidgin/gtkdocklet.c:552
+msgid "Blink on new message"
+msgstr "メッセージが届いたら点滅させる"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:563
+msgid "Quit"
+msgstr "終了"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "開始していません"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>受信レート:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>受信元:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>送信先:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>送信レート:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr ""
+"この種類のファイルをオープンするために設定されたアプリケーションがありませ"
+"ん。"
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "ファイルをオープンする際にエラーが発生しました。"
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "%s を起動する際にエラー: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "%s を実行する際にエラー"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "プロセスがエラー・コード %d を返してきました"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "ファイル名:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "ローカル・ファイル:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "速度:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "経過時間:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "残り時間:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "転送が完了したらダイアログを閉じる(_F)"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "完了した転送をクリアする(_L)"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "ファイル転送の詳細(_D)"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+msgid "_Pause"
+msgstr "一時停止(_P)"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "復帰(_R)"
+
+#: ../pidgin/gtkimhtml.c:792
+msgid "Paste as Plain _Text"
+msgstr "文字列として貼り付け(_T)"
+
+#: ../pidgin/gtkimhtml.c:809
+msgid "_Reset formatting"
+msgstr "書式のリセット(_R)"
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "ハイパーリンクの色"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "ハイパーリンクを描画する色です"
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr "ハイパーリンク (prelight) の色"
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "ハイパーリンクの上にマウスをのせた時の色です"
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "E-メール・アドレスのコピー(_C)"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "リンク先をブラウザで開く(_O)"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "リンク先のコピー(_C)"
+
+#: ../pidgin/gtkimhtml.c:3202
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>不明なファイルの種類</span>\n"
+"\n"
+"デフォルトの PNG 画像として扱います。"
+
+#: ../pidgin/gtkimhtml.c:3205
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"ファイルの種類が不明です。\n"
+"\n"
+"デフォルトの PNG 画像として扱います。"
+
+#: ../pidgin/gtkimhtml.c:3218
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>画像を保存する際にエラー</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3221
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"画像を保存する際にエラー\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+msgid "Save Image"
+msgstr "画像の保存"
+
+#: ../pidgin/gtkimhtml.c:3341
+msgid "_Save Image..."
+msgstr "画像の保存(_S)..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "フォントの選択"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "メッセージの色の選択"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "背景色の選択"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "URL(_U)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "説明(_D)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"挿入するリンクの URL とその説明を入力して下さい (説明はオプションです):"
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "挿入するリンクの URL を入力して下さい:"
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "リンクの挿入"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "挿入(_I)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "画像の格納に失敗しました: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "画像の挿入"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "このテーマには利用可能なスマイリーがありません。"
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "スマイリー (顔文字) ！"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "太字にする"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "イタリックにする"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "下線を付ける"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "フォントのサイズを大きくします"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "フォントのサイズを小さくします"
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "フォントの種類を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "メッセージの色を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "背景色を変更します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "書式をリセットします"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "リンクを挿入します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "画像を挿入します"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "スマイリー (顔文字) を挿入します"
+
+#: ../pidgin/gtklog.c:267
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"%s さんと %s から記録し始めた会話ログを完全に削除してもよろしいですか？"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "%s で %s から記録し始めた会話ログを完全に削除してもよろしいですか？"
+
+#: ../pidgin/gtklog.c:283
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "%s から記録し始めたシステム・ログを完全に削除してもよろしいですか？"
+
+#: ../pidgin/gtklog.c:427
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s での会話 (%s)</span>"
+
+#: ../pidgin/gtklog.c:430
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s さんとの会話 (%s)</span>"
+
+#: ../pidgin/gtklog.c:477
+msgid "%B %Y"
+msgstr "%Y年%B"
+
+#: ../pidgin/gtklog.c:524
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"システム・イベントのログは、設定ダイアログで \"状態の変更を全てシステム・ログ"
+"に記録する\" が有効な場合にのみ記録します。"
+
+#: ../pidgin/gtklog.c:528
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"インスタント・メッセージのログは、設定ダイアログで \"インスタント・メッセージ"
+"を全てログに記録する\" が有効な場合にのみ記録します。"
+
+#: ../pidgin/gtklog.c:531
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"チャットのログは、設定ダイアログで \"チャットを全てシステム・ログに記録する"
+"\" が有効な場合にのみログを記録します。"
+
+#: ../pidgin/gtklog.c:535
+msgid "No logs were found"
+msgstr "ログが見つかりませんでした"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:550
+msgid "_Browse logs folder"
+msgstr "ログ・フォルダの参照(_B)"
+
+#: ../pidgin/gtklog.c:614
+msgid "Total log size:"
+msgstr "ログの合計サイズ:"
+
+#: ../pidgin/gtklog.c:683
+#, c-format
+msgid "Conversations in %s"
+msgstr "%s さんとの会話"
+
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s さんとの会話"
+
+#: ../pidgin/gtklog.c:778
+msgid "System Log"
+msgstr "システム・ログ"
+
+#: ../pidgin/gtkmain.c:372
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s (詳しい情報は `%s -h' と入力して下さい)\n"
+
+#: ../pidgin/gtkmain.c:374
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"用法: %s [オプション]...\n"
+"\n"
+"  -c, --config=DIR    DIR にある設定ファイルを使用する\n"
+"  -d, --debug         デバッグ情報を標準出力に表示する\n"
+"  -h, --help          このヘルプを表示して終了する\n"
+"  -n, --nologin       自動的にサイン・インしない\n"
+"  -l, --login[=NAME]  自動的にサイン・インする (NAME にアカウント名を指定する"
+"と\n"
+"                      それを使用する - コンマで区切って複数指定することも"
+"可)\n"
+"  -v, --version       現在使用しているバージョンを表示して終了する\n"
+
+#: ../pidgin/gtkmain.c:497
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the Pidgin\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"セグメンテーション・フォルトが発生したため、%s が\n"
+"core ファイルの出力を試みました。これはソフトウェアの\n"
+"バグであり、ユーザの落ち度ではありません。\n"
+"\n"
+"この問題を再現できるのであれば、次のサイトから\n"
+"Pidgin の開発者にバグとして報告して下さい:\n"
+"%sbug.php\n"
+"\n"
+"問題を再現するための手順と core ファイルからの\n"
+"バックトレース情報も添付して下さい。\n"
+"バックトレース情報の取得方法がわからない場合は\n"
+"次のサイトにある説明を参照してみて下さい:\n"
+"%sgdb.php\n"
+"\n"
+"さらにヘルプが必要なら、IM で\n"
+"SeanEgn 氏または LSchiere 氏 (共に AIM 経由) に\n"
+"声をかけてみて下さい。その他のプロトコル経由については\n"
+"次のサイトを参照してみて下さい:\n"
+"%scontactinfo.php\n"
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "全てのメッセージを開く"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります！</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "送信者"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s には %d通の新しいメッセージがあります。"
+msgstr[1] "%s には %d通の新しいメッセージがあります。"
+
+#: ../pidgin/gtknotify.c:520
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] "<b>%d通の新しいメールがあります</b>"
+msgstr[1] "<b>%d通の新しいメールがあります</b>"
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "ブラウザを起動するコマンド \"%s\" が正しくありません。"
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "URL を開けません"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" を起動する際にエラー: %s"
+
+#: ../pidgin/gtknotify.c:1065
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"ブラウザのコマンドを '手動設定' したようですが、コマンドが指定されていませ"
+"ん。"
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "次のプラグインを解放します。"
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "複数個のプラグインを解放します。"
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "プラグインの解放"
+
+#: ../pidgin/gtkplugin.c:399
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">作者:</span> %s\n"
+"<span weight=\"bold\">配布元:</span> %s\n"
+"<span weight=\"bold\">ファイル名:</span> %s"
+
+#: ../pidgin/gtkplugin.c:409
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">エラー: %s\n"
+"アップデートが提供されていないか配布元で確認して下さい。</span>"
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "プラグインの設定(_U)"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>プラグインの詳細</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "ファイルの選択"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:524
+msgid "Pounce on Whom"
+msgstr "どのアカウントで誰をつかむか..."
+
+#: ../pidgin/gtkpounce.c:551
+msgid "_Buddy name:"
+msgstr "つかむ仲間(_B):"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Si_gns on"
+msgstr "サイン・インした時(_G)"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Signs o_ff"
+msgstr "サイン・アウトした時(_F)"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Goes a_way"
+msgstr "離席中になった時(_W)"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "離席中から戻った時(_U)"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Becomes _idle"
+msgstr "待機中になった時(_I)"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Is no longer i_dle"
+msgstr "待機中から復帰した時(_D)"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "Starts _typing"
+msgstr "入力を開始した時(_T)"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "P_auses while typing"
+msgstr "入力を一旦停止した時(_A)"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "入力を止めた時(_Y)"
+
+#: ../pidgin/gtkpounce.c:603
+msgid "Sends a _message"
+msgstr "メッセージを送信する時(_M)"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "Ope_n an IM window"
+msgstr "会話ウィンドウを開く(_N)"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "_Pop up a notification"
+msgstr "ポップアップして通知する(_P)"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "Send a _message"
+msgstr "メッセージを送信する(_M)"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "E_xecute a command"
+msgstr "コマンドを実行する(_X)"
+
+#: ../pidgin/gtkpounce.c:654
+msgid "P_lay a sound"
+msgstr "サウンドを演奏する(_L)"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Brows_e..."
+msgstr "参照(_E)..."
+
+#: ../pidgin/gtkpounce.c:661
+msgid "Br_owse..."
+msgstr "参照(_O)..."
+
+#: ../pidgin/gtkpounce.c:662
+msgid "Pre_view"
+msgstr "プレビュー(_V)"
+
+#: ../pidgin/gtkpounce.c:786
+msgid "P_ounce only when my status is not available"
+msgstr "自分の状態を指定できない時にだけつかむ(_O)"
+
+#: ../pidgin/gtkpounce.c:791
+msgid "_Recurring"
+msgstr "繰り返す(_R)"
+
+#: ../pidgin/gtkpounce.c:1247
+msgid "Pounce Target"
+msgstr "つかむ相手"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "スマイリーのテーマを展開できませんでした"
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"下の一覧から使用するスマイリー (顔文字) のテーマを選択して下さい。この一覧の"
+"中へ新しいテーマをドラッグ＆ドロップするとインストールすることができます。"
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "アイコン"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "システム・トレイのアイコン"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "いつアイコンを表示するか...(_S):"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "離席中の時"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "メッセージが届いた時"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "会話ウィンドウを隠す"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+msgid "When away"
+msgstr "離席する時だけ"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "タブ"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "タブ付きのウィンドウの中に IM とチャットを表示する(_T)"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "タブに閉じるボタンを表示する(_U)"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "タブの位置(_P):"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "上側"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "下側"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "左側"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "右側"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "左側に縦向き"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "右側に縦向き"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "新しい会話ウィンドウ(_E):"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "受信したメッセージの書式を有効にして表示する(_F)"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "仲間アイコンを表示する(_I)"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "仲間アイコンのアニメーションを有効にする(_O)"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "メッセージを入力中であることを仲間に通知する(_N)"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "スペル間違いを強調表示する(_M)"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "スクロールを滑らかにする"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "デフォルトの書式"
+
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"これは書式をサポートするプロトコルを利用する際に、送信したメッセージがどのよ"
+"うに表示されるかを示すものです :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "STUN サーバ(_U):"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">例: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "IP-アドレスを自動的に検出する(_A)"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "パブリック IP(_I):"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "ポート"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "監視するポート番号の範囲を指定する(_M)"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "開始のポート番号(_S):"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "終了のポート番号(_E):"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "プロキシ・サーバ"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "プロキシなし"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "ユーザ名(_U):"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME のデフォルト"
+
+#: ../pidgin/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid "Manual"
+msgstr "手動設定"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "ブラウザの選択"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "ブラウザ(_B):"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "リンクを開く方法(_O):"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "ブラウザの設定に従う"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "既存のウィンドウで開く"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "新しいタブで開く"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"手動設定(_M):\n"
+"(URL は %s で指定)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "ログの書式(_F):"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "メッセージを全てログに記録する(_L)"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "チャットを全てログに記録する(_H)"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "状態の変更を全てログに記録する(_S)"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "サウンドの選択"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quietest"
+msgstr "一番静か"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quieter"
+msgstr "まあまあ静か"
+
+#: ../pidgin/gtkprefs.c:1527
+msgid "Quiet"
+msgstr "静か"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Loud"
+msgstr "大きい"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Louder"
+msgstr "まあまあ大きい"
+
+#: ../pidgin/gtkprefs.c:1535
+msgid "Loudest"
+msgstr "一番大きい"
+
+#: ../pidgin/gtkprefs.c:1598
+msgid "Sound Method"
+msgstr "サウンド出力の方法"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "_Method:"
+msgstr "方法(_M):"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "ビープ音"
+
+#: ../pidgin/gtkprefs.c:1603
+msgid "Automatic"
+msgstr "自動選択"
+
+#: ../pidgin/gtkprefs.c:1606
+msgid "Command"
+msgstr "コマンド指定"
+
+#: ../pidgin/gtkprefs.c:1607
+msgid "No sounds"
+msgstr "サウンドなし"
+
+#: ../pidgin/gtkprefs.c:1615
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"サウンド・コマンド(_O)\n"
+"(ファイル名は %s で指定)"
+
+#: ../pidgin/gtkprefs.c:1641
+msgid "Sound Options"
+msgstr "サウンドのオプション"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Sounds when conversation has _focus"
+msgstr "会話ウィンドウがフォーカスされたらサウンドを演奏する(_F)"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Enable sounds:"
+msgstr "いつサウンドを有効にするか...:"
+
+#: ../pidgin/gtkprefs.c:1646
+msgid "Only when available"
+msgstr "在席している時だけ"
+
+#: ../pidgin/gtkprefs.c:1647
+msgid "Only when not available"
+msgstr "不在の時だけ"
+
+#: ../pidgin/gtkprefs.c:1655
+msgid "Volume:"
+msgstr "音量:"
+
+#: ../pidgin/gtkprefs.c:1683
+msgid "Sound Events"
+msgstr "イベント毎のサウンド"
+
+#: ../pidgin/gtkprefs.c:1734
+msgid "Play"
+msgstr "演奏"
+
+#: ../pidgin/gtkprefs.c:1741
+msgid "Event"
+msgstr "イベント"
+
+#: ../pidgin/gtkprefs.c:1760
+msgid "Test"
+msgstr "テスト"
+
+#: ../pidgin/gtkprefs.c:1764
+msgid "Reset"
+msgstr "リセット"
+
+#: ../pidgin/gtkprefs.c:1768
+msgid "Choose..."
+msgstr "選択..."
+
+#: ../pidgin/gtkprefs.c:1811
+msgid "_Report idle time:"
+msgstr "いつ待機時間を報告するか...(_R):"
+
+#: ../pidgin/gtkprefs.c:1816
+msgid "Based on keyboard or mouse use"
+msgstr "キーボードやマウスを操作し始めた時"
+
+#: ../pidgin/gtkprefs.c:1825
+msgid "_Auto-reply:"
+msgstr "自動応答(_A):"
+
+#: ../pidgin/gtkprefs.c:1829
+msgid "When both away and idle"
+msgstr "離席中で待機中の時"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1835
+msgid "Auto-away"
+msgstr "自動離席"
+
+#: ../pidgin/gtkprefs.c:1837
+msgid "Change status when _idle"
+msgstr "待機中になったら状態を変更する(_I)"
+
+#: ../pidgin/gtkprefs.c:1841
+msgid "_Minutes before changing status:"
+msgstr "状態を変更するまでの時間(分)(_M):"
+
+#: ../pidgin/gtkprefs.c:1849
+msgid "Change _status to:"
+msgstr "次の状態に変更する(_S):"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1870
+msgid "Status at Startup"
+msgstr "起動時の状態"
+
+#: ../pidgin/gtkprefs.c:1872
+msgid "Use status from last _exit at startup"
+msgstr "最後に終了した時の状態を継承する(_E)"
+
+#: ../pidgin/gtkprefs.c:1878
+msgid "Status to a_pply at startup:"
+msgstr "起動時に適用する状態(_P):"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Interface"
+msgstr "インタフェース"
+
+#: ../pidgin/gtkprefs.c:1918
+msgid "Smiley Themes"
+msgstr "顔文字のテーマ"
+
+#: ../pidgin/gtkprefs.c:1919
+msgid "Sounds"
+msgstr "サウンド"
+
+#: ../pidgin/gtkprefs.c:1925
+msgid "Browser"
+msgstr "ブラウザ"
+
+#: ../pidgin/gtkprefs.c:1929
+msgid "Status / Idle"
+msgstr "状態/待機"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "全てのユーザからのコンタクトを許可する"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "仲間リストに登録されているユーザのみ許可する"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "次のユーザのみ許可する"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "全てのユーザを拒否する"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "次のユーザのみ拒否する"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "個人情報"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "個人情報の設定はすぐに反映されます。"
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "設定する個人情報:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+msgid "Permit User"
+msgstr "許可するユーザ"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "コンタクトを許可するユーザを入力して下さい。"
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "コンタクトを許可したいユーザの名前を入力して下さい。"
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgid "_Permit"
+msgstr "許可する(_P)"
+
+#: ../pidgin/gtkprivacy.c:571
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s さんからのコンタクトを許可しますか？"
+
+#: ../pidgin/gtkprivacy.c:573
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "本当に %s さんにコンタクトを許可しますか？"
+
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+msgid "Block User"
+msgstr "ユーザの拒否"
+
+#: ../pidgin/gtkprivacy.c:603
+msgid "Type a user to block."
+msgstr "拒否するユーザを入力して下さい。"
+
+#: ../pidgin/gtkprivacy.c:604
+msgid "Please enter the name of the user you wish to block."
+msgstr "拒否したいユーザの名前を入力して下さい。"
+
+#: ../pidgin/gtkprivacy.c:612
+#, c-format
+msgid "Block %s?"
+msgstr "%s さんを拒否しますか？"
+
+#: ../pidgin/gtkprivacy.c:614
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "本当に %s さんを拒否しますか？"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "適用"
+
+#: ../pidgin/gtkrequest.c:1481
+msgid "That file already exists"
+msgstr "既にそのファイルは存在します"
+
+#: ../pidgin/gtkrequest.c:1482
+msgid "Would you like to overwrite it?"
+msgstr "上書きしてもよろしいですか？"
+
+#: ../pidgin/gtkrequest.c:1485
+msgid "Overwrite"
+msgstr "上書きする"
+
+#: ../pidgin/gtkrequest.c:1486
+msgid "Choose New Name"
+msgstr "別の名前を付ける"
+
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgid "Select Folder..."
+msgstr "フォルダの選択..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "ルームの一覧"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "一覧の取得(_G)"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "チャットの追加(_A)"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "本当に選択した保存済みの状態を削除してもよろしいですか？"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+msgid "_Use"
+msgstr "使う(_U)"
+
+#: ../pidgin/gtksavedstatuses.c:726
+msgid "Title already in use.  You must choose a unique title."
+msgstr "その題名は既に使用中です。重複しない題名を選択して下さい。"
+
+#: ../pidgin/gtksavedstatuses.c:914
+msgid "Different"
+msgstr "別の状態"
+
+#: ../pidgin/gtksavedstatuses.c:1107
+msgid "_Title:"
+msgstr "題名(_T):"
+
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+msgid "_Status:"
+msgstr "状態(_S):"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "Use a _different status for some accounts"
+msgstr "同じアカウントで別の状態を利用する(_D)"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1222
+msgid "Sa_ve & Use"
+msgstr "保存して使う(_V)"
+
+#: ../pidgin/gtksavedstatuses.c:1428
+#, c-format
+msgid "Status for %s"
+msgstr "%s の状態"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "仲間がログインしました"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "仲間がログアウトしました"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "メッセージを受信しました"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "受信したメッセージと会話と開始しました"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "メッセージを送信しました"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "チャットに参加してきました"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "チャットから離れました"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "チャットで話しました"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "他の人がチャットで話しました"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "チャットで誰かがあなたを呼びました"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer のエラー"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer の初期化に失敗しました"
+
+#: ../pidgin/gtkstatusbox.c:661
+msgid "Waiting for network connection"
+msgstr "ネットワークの接続待ちです"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%s を読み込む際に次のエラーが発生しました: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "画像の読み込みに失敗しました"
+
+#: ../pidgin/gtkutils.c:1419
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "フォルダ %s は転送できません"
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+"%s ではフォルダそのものを転送できません。ファイルを別個に転送して下さい。"
+
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
+msgid "You have dragged an image"
+msgstr "ドラッグしたのは画像です"
+
+#: ../pidgin/gtkutils.c:1453
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
+"のユーザの仲間アイコンに利用できます。"
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+msgid "Set as buddy icon"
+msgstr "仲間アイコンにする"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+msgid "Send image file"
+msgstr "ファイルとして転送する"
+
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+msgid "Insert in message"
+msgstr "メッセージの中に埋め込む"
+
+#: ../pidgin/gtkutils.c:1465
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "このユーザの仲間アイコンとして画像をセットしてもよろしいですか？"
+
+#: ../pidgin/gtkutils.c:1472
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"この画像をファイルとして転送したり、メッセージの中に埋め込んだり、あるいはこ"
+"のユーザの仲間アイコンに利用できます。"
+
+#: ../pidgin/gtkutils.c:1474
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"この画像をメッセージの中に埋め込んだり、このユーザの仲間アイコンに利用できま"
+"す"
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1532
+msgid "Cannot send launcher"
+msgstr "ランチャは転送できません"
+
+#: ../pidgin/gtkutils.c:1532
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
+"ンチャが指しているオブジェクトを転送したいのでしょう。"
+
+#: ../pidgin/gtkutils.c:2302
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>ファイル:</b> %s\n"
+"<b>サイズ:</b> %s\n"
+"<b>画像のサイズ:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2592
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+"ファイル '%s' は %s では大きすぎます。もっと小さい画像でトライしてみて下さ"
+"い。\n"
+
+#: ../pidgin/gtkutils.c:2594
+msgid "Icon Error"
+msgstr "アイコンのエラー"
+
+#: ../pidgin/gtkutils.c:2595
+msgid "Could not set icon"
+msgstr "アイコンを送信できませんでした"
+
+#: ../pidgin/gtkutils.c:2695
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "ファイル '%s' を開けませんでした: %s"
+
+#: ../pidgin/gtkutils.c:2744
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"画像 '%s' の読み込みに失敗しました: 原因は不明ですが、おそらく画像ファイルが"
+"壊れているようです"
+
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgid "Save File"
+msgstr "ファイルの保存"
+
+#: ../pidgin/gtkwhiteboard.c:867
+msgid "Select color"
+msgstr "色の選択"
+
+#: ../pidgin/pidginstock.c:83
+msgid "_Alias"
+msgstr "別名(_A)"
+
+#: ../pidgin/pidginstock.c:85
+msgid "Close _tabs"
+msgstr "タブを閉じる(_T)"
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Get Info"
+msgstr "情報の取得(_G)"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Invite"
+msgstr "招待(_I)"
+
+#: ../pidgin/pidginstock.c:89
+msgid "_Modify"
+msgstr "変更(_M)"
+
+#: ../pidgin/pidginstock.c:90
+msgid "_Open Mail"
+msgstr "メールを開く(_O)"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "統計情報"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "応答の見込み"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "統計情報の設定"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr "最大応答のタイムアウト:"
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "分間"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr "最大 last-seen difference:"
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "しきい値:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr "コンタクトの可能性の予測"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr "仲間と会話する可能性を予測するプラグインです"
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"コンタクトの可能性を予測するプラグイン (CAP) を使って仲間と会話した統計情報か"
+"ら経験値を表示します。"
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "待機中の仲間"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "離席中の仲間"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "\"長時間\" 離席中の仲間"
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "移動中の仲間"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "オフラインの仲間"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "状態別のスコア"
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr "<i>一番大きなスコア</i> を持つ仲間がコンタクトの中で優先されます。\n"
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "スコアが同じ値の時は最後の仲間を優先する"
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "アカウント別のスコア"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "コンタクトの優先度"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "仲間のいろいろな状態に合わせて優先度を調節できます"
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"コンタクトの優先度を計算する時に仲間の状態 (待機中/離席中/オフラインなど) の"
+"スコアを変更できます。"
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "メッセージの色"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "会話ウィンドウの中に表示するメッセージの色をカスタマイズします"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "エラー・メッセージ"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "強調表示したメッセージ"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "システムのメッセージ"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "送信したメッセージ"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "受信したメッセージ"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "%s に使用する色の選択"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "受信したメッセージの書式を無視する"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "チャットに適用する"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "IM のメッセージに適用する"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "会話の回数順に並べる"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "会話タブの配置"
+
+#: ../pidgin/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "ウィンドウ毎の会話タブの数"
+
+#: ../pidgin/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "会話タブを番号順に配置する時に IM とチャット・ウィンドウを分割する"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:141
+msgid "ExtPlacement"
+msgstr "会話タブの配置"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:143
+msgid "Extra conversation placement options."
+msgstr "会話タブを追加する時のオプションです"
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:145
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"会話ウィンドウ毎に会話タブの個数を制限し、オプションで IM とチャットのウィン"
+"ドウを分割します。"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "マウス・ジェスチャの設定"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "マウスの中ボタン"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "マウスの右ボタン"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "ジェスチャを視覚的に表示する(_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "マウス・ジェスチャ"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "マウス・ジェスチャの機能を提供します"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"会話ウィンドウでマウス・ジェスチャの機能を提供します。\n"
+"次のアクションを実行する場合は、マウスの中ボタンをドラッグして下さい:\n"
+"\n"
+"下→右にドラッグすると会話を閉じます。\n"
+"上→左にドラッグすると前の会話に移動します。\n"
+"上→右にドラッグすると次の会話に移動します。"
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "インスタント・メッセンジャー"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "下のアドレス帳から仲間を選択するか、または仲間を新規に追加して下さい:"
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "新しい仲間"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "仲間の選択"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"アドレス帳から追加する仲間を選択するか、または新しい仲間を作成して下さい:"
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "ユーザの詳細(_D)"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "仲間との連携(_A)"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "E-メールを送信できません"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "環境変数 PATH の中から Evolution の実行形式が見つかりませんでした。"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "この仲間の E-メール・アドレスがありません"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "アドレス帳へ追加する"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "E-メールを送信する"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Evolution との連携の設定"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "自動的に仲間として追加するアカウントを全て選択して下さい:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr "Evolution との連携"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:524
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr "Evolution との連携機能を提供します"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "ユーザ情報を入力して下さい。"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "仲間のスクリーン名とアカウントの種類を入力して下さい。"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "アカウントの種類:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "追加の情報:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "名:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "姓:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-メール"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK シグナルのテスト"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "全ての UI シグナルが正常に動作しているかテストします"
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "履歴"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "離席時にアイコン化"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "席を離れたら仲間リストと会話ウィンドウをアイコン化します"
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "メール・チェッカ"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "新しいローカル・メールをチェックします"
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"新着メールがあれば、それを表示するための小さな箱を仲間リストへ追加します。"
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "下線の付与"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "会話ウィンドウの中にある新着メッセージに下線を描画します"
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "下線を付与する場所"
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "IM ウィンドウ(_I)"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "チャット・ウィンドウ(_H)"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"楽曲メッセージのセッションを要求しました。受け入れる場合は MM アイコンをク"
+"リックして下さい。"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "楽曲メッセージのセッションに入りました。"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr "楽曲メッセージ"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "実行中のコマンドで衝突が起りました:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr "エディタの起動エラー"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "次のエラーが発生しました:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr "楽曲メッセージの設定"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr "スコア・エディタのパス名:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "適用(_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "コラボレートするための楽曲メッセージ・プラグインです"
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"リアルタイムで共通スコアを編集することにより、複数の仲間との間で、楽曲を一部"
+"分を同時に演奏することを可能にする楽曲メッセージのプラグインです。"
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "通知先"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t誰かがあなたのスクリーン名を呼んだ時だけ(_O)"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "フォーカスしたウィンドウ(_F)"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "通知方法"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "文字列をウィンドウ・タイトルの先頭に追加する(_S):"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "新しいメッセージ数をウィンドウのタイトルに挿入する(_O)"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "新しいメッセージ数をＸのプロパティに挿入する(_X)"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "ウィンドウ・マネージャに \"URGENT (緊急)\" ヒントをセットする(_U)"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "会話ウィンドウを前面に出す(_A)"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "通知を削除する時期"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "会話ウィンドウがフォーカスされたら(_G)"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "会話ウィンドウをクリックしたら(_R)"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "会話ウィンドウで何か入力したら(_T)"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "メッセージを送信したら(_M)"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "会話ウィンドのタブが切り替わったら(_B)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:901
+msgid "Message Notification"
+msgstr "メッセージの通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "未読メッセージを通知するいろいろな方法を提供します"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin のデモ・プラグイン"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "いろいろなことを実行するサンプル・プラグインです (説明をご覧下さい)"
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"これはいろいろなことを実行する、ホントにクールなプラグインです:\n"
+"- ログインしたらプログラムの作者を伝えてくれます\n"
+"- 受信した全てのテキストを反転します\n"
+"- サイン・インしたら仲間リストの人たちにメッセージを速攻で送信します"
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "カーソルの色"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "二番目のカーソルの色"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "ハイパーリンクの色"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView のエキスパンダの大きさ"
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView の水平方向のセパレータ"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "メッセージの文字"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "会話履歴の文字"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "ログ・ビューアの文字"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "質問ダイアログの文字"
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "通知ダイアログの文字"
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView のエキスパンダを字下げして描画する"
+
+#: ../pidgin/plugins/pidginrc.c:322
+msgid "Select Color"
+msgstr "色の選択"
+
+#: ../pidgin/plugins/pidginrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "%s に使用するフォントの選択"
+
+#: ../pidgin/plugins/pidginrc.c:398
+msgid "Select Interface Font"
+msgstr "フォントの選択"
+
+#: ../pidgin/plugins/pidginrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ インタフェースで使用するフォント"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ テキストのショートカットのテーマ"
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "インタフェースの色"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr "ウィジットの大きさ"
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "フォント"
+
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "ツール"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "これらの設定を \"%s%sgtkrc-2.0\" に書き込む"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "この \"gtkrc\" ファイルを読み込む"
+
+#: ../pidgin/plugins/pidginrc.c:622
+msgid "Pidgin GTK+ Theme Control"
+msgstr "GTK+ テーマのカスタマイズ"
+
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "\"gtkrc\" の設定にアクセスする機能を提供します"
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "生データ"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "生データをテキスト形式のプロトコルに送信できます"
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"入力した生データをテキスト形式のプロトコル (Jabber, MSN, IRC, TOC) へ送信でき"
+"ます。送信する際は入力ボックスの中で [ENTER] キーを押して下さい。デバッグ・"
+"ウィンドウで送信内容を監視して下さい。"
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "お使いのバージョンは %s %s です。最新バージョンは %s です。<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>変更履歴:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr ""
+"バージョン %s は次のサイトから入手できます:<br><a href=\"http://pidgin.im/"
+"\">http://pidgin.im</a>"
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "最新バージョンのお知らせ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "リリース通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "最新リリースの情報を周期的にチェックします"
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"最新リリースを周期的にチェックして変更履歴 (ChangeLog) をユーザに通知します。"
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "文字列が重複しています"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "指定した文字列は既に一覧にあります"
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "文字列の置換"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "入力した文字列"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "実際に送信する文字列"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "単語だけ"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "大/小文字を区別する"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "新しい置換の追加"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "入力した文字列(_T):"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "実際に送信する文字列(_S):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "大/小文字を区別する(_E)"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "単語が一致した時に置換する(_W)"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "一般的な文字列の置換オプション"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "送信時にまとめて置換する"
+
+#: ../pidgin/plugins/spellchk.c:2373
+msgid "Text replacement"
+msgstr "メッセージの置換"
+
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "ユーザが定義した規則に従って、実際に送信するメッセージを書き換えます"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "仲間表示器"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "仲間リストを水平方向にスクロールするバージョンです"
+
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "タイムスタンプを表示する間隔"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "タイムスタンプ"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "iChat 形式のタイムスタンプを表示します"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "iChat 形式のタイムスタンプを N分おきに会話の中に挿入します"
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "タイムスタンプの書式オプション"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr "強制的に 24時間制にする (従来の %s)(_F)"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "表示する条件:"
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "会話ウィンドウ(_N):"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "メッセージが遅延した時"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "メッセージが遅延しかつチャットの時"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "メッセージのログ(_M):"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "メッセージ・タイムスタンプの書式"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "メッセージに付与するタイムスタンプの書式をカスタマイズします"
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"このプラグインを使えば、会話やログのメッセージに付与するタイムスタンプの書式"
+"をカスタマイズできます。"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "不透明度:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "IM の会話ウィンドウ"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "会話ウィンドウの透明度(_I)"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "会話ウィンドウの中にスライダ・バーを表示する(_S)"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "フォーカスされたら会話ウィンドウの透明度を解除する"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "常に前面に配置する"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "仲間リストのウィンドウ"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "仲間リストの透明度(_B)"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "フォーカスされたら仲間リストの透明度を解除する"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+msgid "Transparency"
+msgstr "透明度"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "仲間リストと会話ウィンドウを段階的に透明化します"
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"このプラグインは可変式α透過を使って仲間リストと会話ウィンドウを透明にしま"
+"す。\n"
+"\n"
+"* 注記: このプラグインは Windows 2000 以上で動作します。"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ ラインタイムのバージョン"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "スタートアップ"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "Windows のスタートアップで %s を起動する(_S)"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "仲間リストを格納式にする(_D)"
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "仲間リストを前面に配置したままにする(_K):"
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr "格納した時にだけ"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr "チャットでメッセージを受け取ったらウィンドウを点滅させる(_F)"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Pidgwin Options"
+msgstr "Pidgin のオプション"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+msgid "Options specific to Pidgin for Windows."
+msgstr "Windows 版 Pidgin 専用のオプション機能を提供します"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Windows 版の Pidgin に特化したオプション機能 (会話ウィンドウの組み込みなど) "
+"を提供します"
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>サイン・アウトしました</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP のコンソール"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "アカウント: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP に接続していません</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "<iq/> スタンザを挿入します"
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "<presence/> スタンザを挿入します"
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "<message/> スタンザを挿入します"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "低レベルの XMPP スタンザを送信したり受信します"
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
+"これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 81951d092f..b7b3035821 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12755,8 +12755,8 @@ msgstr ""
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin no irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 no irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/sl.po b/po/sl.po
index 4d5919b273..3ea5b07708 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12548,7 +12548,7 @@ msgid "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabbe
 msgstr "%s je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom %s.  %s je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48b341e47a..e1b2efeac7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12395,7 +12395,7 @@ msgid ""
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidwin<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 18bb3dc30d..faa2485b04 100755
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12976,9 +12976,9 @@ msgstr ""
 "名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgwin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 18bb3dc30d..442afe8dc9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.445 2007/04/16 03:20:24 acli Exp $
+# $InternalId: zh_TW.po,v 1.447 2007/05/02 06:33:40 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -50,8 +50,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2007-04-14 22:00-0400\n"
+"POT-Creation-Date: 2007-05-02 00:00-0400\n"
+"PO-Revision-Date: 2007-05-02 02:00-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -60,12 +60,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -86,14 +86,30 @@ msgstr ""
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
+#  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
+"並透過 http://developer.pidgin.im 回報這個錯誤。"
+
+#  NOTE Untranslated
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
 #: ../libpurple/protocols/jabber/chat.c:679
 #: ../libpurple/protocols/jabber/chat.c:690
 #: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
@@ -107,16 +123,16 @@ msgstr "帳號未被新增"
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
+#: ../pidgin/gtkblist.c:3946
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -125,103 +141,103 @@ msgstr "修改帳號"
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5355
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號："
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
 msgid "Password:"
 msgstr "密碼："
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5376
+#: ../pidgin/gtkblist.c:5739
 msgid "Alias:"
 msgstr "別名："
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
 #: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:874
 #: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
+#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5795
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -232,309 +248,310 @@ msgid "Delete Account"
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:541
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
+#: ../pidgin/gtkblist.c:5794 ../pidgin/gtkconv.c:1633
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他（她）的好友 %s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:286
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
+#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2947 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5309
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:327
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5685
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:398
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節，請用快顯選單。"
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:412
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:425
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實：是「加入」抑或「新增」?
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5791
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:432
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:761
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:761
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:778
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」？
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:787
 msgid "Edit Settings"
 msgstr "修改設定"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:855
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:866
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:947
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
 msgid "Rename"
 msgstr "重命名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:950
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1026
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1034
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1039
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s？"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1042
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4188
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1200
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1205
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2971
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3380 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1347
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -543,12 +560,12 @@ msgstr ""
 "上線：%d 人\n"
 "總數：%d 人"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1356
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號：%s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1368
 #, c-format
 msgid ""
 "\n"
@@ -558,91 +575,91 @@ msgstr ""
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:489
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:490
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
+#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
 #: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3945
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
 #: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2162
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
 # FIXME 譯文有待改進 - 20061028
-#: ../finch/gntblist.c:2077
+#: ../finch/gntblist.c:2166
 msgid "Toggle offline buddies"
 msgstr "顯示／不顯示離線好友"
 
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2172
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2176
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2180
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
@@ -665,13 +682,13 @@ msgstr ""
 "%s 因下列錯誤結束了連線：\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3942
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3947
 msgid "Connect"
 msgstr "連線"
 
@@ -705,17 +722,17 @@ msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "尚未支援指令，訊息因此沒有被送出。"
 
 # XXX 這是什麼？
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:217
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:240
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
 #, c-format
 msgid ""
 "\n"
@@ -724,24 +741,24 @@ msgstr ""
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:390
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:492
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -749,57 +766,57 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:710
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:713
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:716
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:719
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:722
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
 # FIXME - 20061028
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:725
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「已儲存的狀態」視窗"
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -807,15 +824,15 @@ msgstr "除錯視窗"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
 msgid "Pause"
 msgstr "暫停"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
 msgid "Timestamps"
 msgstr "時間戳記"
 
@@ -850,26 +867,26 @@ msgid "Remaining"
 msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
 #: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:802
 #: ../libpurple/protocols/oscar/oscar.c:807
 #: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/oscar/oscar.c:2650
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3035
+#: ../pidgin/gtkblist.c:3048 ../pidgin/gtkblist.c:3050
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
 
@@ -886,10 +903,10 @@ msgid "Stop"
 msgstr "中止"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -967,11 +984,11 @@ msgstr "繼續"
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "即時訊息"
 
@@ -988,7 +1005,7 @@ msgstr "邀請"
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1005,40 +1022,36 @@ msgstr ""
 "網站：%s\n"
 "檔名：%s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前，請先載入模組。"
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#  XXX 這是指模組既沒有設定任何選項，也沒有指明自己是沒有選項的
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "此模組尚未完成。"
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "設定模組"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -1048,8 +1061,8 @@ msgstr "捕捉誰的狀態"
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5403
+#: ../pidgin/gtkblist.c:5719
 msgid "Account:"
 msgstr "帳號："
 
@@ -1058,52 +1071,52 @@ msgid "Buddy name:"
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../finch/gntpounce.c:372
+#: ../finch/gntpounce.c:373
 msgid "Signs on"
 msgstr "登入"
 
-#: ../finch/gntpounce.c:373
+#: ../finch/gntpounce.c:374
 msgid "Signs off"
 msgstr "登出"
 
-#: ../finch/gntpounce.c:374
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "離開"
 
-#: ../finch/gntpounce.c:375
+#: ../finch/gntpounce.c:376
 msgid "Returns from away"
 msgstr "返回"
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:377
 msgid "Becomes idle"
 msgstr "閒置"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "不再閒置"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "開始輸入"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "暫停輸入"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "停止輸入"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "執行動作"
 
@@ -1131,143 +1144,138 @@ msgstr "播放音效"
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntprefs.c:166
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "日誌格式"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -1281,104 +1289,104 @@ msgid "Delete Status"
 msgstr "移除狀態"
 
 # FIXME 譯得太差了
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "職銜"
 
 # NOTE 應指儲存時的格式
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "格式"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
 #: ../libpurple/protocols/jabber/jabber.c:1233
 #: ../libpurple/protocols/jabber/jabber.c:1243
 #: ../libpurple/protocols/jabber/jabber.c:1253
 #: ../libpurple/protocols/jabber/jabber.c:1263
 #: ../libpurple/protocols/jabber/jabber.c:1273
 #: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5463
+#: ../libpurple/protocols/oscar/oscar.c:5681
+#: ../libpurple/protocols/oscar/oscar.c:5695
+#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 #: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "訊息"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "使用"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "無效的標題"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "請為這個狀態輸入一個非空白的標題。"
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "標題重覆"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "為給這個狀態輸入另一個標題。"
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "子狀態"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "狀態："
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "訊息："
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "修改狀態"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "為部份帳號設定不同的狀態"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "儲存並使用"
 
@@ -1401,66 +1409,66 @@ msgid ""
 "X, if possible."
 msgstr "當 gnt 的剪則薄內容有所變更時，儘可能把新的內容滙出至 X 視窗系統。"
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 登入"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 登出"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 送出一個訊息給您"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 提到您的暱稱"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 送出一個訊息給您。"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "好友登入／登出"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "您收到即時訊息"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天室談話"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "有人在聊天室中提到您的名字"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr "也要「嗶」聲！"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr "給終端機視窗設定「URGENT」（緊急資訊）提示"
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
@@ -1514,69 +1522,70 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
 #: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "新密碼（再次確認）"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1587,18 +1596,18 @@ msgstr "設定使用者資訊"
 # XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5199 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1622,7 +1631,7 @@ msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1687
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1645,7 +1654,7 @@ msgstr "這個訊息太大了。"
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1160
 msgid "Send Message"
 msgstr "送出訊息"
 
@@ -1700,6 +1709,10 @@ msgstr "無法取得名稱：%s"
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱：%s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "因下列原因，Purple 的 D-BUS 伺服器未有執行"
+
 # NOTE 暫譯，或許有其他意義
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1750,7 +1763,7 @@ msgstr "無法建立執行緒：%s"
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1794,23 +1807,23 @@ msgstr "無法傳送目錄。"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案，因此不會覆蓋它。\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎？"
 
 #  XXX 暫譯
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1821,60 +1834,60 @@ msgstr ""
 "遠端主機　：%s\n"
 "遠端通訊埠：%d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "「%s」不是一個有效的檔案名稱。\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2170,29 +2183,29 @@ msgstr "當「%s」要求檔案傳輸時"
 msgid "Set Autoaccept Setting"
 msgstr "設定自動接受選項"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #  TODO: 不通順 - 20070414
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "問一問我"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "自動接受"
 
@@ -2210,17 +2223,17 @@ msgstr "自動接受"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2228,11 +2241,11 @@ msgstr ""
 "檔案儲存路徑\n"
 "（請提供完整路徑）"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "自動拒絕非來自好友清單中的使用者"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2240,108 +2253,8 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "適用於所有通訊協定的自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆，只需在這模"
-"組的選項視窗設定即可；為個別好友設定自動回覆，請在好友清單中以滑鼠右鍵點擊該"
-"個好友；為您的個別帳戶設定自動回覆，請在這模組的選項視窗按「進階」按紐。"
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "設定自動回覆給 %s 的訊息"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "設定自動回覆訊息"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr "當自動回覆功能啟動後，每當好友給您送出訊息時，下列訊息將被自動送出："
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "設定自動回覆訊息(_A)"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "自動回覆訊息"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "何時發出自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "當我的帳號是在「離開」狀態時(_A)"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "當我的帳號是在「閒置」狀態時(_I)"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "預設回覆訊息(_D)"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "狀態訊息"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "以狀態訊息作為自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "每當設定了狀態訊息時"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "只在沒有設定自動回覆訊息時"
-
-#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
-#  NOTE: (23:41:12) elb: wing: it is the latter
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "自動回覆之間的相隔時間"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "相隔時間下限（分）(_M)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "送出自動回覆訊息的次數"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "次數上限 (_X)"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "我現在不在位子上。請您留下您的訊息，當我回來的時候，我將儘快給您回覆。"
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Notes"
 msgstr "備註"
 
@@ -2349,10 +2262,12 @@ msgstr "備註"
 msgid "Enter your notes below..."
 msgstr "請在下面的空位輸入備註"
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "編輯備註..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2369,7 +2284,7 @@ msgstr "好友備註"
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
@@ -2431,46 +2346,46 @@ msgstr "提供透過在檔案中輸入指令來控制本程式的功能。"
 
 #  NOTE 這是是輸入欄位左邊的標籤，「幾多分鐘」、「分鐘數」的意思
 #  FIXME 譯文有待改進
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分鐘數"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "自定個別帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "您的帳號都不是閒置狀態。"
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "取消帳號閒置時間設定"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "取消設定(_U)"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "設定所有帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "取消所有已閒置帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "允許您手動設定您已閒置了多久時間"
 
@@ -2547,7 +2462,7 @@ msgstr "閒置時間下限（分鐘）"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "隱藏「加入/離開聊天室」訊息"
 
@@ -2555,12 +2470,12 @@ msgstr "隱藏「加入/離開聊天室」訊息"
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "不顯示多餘的「加入/離開聊天室」訊息"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2682,20 +2597,20 @@ msgstr "日誌目錄"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2708,12 +2623,12 @@ msgstr ""
 "\n"
 "注意：這個模組仍處於開發初期，因此可能經常當掉。如果使用，後果自負！"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono 模組載入器"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "使用Mono讀取.NET模組"
 
@@ -2736,7 +2651,7 @@ msgstr "開新行"
 msgid "Prepends a newline to displayed message."
 msgstr "顯示訊息前先開新行。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2776,31 +2691,31 @@ msgstr "離線訊息"
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "是"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "否"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "使用「好友狀態捕捉」儲存離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。"
 
@@ -2810,26 +2725,26 @@ msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "未卜先知"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "「未卜先知」將要開始的交談"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -2837,24 +2752,24 @@ msgstr ""
 "對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
 "Yahoo。"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "您感受到了原力的擾動..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "只用於好友清單中的使用者"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "離開時停用"
 
 # FIXME 譯文有待改進 - 20061027
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "浮現「未卜先知」的交談"
 
@@ -2919,7 +2834,7 @@ msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2927,8 +2842,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -2938,7 +2853,7 @@ msgstr "透過 GNUTLS 提供 SSL 的支援。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2946,8 +2861,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -2998,7 +2913,7 @@ msgstr "好友登入／登出 (_S)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "好友狀態通知"
 
@@ -3006,22 +2921,22 @@ msgstr "好友狀態通知"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開（閒置）返回的通知訊息。"
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3043,18 +2958,18 @@ msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎？"
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
 
@@ -3068,51 +2983,51 @@ msgstr "離開"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:475
+#: ../libpurple/protocols/bonjour/bonjour.c:482
+#: ../libpurple/protocols/bonjour/bonjour.c:540
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:579
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:586
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:592
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:595
 msgid "Jabber Account"
 msgstr "Jabber 帳號"
 
@@ -3199,67 +3114,67 @@ msgstr "好友清單讀取成功！"
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "註冊成功！"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
 #: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
+#: ../libpurple/protocols/oscar/oscar.c:3713
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3267,220 +3182,220 @@ msgstr "出生年"
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3713
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3713
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前所提供的密碼與指定的帳號不符。"
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功！"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸您的舊密碼及你的新密碼："
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友；%s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/oscar/oscar.c:5513
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3035 ../pidgin/gtkblist.c:3359
+#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "上線"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2649
+#: ../libpurple/protocols/oscar/oscar.c:3680
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3691
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
 # FIXME 這不像對，要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libpurple/protocols/gg/gg.c:2020
+#: ../libpurple/protocols/gg/gg.c:2030
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -3495,35 +3410,35 @@ msgstr "自檔案讀取好友清單..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -3558,7 +3473,7 @@ msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3583,26 +3498,26 @@ msgstr "IRC 暱稱不可含有空白字元"
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1038
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
+#: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1269
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../libpurple/protocols/jabber/jabber.c:595
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
@@ -3627,19 +3542,19 @@ msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3653,56 +3568,56 @@ msgstr "主題"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2122
+#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1852
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "姓名"
 
@@ -3710,232 +3625,232 @@ msgstr "姓名"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:178
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:189
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:190
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:207
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s：禁止清單已滿"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:292
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:293
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:294
+#: ../libpurple/protocols/oscar/oscar.c:3681
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:320
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:325
 msgid "Idle for"
 msgstr "閒置時間"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:328
 msgid "Online since"
 msgstr "上線自"
 
 #  XXX 其實譯得不太對，可以改進一點
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述：</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:332
 msgid "Glorious"
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為：%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:418
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為：%s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:436
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:437
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:437
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:458
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者：%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:555
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:556
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為："
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:567
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:581
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:586
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:662
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:663
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:775
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
 msgid "Invalid nickname"
 msgstr "無效的暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:890
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱，暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:895
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱，名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:934
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:955
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:997
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:999
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
+#: ../libpurple/protocols/irc/msgs.c:1080
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s："
 
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1081
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1115
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1127
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;：執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [訊息]：設定一個離開訊息，或者在離開時不指定任何訊息。"
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3943,7 +3858,7 @@ msgstr ""
 "deop &lt;暱稱1&gt; [暱稱2] ...：移除某個人的「頻道管理者」權限。您必須具有"
 "「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3952,7 +3867,7 @@ msgstr ""
 "devoice &lt;暱稱1&gt; [暱稱2] ...：移除某個人的「發言」權限。禁止某些人在頻道"
 "中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3960,7 +3875,7 @@ msgstr ""
 "invite &lt暱稱&gt; [聊天室]：邀請某個人來加入您所指定的頻道，或是目前您所在的"
 "頻道。"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3968,7 +3883,7 @@ msgstr ""
 "j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]：以指定的密鑰（如有給"
 "予並有需要）加入所指定的聊天室。"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3976,7 +3891,7 @@ msgstr ""
 "join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]：以指定的密鑰（如"
 "有給予並有需要）加入所指定的聊天室。"
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3984,7 +3899,7 @@ msgstr ""
 "kick &lt;暱稱&gt; [訊息]：將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
 "才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3992,22 +3907,22 @@ msgstr ""
 "list：列出目前在網絡上的聊天室清單。<i>請注意，有些伺服器會在您執行了這個動作"
 "之後，強行中止您的連線。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要執行的動作&gt;：執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv：送出一個指令到 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;：設定或解除頻道╱使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4015,20 +3930,20 @@ msgstr ""
 "msg &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免傳送到公眾"
 "頻道中）。"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]：列出目前在頻道中的使用者清單。"
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1800
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv：送出一個指令到 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4036,7 +3951,7 @@ msgstr ""
 "op &lt;暱稱&gt; [暱稱] ...：賦與某個使用者「頻道管理者」權限。您必須具有「頻"
 "道管理者」權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4044,11 +3959,11 @@ msgstr ""
 "operwall &lt;訊息&gt;：如果您不知道這是幹什麼用的，您可能沒有辦法使用這個指"
 "令。"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "operserv：送出一個指令到 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4056,7 +3971,7 @@ msgstr ""
 "part [頻道] [訊息]：離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
 "息。"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4064,7 +3979,7 @@ msgstr ""
 "ping [暱稱]：查詢某一個使用者的網路回應速度（或在沒有指定使用者時，查詢伺服器"
 "的回應速度）。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4072,16 +3987,16 @@ msgstr ""
 "query &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免發送到公"
 "眾頻道）。"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]：自伺服器離線，並送出指定的訊息。"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]：送出一個 RAW 指令到伺服器。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4089,23 +4004,23 @@ msgstr ""
 "remove &lt;暱稱&gt; [訊息]：將某個使用者踢出頻道。您必須具有「頻道管理者」的"
 "權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time：顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新主題]：檢視或修改頻道主題"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;：設定或解除使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [暱稱]：送出 CTCP VERSION 要求給使用者"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4113,7 +4028,7 @@ msgstr ""
 "voice &lt;暱稱&gt; [暱稱] ...：賦與使用者的「發言」權限。您必須具有「頻道管理"
 "者」的權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4121,150 +4036,150 @@ msgstr ""
 "wallops &lt;message&gt;：如果您不知道這是幹什麼用的，您可能就沒有辦法使用它"
 "了。"
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;：取得使用者資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;暱稱&gt;：取得已離線的使用者的資訊。"
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "沒有提供密碼，伺服器無法為你進行認證"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:295
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:481
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
+#: ../libpurple/protocols/jabber/auth.c:306
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
+#: ../libpurple/protocols/jabber/auth.c:434
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "街道地址"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "地址(續)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "市／村"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "省／州"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "國家"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "電話"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4272,53 +4187,53 @@ msgid "E-Mail"
 msgstr "電子郵件"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "所屬機構"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "所屬部門"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/oscar/oscar.c:3730
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3046
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "作業系統"
 
@@ -4327,12 +4242,12 @@ msgstr "作業系統"
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
 # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:670
+#: ../libpurple/protocols/jabber/buddy.c:667
 #: ../libpurple/protocols/jabber/jabber.c:1232
 #: ../libpurple/protocols/jabber/jabber.c:1242
 #: ../libpurple/protocols/jabber/jabber.c:1252
@@ -4343,47 +4258,47 @@ msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3782
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4392,43 +4307,43 @@ msgstr "要求或重新要求認證"
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
+#: ../libpurple/protocols/jabber/buddy.c:1407
 #: ../libpurple/protocols/jabber/jabber.c:1241
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
+#: ../libpurple/protocols/jabber/buddy.c:1413
 #: ../libpurple/protocols/jabber/jabber.c:1271
 #: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4436,69 +4351,69 @@ msgstr ""
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "填入一個或多個欄位，以搜尋Jabber使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1751
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "搜尋Jabber使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1762
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5223
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R)："
@@ -4616,68 +4531,68 @@ msgstr "讀取錯誤"
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:565
 #: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Jabber 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:850
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "註冊新的 Jabber 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
 msgid "Register"
 msgstr "註冊"
 
@@ -4695,11 +4610,11 @@ msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
 #: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1566
 #: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/oscar/oscar.c:5511
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -4764,26 +4679,26 @@ msgstr "修改 Jabber 密碼"
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1391
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4791,51 +4706,51 @@ msgstr "傳送網址時發生了不明的錯誤"
 #  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件（例如訊息中含有禁字），以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4843,78 +4758,78 @@ msgstr "必須付款"
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1493
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>，表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」（認證）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1521
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1532
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4924,181 +4839,181 @@ msgstr "無效的 Namespace Prefix"
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種，即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1548
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯，譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1657
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1682
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1708
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1761
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1792
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1796
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1810
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1816
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1828
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5107,7 +5022,7 @@ msgstr ""
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1834
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5115,19 +5030,19 @@ msgstr ""
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]：加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
@@ -5142,28 +5057,28 @@ msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文，在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -5200,35 +5115,35 @@ msgstr " (代碼 %s)"
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室，您要設定它，還是使用預設值？"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -5524,23 +5439,23 @@ msgstr "設定您的暱稱。"
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:314
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5548,129 +5463,129 @@ msgstr ""
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:529
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:567
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:571
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:599
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:618
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:623
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:657
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:705
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:730
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1528
+#: ../libpurple/protocols/oscar/oscar.c:3736
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1530
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1531
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5678,187 +5593,187 @@ msgstr "職業"
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1559
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1561
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1562
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1563
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1564
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1565
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1566
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1756
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1587
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1590
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1617
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1619
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:3787
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1775
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5867,14 +5782,14 @@ msgstr ""
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1809
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5889,19 +5804,19 @@ msgstr "個人資料網址"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2131
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2136
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -6042,8 +5957,8 @@ msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
@@ -6360,7 +6275,7 @@ msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
@@ -6371,7 +6286,7 @@ msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
@@ -6388,8 +6303,8 @@ msgstr "個人職銜"
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -6399,43 +6314,43 @@ msgstr "使用者ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「GroupWise」是軟件名稱，正式中文名大概不會是「群組」...
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6446,17 +6361,17 @@ msgstr ""
 "\n"
 "時間：%s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎？"
 
 # XXX 暫譯
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出，因為您已在其他電腦上登入。"
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6466,17 +6381,17 @@ msgstr "%s 目前似乎離線，所以不會收到您剛才送出的訊息。"
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6490,22 +6405,22 @@ msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6513,8 +6428,8 @@ msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6551,8 +6466,8 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM 協定模組"
 
@@ -6566,14 +6481,14 @@ msgstr "AIM 協定模組"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ 協定模組"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "編碼"
 
@@ -6729,8 +6644,8 @@ msgstr ""
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -6751,7 +6666,7 @@ msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:5919
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -6835,17 +6750,17 @@ msgid "Camera"
 msgstr "照相機"
 
 #: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "Not Available"
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5710
 msgid "Occupied"
 msgstr "忙碌"
 
@@ -6855,8 +6770,8 @@ msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
 #: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
 
@@ -6865,13 +6780,13 @@ msgid "Online"
 msgstr "上線"
 
 #: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:3688
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 位址"
 
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:2840
 msgid "Warning Level"
 msgstr "警告等級"
 
@@ -6921,14 +6836,14 @@ msgstr ""
 "並只含英文字母、數字及空白；或者只由數字組成。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
 #: ../libpurple/protocols/oscar/oscar.c:1334
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
@@ -6980,15 +6895,15 @@ msgstr "請輸入數碼顯示器所顯示的六位數字。"
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:2224
+#: ../libpurple/protocols/oscar/oscar.c:2271
+#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1472
+#: ../libpurple/protocols/oscar/oscar.c:1515
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6997,53 +6912,53 @@ msgstr ""
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1475
+#: ../libpurple/protocols/oscar/oscar.c:1518
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1604
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1607
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1633
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1689
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2194
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2222
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2263
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2269
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2397
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7053,17 +6968,17 @@ msgstr ""
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2398
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2405
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7076,7 +6991,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7089,7 +7004,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7102,38 +7017,38 @@ msgstr ""
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2450
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2456
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2546
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2555
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2564
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7143,21 +7058,21 @@ msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2573
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2582
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2591
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7165,74 +7080,70 @@ msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2746
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2751
+#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2817
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2749
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2813
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2816
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊："
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2845
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2850
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2855
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3175
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "速率限制錯誤。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3378
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7240,113 +7151,113 @@ msgstr ""
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3450
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3463
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3740
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3764
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3858
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3898
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3903
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3929
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3952
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3983
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3989
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7354,37 +7265,37 @@ msgid ""
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4187
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4432
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4433
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7393,22 +7304,22 @@ msgstr ""
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4447
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4452
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7419,11 +7330,11 @@ msgid_plural ""
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7434,17 +7345,17 @@ msgstr ""
 "文字母為開頭，同時由「英文字母」、「數字」和「空白」所組成，或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4573
+#: ../libpurple/protocols/oscar/oscar.c:4996
+#: ../libpurple/protocols/oscar/oscar.c:5010
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4677
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4678
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7452,16 +7363,16 @@ msgstr ""
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4882
+#: ../libpurple/protocols/oscar/oscar.c:4883
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5065
+#: ../libpurple/protocols/oscar/oscar.c:5070
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:4994
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7470,12 +7381,12 @@ msgstr ""
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5008
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5008
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7485,7 +7396,7 @@ msgstr ""
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7495,23 +7406,23 @@ msgstr ""
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5108
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5188
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5189
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5192
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7521,32 +7432,32 @@ msgstr ""
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5193
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5229
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5269
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5339
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5478
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7554,89 +7465,89 @@ msgstr " <i>(搜尋中)</i>"
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5683
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5791
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5792
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5839
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5843
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5898
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:5911
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5992
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5995
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6019
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6073
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6119
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6122
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7644,74 +7555,74 @@ msgstr ""
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6303
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6314
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6318
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6328
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6350
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6429
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6584
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7747,7 +7658,7 @@ msgstr ""
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "連線(_C)"
 
@@ -7914,93 +7825,99 @@ msgstr "修改好友資訊"
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "成功修改了您的好友資訊。"
 
-#  FIXME 這是很壞的譯文，無奈這是原文的錯 :P
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr "自訂的表情圖案暫時未獲支援，請自下列目錄選取圖案："
+"%s."
+msgstr "自訂的表情圖案暫時未獲支援，請自 %s 選取圖案。"
 
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "無效的 QQ 表情"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "請輸入原因："
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "拒絕"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "對不起，我和你合不來……"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "連同認證要求的新增好友失敗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "您成功移除了一個好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "您成功從一個好友的好友清單中移除了您自己"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "使用者 %d 需要認證"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "請輸入要求"
 
 # XXX - 20061026
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎？"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "送出"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "成功將 %d 加入好友清單"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid 錯誤"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "無效的 QQid"
 
@@ -8037,59 +7954,59 @@ msgstr "請輸入外部 Group ID"
 msgid "You can only search for permanent QQ groups\n"
 msgstr "您只可搜尋永久群組\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "原因：%s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "允許"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "管理人 %d 拒絕了您加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "管理人 %d 允許了您加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "群組「%2$d」新增了您 [%1$d]"
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "群組已新增至好友清單。"
 
@@ -8117,33 +8034,33 @@ msgstr "狀態不明"
 msgid "This group does not allow others to join"
 msgstr "這群組不容許外人加入"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "您成功離開群組"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ 群組認證"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "您確定要離開這個群 (Qun) 嗎？"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "確定"
 
@@ -8156,42 +8073,43 @@ msgstr "代碼 0x%02X：%s"
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "允許這個要求？"
 
 #  NOTE QQ「member」應是「成員」
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME 暫譯 ambrose 20070415
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "成功更改了群的資訊"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "成功建立了一個群 (Qun)"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "要立刻設定該群 (Qun) 的詳情嗎？"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "設定"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "系統訊息"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "伺服器回應"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "送出即時訊息失敗\n"
 
@@ -8210,11 +8128,11 @@ msgstr "無法登入，請檢查除錯記錄"
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8265,49 +8183,49 @@ msgid "Invalid name"
 msgstr "名稱無效"
 
 #  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間：</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "登入資訊"
 
@@ -8327,6 +8245,10 @@ msgstr "顯示登入資訊"
 msgid "Exit this QQ Qun"
 msgstr "離開這個 QQ 群 (Qun)"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "封鎖這個好友"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8337,15 +8259,15 @@ msgstr "離開這個 QQ 群 (Qun)"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "以 TCP 登入"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "以隱藏狀態登入"
 
@@ -8390,52 +8312,54 @@ msgstr "連線中斷"
 msgid "Login failed, no reply"
 msgstr "登入失敗，沒有回應"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "您想將這個使用者加入到您的好友名單中嗎？"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 已將您加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "您想將他（她）加入到您的好友清單嗎？"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "使用者「%s」允許了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s 想要將您（%s）加入他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "訊息：%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
 # FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "您要將他（她）加入您的好友清單嗎？"
 
@@ -8530,7 +8454,7 @@ msgstr "讀取 Socket 時發生錯誤；%s"
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
@@ -8547,54 +8471,54 @@ msgstr "會議室關閉"
 msgid "Unable to send message: "
 msgstr "無法送出訊息："
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX 暫譯
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "支援"
 
 #  XXX 怪
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "外部使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "請為新的會議室輸入一個主題，同時發出一個邀請訊息給%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "建立"
 
@@ -8626,25 +8550,25 @@ msgstr ""
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
 #  XXX 要覆查 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社群伺服器"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8654,39 +8578,39 @@ msgstr ""
 "入。"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知（0x%04x）<br>"
 
 #  XXX 要覆查
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "上次使用的用戶端程式（如已知）"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明的使用者 ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8695,16 +8619,16 @@ msgstr ""
 "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者，以便新增至好友清單"
 "內。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "選擇使用者"
 
 #  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者：找不到使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8713,11 +8637,11 @@ msgstr ""
 "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
 "除。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8726,63 +8650,63 @@ msgstr ""
 "讀取檔案 %s 發生錯誤；\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "好友清單存放於遠端"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組：群組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8792,26 +8716,26 @@ msgstr ""
 "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組，以加入您的好"
 "友清單。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組：找不到群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在您的 Sametime 社群中，並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5475
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8819,12 +8743,12 @@ msgstr ""
 "輸入 Notes 通訊錄群組名稱於欄位中，以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8834,66 +8758,66 @@ msgstr ""
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位，來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入（忽略伺服器重新導向）"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8939,19 +8863,19 @@ msgid "Key agreement cannot be started with yourself"
 msgstr "不可與自己交換密鑰"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "由 %s 收到一個交換密鑰要求，您想交換密鑰嗎？"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8962,49 +8886,49 @@ msgstr ""
 "遠端主機　：%s\n"
 "遠端通訊埠：%d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "交換密鑰要求"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "無法設定即時訊息密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -9013,18 +8937,18 @@ msgstr "無法載入公鑰"
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9033,196 +8957,196 @@ msgstr ""
 "鑰」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "要新增好友，必須匯入他（她）的公鑰。要匯入公鑰，請按「匯入」。"
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一公鑰。請從清單選擇正確的使用者，以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者，以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我！"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "機械人"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "開心"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "時區"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
@@ -9298,15 +9222,15 @@ msgstr "新增頻道公鑰"
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9319,135 +9243,135 @@ msgstr ""
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "新增／移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限；要清除使用者數目上限，輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前，您必須首先加入頻道 %s"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -9559,7 +9483,7 @@ msgid "Job Role"
 msgstr "職責"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "所屬機構"
 
@@ -9600,7 +9524,7 @@ msgid "_More..."
 msgstr "更多(_M)..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
@@ -9737,65 +9661,65 @@ msgstr "為連線進行驗證中"
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗：遠端不信任／不支援您的公鑰"
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗：遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗：遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗：遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗：遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗：遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "失敗：錯誤的簽章"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr "收到 %s 的公鑰，但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎？"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到 %s 的公鑰，接受這個公鑰嗎？"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9808,15 +9732,15 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "核實公鑰"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "檢視(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "不支援的公鑰類型"
 
@@ -9867,7 +9791,7 @@ msgstr "無法建立連結"
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "正常"
 
@@ -9934,174 +9858,174 @@ msgstr ""
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊，只須輸入您希望別"
 "人看得見的各項。"
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "密鑰對產生失敗"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "密鑰長度"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "私鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "產生密鑰對"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 密鑰對..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為：%s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令：%s（可能是客戶端的錯誤）"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]：離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]：離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]：加入一個在網路上的聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list：列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;：查看這個暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/silc/silc.c:1618
 #: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]：送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd：顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach：暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]：自伺服器離線，並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;：執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]：從網路上移除暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;：查看暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]：設定或顯示頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10109,15 +10033,15 @@ msgstr ""
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;：在指定頻道修改指定的暱稱的"
 "模式"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;：設定您在網路上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]：取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10125,37 +10049,37 @@ msgstr ""
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;：邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]：把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]：觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]：於指定的頻道禁止指定的用戶端"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;：取得用戶端或伺服器的公鑰"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats：觀看伺服器及網路的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping：向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;：列出頻道中的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10172,69 +10096,69 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "網路"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
 #  TODO 譯文有待改進，這是意譯
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
@@ -10353,26 +10277,26 @@ msgid "Could not write"
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1486
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10384,36 +10308,36 @@ msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -10638,32 +10562,32 @@ msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s 在呼叫您！"
 
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10672,11 +10596,11 @@ msgstr ""
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10686,11 +10610,11 @@ msgstr ""
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10699,70 +10623,70 @@ msgstr ""
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10770,91 +10694,92 @@ msgstr "走出去了"
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID？"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫！"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10868,57 +10793,57 @@ msgstr "doodle: 要求使用者開始 Doodle Session"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11254,16 +11179,16 @@ msgstr "由伺服器取得目前所在聊天室的清單"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -11273,11 +11198,11 @@ msgstr "TZC 指令"
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -11287,22 +11212,22 @@ msgstr "匯出至 .zephyr.subs 檔"
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr "域名"
 
 # FIXME 暫譯；譯得很差，有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -11344,18 +11269,18 @@ msgstr "無法解析主機"
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -11367,16 +11292,16 @@ msgid "I'm not here right now"
 msgstr "我現在不在位子上"
 
 # FIXME 這很明顯是誤譯，但想不到怎樣寫才對 - 20061025
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:231
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:673
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11385,12 +11310,12 @@ msgstr ""
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:678
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:682
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
@@ -11406,37 +11331,37 @@ msgstr "離線"
 msgid "Mobile"
 msgstr "使用行動裝置"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1288
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1305
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1371
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1373
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
@@ -11446,13 +11371,13 @@ msgstr "+++ %s 不再閒置"
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11460,79 +11385,79 @@ msgid ""
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:2980
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:2983
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3009
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3021
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3029
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3035
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3043
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3049
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3441
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3476
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3507
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -11559,59 +11484,59 @@ msgid "The orientation of the tray."
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:398
 msgid "Login Options"
 msgstr "登入選項"
 
 # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:500
 msgid "Local alias:"
 msgstr "帳號別名（只在本機生效）："
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:562
 msgid "User Options"
 msgstr "使用者自定選項"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:580
 msgid "Use this buddy icon for this account:"
 msgstr "使用下列好友圖示："
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:700
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:897
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:898
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」，但講國語「毋須」會不通順，「不使用」較好
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:904
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:910
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:916
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:922
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11620,60 +11545,60 @@ msgstr "使用環境變數設定"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:967
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:970
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:991
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1026
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1440
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1475
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1975
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2169
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11697,233 +11622,233 @@ msgstr ""
 
 # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:722
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:743
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1028
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1079
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1088
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1095
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1115
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1234
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1236
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1175
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1178
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1181
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1183
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1203
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1269
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
+#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4499
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2814
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2815
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2816
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2817
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2818
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2820
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2821
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2822
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2823
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2824
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2826
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2827
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2828
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2830
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2833
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2834 ../pidgin/gtkblist.c:6412
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2837
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2838
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2839
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2840
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2841
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2843
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2844
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2845
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2847
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2850
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2851
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2852
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2853
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2881
 #, c-format
 msgid ""
 "\n"
@@ -11932,132 +11857,128 @@ msgstr ""
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2959
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2980
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3026
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3046
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3048
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3050
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3375
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3377
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3514
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3515 ../pidgin/gtkblist.c:3548
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3516
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3517
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3518 ../pidgin/gtkblist.c:3551
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3519
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/工具/好友狀態捕捉"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3554
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3557
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3654 ../pidgin/gtkdocklet.c:156
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3731
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3733
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3734
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3735
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3937 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3947
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3968
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4121
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4128
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4139
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4224
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4238
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12075,23 +11996,23 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4483
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4486
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4492
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4495
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5333
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12100,66 +12021,66 @@ msgstr ""
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5393 ../pidgin/gtkblist.c:5754
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "群組："
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5652
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5668
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5709
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5792
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6432
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6456
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6469 ../pidgin/gtkconv.c:2900
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6477
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6489
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6495
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6544
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6614
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12199,12 +12120,12 @@ msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
@@ -12218,165 +12139,165 @@ msgstr "<h1>與 %s 的交談</h1>\n"
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1340
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1348
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1596
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思，故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1599
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1619
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1642
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2535
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2587
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2592
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2595
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2599
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2612
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2754
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2756
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2761
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2763
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2764
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2766
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2770
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2771
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2773
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2775
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2777
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2781
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2783
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2785
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2798
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2799
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2800
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2801
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2803
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2804
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12385,164 +12306,164 @@ msgstr "/交談/更多"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:2994
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3002
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3006
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3010
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3013
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3026
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3029
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3032
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3159
 msgid "User has typed something and stopped"
 msgstr "使用者輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3341
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4049
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4197
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6054
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6059
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6069
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7196
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7228
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7763
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7769
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7777
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7783
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8086
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8550
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8552
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8556
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8558
 msgid "By account"
 msgstr "依帳號"
 
@@ -12552,71 +12473,71 @@ msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:596
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:599
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令，指「工具列的按紐以圖示標示」，下二同
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:666
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:667
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:668
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:804
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:823
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:853
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:862
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」（因為已經有「Info」一項），而是一種比「Info」還要低層次的除錯訊息，應是指「Debug」
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:863
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:865
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:866
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:867
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "主要開發者"
 
@@ -12625,8 +12546,9 @@ msgstr "主要開發者"
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "開發者"
 
@@ -12634,160 +12556,160 @@ msgstr "開發者"
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:115
 msgid "Jabber developer"
 msgstr "Jabber 開發者"
 
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "原作者"
 
 #  NOTE 譯文完全不統一，依其他 open source project「慣例」（只有兩三個）譯成「南非荷蘭文」
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "孟加拉文"
 
 # NOTE 港譯「波斯尼亞」
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "波士尼亞文"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "加泰隆文"
 
 # NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "德文"
 
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "不丹文"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:147
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "法文"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "加里西亞文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
 msgstr "北印度文"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -12795,41 +12717,41 @@ msgstr "印尼文"
 #  NOTE 國語去聲不分陰陽，廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」，
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "意大利文"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "喬治亞文"
 
 # NOTE: 這是KDE譯法，也見於台灣某大學網站 :P
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "坎納達文"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE 台譯「庫德」，港譯「庫爾德」；但台灣政府也有用「庫爾德」，故「庫爾德」較好
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "庫爾德文"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -12838,125 +12760,126 @@ msgstr "馬其頓文"
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
 #  XXX 暫時譯成「挪威布克莫爾文」
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
 msgstr "挪威布克莫爾文"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  XXX 某大學論文譯法
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
 msgstr "巴斯多文 (Pashto)"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "斯洛伐克文"
-
 #  NOTE 港譯「斯洛文尼亞」，臺譯「斯洛維尼亞」。粵語「文」字為Ｍ起音，
 #  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
 #  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 港譯「泰米爾」
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
 msgstr "塔米爾文"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
 msgstr "特魯固文"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "港式中文"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # XXX Yahoo譯法
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:359
+#: ../pidgin/gtkdialogs.c:363
 #, c-format
 msgid ""
 "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
@@ -12975,53 +12898,53 @@ msgstr ""
 "「COPYING」的檔案之內。%s 係有版權的著作，版權歸全部貢獻者共同所有，貢獻者芳"
 "名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+#: ../pidgin/gtkdialogs.c:378
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgwin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:387
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
 # NOTE 不過，翻成「狂熱的模組作者」會比較好
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:402
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:417
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:432
 msgid "Artists"
 msgstr "美工人員"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:447
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:467
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:485
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:854
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:856
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13038,33 +12961,33 @@ msgid ""
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:968
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:969
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:991
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:993
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1054
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13080,32 +13003,32 @@ msgstr[1] ""
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1065
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1096
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1103
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1106
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1156
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13113,74 +13036,74 @@ msgid ""
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1159
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1162
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1195
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1198
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1201
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:153
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:454
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:506
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:532
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:547
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:554
 msgid "Blink on new message"
 msgstr "有新訊息時閃動"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:565
 msgid "Quit"
 msgstr "結束程式"
 
@@ -13267,7 +13190,7 @@ msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13277,11 +13200,11 @@ msgid "_Resume"
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
@@ -13314,7 +13237,7 @@ msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3202
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13325,7 +13248,7 @@ msgstr ""
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3205
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13335,7 +13258,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3218
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13346,7 +13269,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3221
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13357,11 +13280,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3341
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -13472,21 +13395,21 @@ msgid "Insert smiley"
 msgstr "插入表情"
 
 #  XXX 不通順 - ambrose 20070415
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，與 %1$s 交談的日誌？"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，在聊天室「%1$s」交談的日誌？"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13494,22 +13417,22 @@ msgid ""
 msgstr "您確定您要刪除由%s開始記錄的系統日誌？"
 
 #  NOTE 第一個 %s 是聊天室名稱，第二個 %s 是時間
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
 
 #  NOTE 第一個 %s 是聯絡人名稱，第二個 %s 是時間
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13517,51 +13440,51 @@ msgstr ""
 "只有在「記錄所有狀態改變至系統日誌」選項被啟動時，系統事件才會被記錄到系統日"
 "誌中。"
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "找不到日誌"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "瀏覽日誌目錄(_B)"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "全部日誌大小："
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13586,7 +13509,7 @@ msgstr ""
 "哪些帳號，並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:498
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13662,11 +13585,11 @@ msgstr "以下的模組將會被卸載。"
 msgid "Multiple plugins will be unloaded."
 msgstr "多個模組將會被卸載。"
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13677,7 +13600,7 @@ msgstr ""
 "<span weight=\"bold\">網站：</span>\t\t%s\n"
 "<span weight=\"bold\">檔名：</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13688,11 +13611,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
@@ -13701,95 +13624,95 @@ msgid "Select a file"
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:589
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:591
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:601
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
@@ -13818,7 +13741,7 @@ msgstr "系統工作匣圖示"
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S)："
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13837,7 +13760,7 @@ msgstr "隱藏即時訊息交談視窗"
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "離開期間"
 
@@ -14068,55 +13991,55 @@ msgstr "記錄所有狀態改變至系統日誌(_S)"
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1601
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "自動"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "指令"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14125,118 +14048,118 @@ msgstr ""
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "事件"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "測試"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "重置"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M)："
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "音效"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
@@ -14273,7 +14196,7 @@ msgstr "隱私設定將立刻生效。"
 msgid "Set privacy for:"
 msgstr "帳號："
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "許可使用者"
 
@@ -14285,38 +14208,38 @@ msgstr "輸入您所許可聯絡您的使用者。"
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您？"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎？"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s？"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s？"
@@ -14325,23 +14248,23 @@ msgstr "您確定要拒絕 %s？"
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -14365,38 +14288,38 @@ msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "您確定您要刪除被選取的狀態？"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。您必須選取一個唯一的標題。"
 
 # TODO - 這個有點不妥，但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "狀態(_S)："
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "狀態：%s"
@@ -14449,7 +14372,7 @@ msgstr "GStreamer 錯誤"
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
@@ -14462,24 +14385,24 @@ msgstr "載入 %s 時發生以下錯誤：%s"
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1419
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1420
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr "%s 沒有辦法傳送目錄。您需要個別傳送檔案"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1453
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14487,23 +14410,23 @@ msgstr ""
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1465
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1472
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14511,7 +14434,7 @@ msgstr ""
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1474
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14524,17 +14447,17 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1532
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2302
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14545,59 +14468,59 @@ msgstr ""
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2592
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2594
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2595
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2695
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」，原因不明，大概是影像檔已損壞"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:83
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:85
 msgid "Close _tabs"
 msgstr "關閉分頁(_T)"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:88
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:89
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:90
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
@@ -14620,7 +14543,7 @@ msgid "Maximum response timeout:"
 msgstr "好友作出回覆的時間上限："
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
@@ -14712,20 +14635,20 @@ msgstr "個別帳號的得分值"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "讓你自定各個好友狀態的得分值。"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14802,56 +14725,25 @@ msgstr "依交談個數放置新交談時，以不同的視窗顯示即時訊息
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:141
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:143
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差，請改良 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:145
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr "限制視窗可容之交談數目，亦可選擇以不同的視窗顯示即時訊息和聊天"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin 範例模組"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "範例模組————請看介紹。"
-
-# NOTE 譯文更動 by Ambrose
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"這是一個很有趣的模組，它具有下列的功能：\n"
-"- 它可以在您登入的時候，告訴您是誰寫了這個程式\n"
-"- 它會將所有收到的訊息左右掉轉\n"
-"- 它會在您的好友登入時，立刻送出一個訊息給他們"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14876,19 +14768,19 @@ msgstr "顯示動作路徑(_V)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "滑鼠動作"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "提供滑鼠動作的支援"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14991,7 +14883,7 @@ msgstr "請選擇新增好友至那幾個帳號。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15002,8 +14894,8 @@ msgstr "Evolution 整合"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15162,12 +15054,12 @@ msgstr "套用(_A)"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15256,7 +15148,7 @@ msgstr "當視窗標籤被點選後移除通知(_B)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "訊息通知"
 
@@ -15264,10 +15156,41 @@ msgstr "訊息通知"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin 範例模組"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "範例模組————請看介紹。"
+
+# NOTE 譯文更動 by Ambrose
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"這是一個很有趣的模組，它具有下列的功能：\n"
+"- 它可以在您登入的時候，告訴您是誰寫了這個程式\n"
+"- 它會將所有收到的訊息左右掉轉\n"
+"- 它會在您的好友登入時，立刻送出一個訊息給他們"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "游標顏色"
@@ -15360,11 +15283,11 @@ msgstr "將設定寫入%s%sgtkrc-2.0"
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:622
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -15501,11 +15424,11 @@ msgstr "一般文字取代選項"
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -15527,7 +15450,7 @@ msgstr "好友跑馬燈"
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "時間戳記顯示頻率"
 
@@ -15537,19 +15460,19 @@ msgstr "時間戳記顯示頻率"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "時間戳記"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "顯示 iChat 式的時間戳記"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "每隔 N 分鐘顯示 iChat 風格的時間戳記。"
 
@@ -15591,19 +15514,19 @@ msgstr "訊息日誌(_M)："
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:150
 msgid "Message Timestamp Formats"
 msgstr "訊息時間戳記格式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:153
 msgid "Customizes the message timestamp formats."
 msgstr "使用者自定的訊息時間戳記格式。"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:155
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15657,19 +15580,19 @@ msgstr "取得輸入焦點時移除好友清單視窗透明度"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15712,18 +15635,18 @@ msgstr "只在停駐時生效"
 msgid "_Flash window when chat messages are received"
 msgstr "收到聊天訊息後閃動視窗(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgwin 選項"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows 版 Pidgin 選項"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
-msgstr "Windows Pidgin 的相關選項。"
+msgstr "Windows 版 Pidgin 的相關選項。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "提供 Windows Pidgin 的相關選項，例如好友清單的停駐功能。"
+msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15774,6 +15697,105 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "..."
+#~ msgstr "..."
+
+#  XXX 這是指模組既沒有設定任何選項，也沒有指明自己是沒有選項的
+#~ msgid "Still need to do something about this."
+#~ msgstr "此模組尚未完成。"
+
+#~ msgid "Autoreply"
+#~ msgstr "自動回覆"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "適用於所有通訊協定的自動回覆"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆，只需在這"
+#~ "模組的選項視窗設定即可；為個別好友設定自動回覆，請在好友清單中以滑鼠右鍵點"
+#~ "擊該個好友；為您的個別帳戶設定自動回覆，請在這模組的選項視窗按「進階」按"
+#~ "紐。"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "設定自動回覆給 %s 的訊息"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "設定自動回覆訊息"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "當自動回覆功能啟動後，每當好友給您送出訊息時，下列訊息將被自動送出："
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "設定自動回覆訊息(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "自動回覆訊息"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "何時發出自動回覆"
+
+#~ msgid "When my account is _away"
+#~ msgstr "當我的帳號是在「離開」狀態時(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "當我的帳號是在「閒置」狀態時(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "預設回覆訊息(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "狀態訊息"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "以狀態訊息作為自動回覆"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "每當設定了狀態訊息時"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "只在沒有設定自動回覆訊息時"
+
+#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
+#  NOTE: (23:41:12) elb: wing: it is the latter
+#~ msgid "Delay between autoreplies"
+#~ msgstr "自動回覆之間的相隔時間"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "相隔時間下限（分）(_M)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "送出自動回覆訊息的次數"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "次數上限 (_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "我現在不在位子上。請您留下您的訊息，當我回來的時候，我將儘快給您回覆。"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "沒有提供密碼，伺服器無法為你進行認證"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "速率限制錯誤。"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/工具/好友狀態捕捉"
+
+#~ msgid "Slovack"
+#~ msgstr "斯洛伐克文"
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim 網路即時通"