changeset 16758:728785ce47b7

merge of 'b7add4f0aed4d53f564e4fde2227f70a42923e31' and 'e1b5587c60bb1114d53830a9e89abefde6df6c5b'
author Luke Schierer <lschiere@pidgin.im>
date Tue, 01 May 2007 14:19:44 +0000
parents 1ac4039a2634 (current diff) c80d9dc41240 (diff)
children 70d1df2eafeb
files pidgin.spec.in po/zh_CN.po
diffstat 28 files changed, 8916 insertions(+), 8041 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/perl/Makefile.am	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Tue May 01 14:19:44 2007 +0000
@@ -73,9 +73,9 @@
 	common/Util.xs \
 	common/XMLNode.xs \
 	common/module.h \
-	common/typemap \
-	common/fallback/const-c.inc \
-	common/fallback/const-xs.inc
+	common/typemap
+#	common/fallback/const-c.inc \
+#	common/fallback/const-xs.inc
 
 EXTRA_DIST = \
 	Makefile.mingw \
@@ -139,7 +139,7 @@
 	done
 
 	@rm -f Makefile
-	@rm -f common/const-c.inc common/const-xs.inc
+#	@rm -f common/const-c.inc common/const-xs.inc
 
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
--- a/libpurple/plugins/perl/common/BuddyList.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/BuddyList.xs	Tue May 01 14:19:44 2007 +0000
@@ -4,6 +4,26 @@
 MODULE = Purple::BuddyList  PACKAGE = Purple  PREFIX = purple_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::BuddyList::Node", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_BLIST_##name##_NODE}
+		const_iv(GROUP),
+		const_iv(CONTACT),
+		const_iv(BUDDY),
+		const_iv(CHAT),
+		const_iv(OTHER),
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_BLIST_NODE_FLAG_##name}
+		const_iv(NO_SAVE),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 Purple::BuddyList
 purple_get_blist()
 
@@ -30,15 +50,18 @@
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::BuddyList::Buddy")));
 	}
 
+Purple::BuddyList::Group
+purple_find_group(name)
+	const char *name
+
+MODULE = Purple::BuddyList  PACKAGE = Purple::Find  PREFIX = purple_
+PROTOTYPES: ENABLE
+
 gboolean
 purple_group_on_account(group, account)
 	Purple::BuddyList::Group  group
 	Purple::Account account
 
-Purple::BuddyList::Group
-purple_find_group(name)
-	const char *name
-
 MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList::Contact  PREFIX = purple_contact_
 PROTOTYPES: ENABLE
 
--- a/libpurple/plugins/perl/common/Cmds.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Cmds.xs	Tue May 01 14:19:44 2007 +0000
@@ -4,6 +4,63 @@
 MODULE = Purple::Cmd  PACKAGE = Purple::Cmd  PREFIX = purple_cmd_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *status_stash = gv_stashpv("Purple::Cmd::Status", 1);
+	HV *ret_stash = gv_stashpv("Purple::Cmd::Return", 1);
+	HV *p_stash = gv_stashpv("Purple::Cmd::Priority", 1);
+	HV *flag_stash = gv_stashpv("Purple::Cmd::Flag", 1);
+
+	static const constiv *civ, status_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_CMD_STATUS_##name}
+		const_iv(OK),
+		const_iv(FAILED),
+		const_iv(NOT_FOUND),
+		const_iv(WRONG_ARGS),
+		const_iv(WRONG_PRPL),
+		const_iv(WRONG_TYPE),
+	};
+	static const constiv ret_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_CMD_RET_##name}
+		const_iv(OK),
+		const_iv(FAILED),
+		const_iv(CONTINUE),
+	};
+	static const constiv p_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_CMD_P_##name}
+		const_iv(VERY_LOW),
+		const_iv(LOW),
+		const_iv(DEFAULT),
+		const_iv(PRPL),
+		const_iv(PLUGIN),
+		const_iv(ALIAS),
+		const_iv(HIGH),
+		const_iv(VERY_HIGH),
+	};
+	static const constiv flag_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_CMD_FLAG_##name}
+		const_iv(IM),
+		const_iv(CHAT),
+		const_iv(PRPL_ONLY),
+		const_iv(ALLOW_WRONG_ARGS),
+	};
+
+	for (civ = status_const_iv + sizeof(status_const_iv) / sizeof(status_const_iv[0]); civ-- > status_const_iv;)
+		newCONSTSUB(status_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = ret_const_iv + sizeof(ret_const_iv) / sizeof(ret_const_iv[0]); civ-- > ret_const_iv;)
+		newCONSTSUB(ret_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = p_const_iv + sizeof(p_const_iv) / sizeof(p_const_iv[0]); civ-- > p_const_iv;)
+		newCONSTSUB(p_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = flag_const_iv + sizeof(flag_const_iv) / sizeof(flag_const_iv[0]); civ-- > flag_const_iv;)
+		newCONSTSUB(flag_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_cmd_help(conv, command)
 	Purple::Conversation conv
--- a/libpurple/plugins/perl/common/Connection.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Connection.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,21 @@
 MODULE = Purple::Connection  PACKAGE = Purple::Connection  PREFIX = purple_connection_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::Connection::State", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_##name}
+		const_iv(DISCONNECTED),
+		const_iv(CONNECTED),
+		const_iv(CONNECTING),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 Purple::Account
 purple_connection_get_account(gc)
 	Purple::Connection gc
--- a/libpurple/plugins/perl/common/Conversation.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Conversation.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,93 @@
 MODULE = Purple::Conversation  PACKAGE = Purple  PREFIX = purple_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *type_stash = gv_stashpv("Purple::Conversation::Type", 1);
+	HV *update_stash = gv_stashpv("Purple::Conversation::Update::Type", 1);
+	HV *typing_stash = gv_stashpv("Purple::Conversation::TypingState", 1);
+	HV *flags_stash = gv_stashpv("Purple::Conversation::Flags", 1);
+	HV *cbflags_stash = gv_stashpv("Purple::Conversation::ChatBuddy::Flags", 1);
+
+	static const constiv *civ, type_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_CONV_TYPE_##name}
+		const_iv(UNKNOWN),
+		const_iv(IM),
+		const_iv(CHAT),
+		const_iv(MISC),
+		const_iv(ANY),
+	};
+	static const constiv update_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_CONV_UPDATE_##name}
+		const_iv(ADD),
+		const_iv(REMOVE),
+		const_iv(ACCOUNT),
+		const_iv(TYPING),
+		const_iv(UNSEEN),
+		const_iv(LOGGING),
+		const_iv(TOPIC),
+/*
+		const_iv(ONLINE),
+		const_iv(OFFLINE),
+*/
+		const_iv(AWAY),
+		const_iv(ICON),
+		const_iv(TITLE),
+		const_iv(CHATLEFT),
+		const_iv(FEATURES),
+	};
+	static const constiv typing_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_##name}
+		const_iv(NOT_TYPING),
+		const_iv(TYPING),
+		const_iv(TYPED),
+	};
+	static const constiv flags_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_MESSAGE_##name}
+		const_iv(SEND),
+		const_iv(RECV),
+		const_iv(SYSTEM),
+		const_iv(AUTO_RESP),
+		const_iv(ACTIVE_ONLY),
+		const_iv(NICK),
+		const_iv(NO_LOG),
+		const_iv(WHISPER),
+		const_iv(ERROR),
+		const_iv(DELAYED),
+		const_iv(RAW),
+		const_iv(IMAGES),
+		const_iv(NOTIFY),
+	};
+	static const constiv cbflags_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_CBFLAGS_##name}
+		const_iv(NONE),
+		const_iv(VOICE),
+		const_iv(HALFOP),
+		const_iv(OP),
+		const_iv(FOUNDER),
+		const_iv(TYPING),
+	};
+
+	for (civ = type_const_iv + sizeof(type_const_iv) / sizeof(type_const_iv[0]); civ-- > type_const_iv; )
+		newCONSTSUB(type_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = update_const_iv + sizeof(update_const_iv) / sizeof(update_const_iv[0]); civ-- > update_const_iv; )
+		newCONSTSUB(update_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = typing_const_iv + sizeof(typing_const_iv) / sizeof(typing_const_iv[0]); civ-- > typing_const_iv; )
+		newCONSTSUB(typing_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = flags_const_iv + sizeof(flags_const_iv) / sizeof(flags_const_iv[0]); civ-- > flags_const_iv; )
+		newCONSTSUB(flags_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = cbflags_const_iv + sizeof(cbflags_const_iv) / sizeof(cbflags_const_iv[0]); civ-- > cbflags_const_iv; )
+		newCONSTSUB(cbflags_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_get_ims()
 PREINIT:
--- a/libpurple/plugins/perl/common/Debug.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Debug.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,24 @@
 MODULE = Purple::Debug  PACKAGE = Purple::Debug  PREFIX = purple_debug_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::Debug", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_DEBUG_##name}
+		const_iv(ALL),
+		const_iv(MISC),
+		const_iv(INFO),
+		const_iv(WARNING),
+		const_iv(ERROR),
+		const_iv(FATAL),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_debug(level, category, string)
 	Purple::DebugLevel level
--- a/libpurple/plugins/perl/common/FT.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/FT.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,36 @@
 MODULE = Purple::Xfer  PACKAGE = Purple::Xfer  PREFIX = purple_xfer_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *type_stash = gv_stashpv("Purple::Xfer::Type", 1);
+	HV *status_stash = gv_stashpv("Purple::Xfer::Status", 1);
+
+	static const constiv *civ, type_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_XFER_##name}
+		const_iv(UNKNOWN),
+		const_iv(SEND),
+		const_iv(RECEIVE),
+	};
+	static const constiv status_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_XFER_STATUS_##name}
+		const_iv(UNKNOWN),
+		const_iv(NOT_STARTED),
+		const_iv(ACCEPTED),
+		const_iv(STARTED),
+		const_iv(DONE),
+		const_iv(CANCEL_LOCAL),
+		const_iv(CANCEL_REMOTE),
+	};
+
+	for (civ = type_const_iv + sizeof(type_const_iv) / sizeof(type_const_iv[0]); civ-- > type_const_iv; )
+		newCONSTSUB(type_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = status_const_iv + sizeof(status_const_iv) / sizeof(status_const_iv[0]); civ-- > status_const_iv; )
+		newCONSTSUB(status_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 Purple::Xfer
 purple_xfer_new(class, account, type, who)
 	Purple::Account account
--- a/libpurple/plugins/perl/common/Log.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Log.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,30 @@
 MODULE = Purple::Log  PACKAGE = Purple::Log  PREFIX = purple_log_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *type_stash = gv_stashpv("Purple::Log::Type", 1);
+	HV *flags_stash = gv_stashpv("Purple::Log:ReadFlags::", 1);
+
+	static const constiv *civ, type_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_LOG_##name}
+		const_iv(IM),
+		const_iv(CHAT),
+		const_iv(SYSTEM),
+	};
+	static const constiv flags_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_LOG_READ_##name}
+		const_iv(NO_NEWLINE),
+	};
+
+	for (civ = type_const_iv + sizeof(type_const_iv) / sizeof(type_const_iv[0]); civ-- > type_const_iv; )
+		newCONSTSUB(type_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = flags_const_iv + sizeof(flags_const_iv) / sizeof(flags_const_iv[0]); civ-- > flags_const_iv; )
+		newCONSTSUB(flags_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 int
 purple_log_common_sizer(log)
 	Purple::Log log
--- a/libpurple/plugins/perl/common/Makefile.PL.in	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.PL.in	Tue May 01 14:19:44 2007 +0000
@@ -14,26 +14,3 @@
     'OBJECT'            => '$(O_FILES)', # link all the C files too
 #    'OPTIMIZE'          => '-g', # For debugging
 );
-
-if (eval {require ExtUtils::Constant; 1}) {
-	foreach (qw(PURPLE_DEBUG_ALL PURPLE_DEBUG_MISC PURPLE_DEBUG_INFO
-	            PURPLE_DEBUG_WARNING PURPLE_DEBUG_ERROR PURPLE_DEBUG_FATAL)) {
-		push @names, {name => $_, type => "IV", macro => 1};
-	}
-
-	ExtUtils::Constant::WriteConstants(
-		NAME    => 'Purple::DebugLevel',
-		NAMES   => \@names,
-		C_FILE  => 'const-c.inc',
-		XS_FILE => 'const-xs.inc'
-	);
-}
-else {
-	use File::Copy;
-	use File::Spec;
-
-	foreach my $file ('const-c.inc', 'const-xs.inc') {
-		my $fallback = File::Spec->catfile('fallback', $file);
-		copy ($fallback, $file) or die "Can't copy $fallback to $file: $!";
-	}
-}
--- a/libpurple/plugins/perl/common/Makefile.mingw	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Tue May 01 14:19:44 2007 +0000
@@ -68,7 +68,7 @@
 				Util.xs \
 				XMLNode.xs
 
-FALLBACKS =	const-c.inc const-xs.inc
+#FALLBACKS =	const-c.inc const-xs.inc
 C_FILES = $(XS_FILES:%.xs=%.c)
 OBJECTS = $(C_FILES:%.c=%.o)
 
--- a/libpurple/plugins/perl/common/Notify.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Notify.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,47 @@
 MODULE = Purple::Notify  PACKAGE = Purple::Notify  PREFIX = purple_notify_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *type_stash = gv_stashpv("Purple::Notify::Type", 1);
+	HV *msg_type_stash = gv_stashpv("Purple::Notify:Msg", 1);
+	HV *user_info_stash = gv_stashpv("Purple::NotifyUserInfo::Type", 1);
+
+	static const constiv *civ, type_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_NOTIFY_##name}
+		const_iv(MESSAGE),
+		const_iv(EMAIL),
+		const_iv(EMAILS),
+		const_iv(FORMATTED),
+		const_iv(SEARCHRESULTS),
+		const_iv(USERINFO),
+		const_iv(URI),
+	};
+	static const constiv msg_type_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_NOTIFY_MSG_##name}
+		const_iv(ERROR),
+		const_iv(WARNING),
+		const_iv(INFO),
+	};
+	static const constiv user_info_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_NOTIFY_USER_INFO_ENTRY_##name}
+		const_iv(PAIR),
+		const_iv(SECTION_BREAK),
+		const_iv(SECTION_HEADER),
+	};
+
+	for (civ = type_const_iv + sizeof(type_const_iv) / sizeof(type_const_iv[0]); civ-- > type_const_iv; )
+		newCONSTSUB(type_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = msg_type_const_iv + sizeof(msg_type_const_iv) / sizeof(msg_type_const_iv[0]); civ-- > msg_type_const_iv; )
+		newCONSTSUB(msg_type_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = user_info_const_iv + sizeof(user_info_const_iv) / sizeof(user_info_const_iv[0]); civ-- > user_info_const_iv; )
+		newCONSTSUB(user_info_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_notify_close(type, ui_handle)
 	Purple::NotifyType type
@@ -52,8 +93,44 @@
 	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
+Purple::NotifyUiOps
+purple_notify_get_ui_ops()
+
+void
+purple_notify_set_ui_ops(ops)
+	Purple::NotifyUiOps ops
+
+void *
+purple_notify_message(handle, type, title, primary, secondary, cb, user_data)
+	void * handle
+	Purple::NotifyMsgType type
+	const char *title
+	const char *primary
+	const char *secondary
+	Purple::NotifyCloseCallback cb
+	gpointer user_data
+
+void *
+purple_notify_searchresults(gc, title, primary, secondary, results, cb, user_data)
+	Purple::Connection gc
+	const char *title
+	const char *primary
+	const char *secondary
+	Purple::NotifySearchResults results
+	Purple::NotifyCloseCallback cb
+	gpointer user_data
+
+void *
+purple_notify_uri(handle, uri)
+	void * handle
+	const char *uri
+
+MODULE = Purple::Notify  PACKAGE = Purple::NotifyUserInfo  PREFIX = purple_notify_user_info_
+PROTOTYPES: ENABLE
+
 Purple::NotifyUserInfo
-purple_notify_user_info_new()
+purple_notify_user_info_new(class)
+	C_ARGS: /* void */
 
 void
 purple_notify_user_info_destroy(user_info)
@@ -102,37 +179,3 @@
 gchar *
 purple_notify_user_info_entry_get_value(user_info_entry)
 	Purple::NotifyUserInfoEntry user_info_entry
-
-Purple::NotifyUiOps
-purple_notify_get_ui_ops()
-
-
-void *
-purple_notify_message(handle, type, title, primary, secondary, cb, user_data)
-	void * handle
-	Purple::NotifyMsgType type
-	const char *title
-	const char *primary
-	const char *secondary
-	Purple::NotifyCloseCallback cb
-	gpointer user_data
-
-void *
-purple_notify_searchresults(gc, title, primary, secondary, results, cb, user_data)
-	Purple::Connection gc
-	const char *title
-	const char *primary
-	const char *secondary
-	Purple::NotifySearchResults results
-	Purple::NotifyCloseCallback cb
-	gpointer user_data
-
-void
-purple_notify_set_ui_ops(ops)
-	Purple::NotifyUiOps ops
-
-void *
-purple_notify_uri(handle, uri)
-	void * handle
-	const char *uri
-
--- a/libpurple/plugins/perl/common/Plugin.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Plugin.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,22 @@
 MODULE = Purple::Plugin  PACKAGE = Purple::Plugin  PREFIX = purple_plugin_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::Plugin::Type", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_PLUGIN_##name}
+		const_iv(UNKNOWN),
+		const_iv(STANDARD),
+		const_iv(LOADER),
+		const_iv(PROTOCOL),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 Purple::Plugin
 purple_plugin_new(native, path)
 	gboolean native
--- a/libpurple/plugins/perl/common/PluginPref.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/PluginPref.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,33 @@
 MODULE = Purple::PluginPref  PACKAGE = Purple::PluginPref::Frame  PREFIX = purple_plugin_pref_frame_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *string_format_stash = gv_stashpv("Purple::String::Format::Type", 1);
+	HV *plugin_pref_stash = gv_stashpv("Purple::PluginPref::Type", 1);
+
+	static const constiv *civ, string_format_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_STRING_FORMAT_TYPE_##name}
+		const_iv(NONE),
+		const_iv(MULTILINE),
+		const_iv(HTML),
+	};
+	static const constiv plugin_pref_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_PLUGIN_PREF_##name}
+		const_iv(NONE),
+		const_iv(CHOICE),
+		const_iv(INFO),
+		const_iv(STRING_FORMAT),
+	};
+
+	for (civ = string_format_const_iv + sizeof(string_format_const_iv) / sizeof(string_format_const_iv[0]); civ-- > string_format_const_iv; )
+		newCONSTSUB(string_format_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = plugin_pref_const_iv + sizeof(plugin_pref_const_iv) / sizeof(plugin_pref_const_iv[0]); civ-- > plugin_pref_const_iv; )
+		newCONSTSUB(plugin_pref_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_plugin_pref_frame_add(frame, pref)
 	Purple::PluginPref::Frame frame
--- a/libpurple/plugins/perl/common/Pounce.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Pounce.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,39 @@
 MODULE = Purple::Pounce  PACKAGE = Purple::Pounce  PREFIX = purple_pounce_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *event_stash = gv_stashpv("Purple::Pounce::Event", 1);
+	HV *option_stash = gv_stashpv("Purple::Pounce::Option", 1);
+
+	static const constiv *civ, event_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_POUNCE_##name}
+		const_iv(NONE),
+		const_iv(SIGNON),
+		const_iv(SIGNOFF),
+		const_iv(AWAY),
+		const_iv(AWAY_RETURN),
+		const_iv(IDLE),
+		const_iv(IDLE_RETURN),
+		const_iv(TYPING),
+		const_iv(TYPED),
+		const_iv(TYPING_STOPPED),
+		const_iv(MESSAGE_RECEIVED),
+	};
+	static const constiv option_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_POUNCE_OPTION_##name}
+		const_iv(NONE),
+		const_iv(AWAY),
+	};
+
+	for (civ = event_const_iv + sizeof(event_const_iv) / sizeof(event_const_iv[0]); civ-- > event_const_iv; )
+		newCONSTSUB(event_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = option_const_iv + sizeof(option_const_iv) / sizeof(option_const_iv[0]); civ-- > option_const_iv; )
+		newCONSTSUB(option_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_pounce_action_register(pounce, name)
 	Purple::Pounce pounce
--- a/libpurple/plugins/perl/common/Prefs.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Prefs.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,25 @@
 MODULE = Purple::Prefs  PACKAGE = Purple::Prefs  PREFIX = purple_prefs_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::Pref::Type", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_PREF_##name}
+		const_iv(NONE),
+		const_iv(BOOLEAN),
+		const_iv(INT),
+		const_iv(STRING),
+		const_iv(STRING_LIST),
+		const_iv(PATH),
+		const_iv(PATH_LIST),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_prefs_add_bool(name, value)
 	const char *name
--- a/libpurple/plugins/perl/common/Proxy.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Proxy.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,13 +3,34 @@
 MODULE = Purple::Proxy  PACKAGE = Purple::Proxy  PREFIX = purple_proxy_
 PROTOTYPES: ENABLE
 
-Purple::ProxyInfo
-purple_global_proxy_get_info()
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::ProxyType::", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_PROXY_##name}
+		const_iv(USE_GLOBAL),
+		const_iv(NONE),
+		const_iv(HTTP),
+		const_iv(SOCKS4),
+		const_iv(SOCKS5),
+		const_iv(USE_ENVVAR),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
 
 Purple::Handle
 purple_proxy_get_handle()
 
 void
+purple_proxy_init()
+
+MODULE = Purple::Proxy  PACKAGE = Purple::ProxyInfo  PREFIX = purple_proxy_info_
+PROTOTYPES: ENABLE
+
+void
 purple_proxy_info_destroy(info)
 	Purple::ProxyInfo info
 
@@ -61,5 +82,8 @@
 	Purple::ProxyInfo info
 	const char *username
 
-void
-purple_proxy_init()
+MODULE = Purple::Proxy  PACKAGE = Purple::Proxy  PREFIX = purple_
+PROTOTYPES: ENABLE
+
+Purple::ProxyInfo
+purple_global_proxy_get_info()
--- a/libpurple/plugins/perl/common/Purple.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Purple.xs	Tue May 01 14:19:44 2007 +0000
@@ -1,6 +1,5 @@
 #include "module.h"
 #include "../perl-handlers.h"
-#include "const-c.inc"
 
 /* Prototypes for the BOOT section below. */
 PURPLE_PERL_BOOT_PROTO(Account);
@@ -40,8 +39,6 @@
 MODULE = Purple PACKAGE = Purple PREFIX = purple_
 PROTOTYPES: ENABLE
 
-INCLUDE: const-xs.inc
-
 BOOT:
 	PURPLE_PERL_BOOT(Account);
 	PURPLE_PERL_BOOT(Account__Option);
--- a/libpurple/plugins/perl/common/Request.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Request.xs	Tue May 01 14:19:44 2007 +0000
@@ -80,6 +80,41 @@
 MODULE = Purple::Request  PACKAGE = Purple::Request  PREFIX = purple_request_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *request_stash = gv_stashpv("Purple::RequestType", 1);
+	HV *request_field_stash = gv_stashpv("Purple::RequestFieldType", 1);
+
+	static const constiv *civ, request_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_REQUEST_##name}
+		const_iv(INPUT),
+		const_iv(CHOICE),
+		const_iv(ACTION),
+		const_iv(FIELDS),
+		const_iv(FILE),
+		const_iv(FOLDER),
+	};
+	static const constiv request_field_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_REQUEST_FIELD_##name}
+		const_iv(NONE),
+		const_iv(STRING),
+		const_iv(INTEGER),
+		const_iv(BOOLEAN),
+		const_iv(CHOICE),
+		const_iv(LIST),
+		const_iv(LABEL),
+		const_iv(IMAGE),
+		const_iv(ACCOUNT),
+	};
+
+	for (civ = request_const_iv + sizeof(request_const_iv) / sizeof(request_const_iv[0]); civ-- > request_const_iv; )
+		newCONSTSUB(request_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = request_field_const_iv + sizeof(request_field_const_iv) / sizeof(request_field_const_iv[0]); civ-- > request_field_const_iv; )
+		newCONSTSUB(request_field_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void *
 purple_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb, cancel_text, cancel_cb)
 	Purple::Plugin handle
@@ -170,9 +205,22 @@
 purple_request_close_with_handle(handle)
 	void * handle
 
+Purple::Request::UiOps
+purple_request_get_ui_ops()
+
+void
+purple_request_set_ui_ops(ops)
+	Purple::Request::UiOps ops
+
 MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
 PROTOTYPES: ENABLE
 
+Purple::Request::Field
+purple_request_field_account_new(id, text, account = NULL)
+	const char *id
+	const char *text
+	Purple::Account account
+
 Purple::Account
 purple_request_field_account_get_default_value(field)
 	Purple::Request::Field field
@@ -193,12 +241,6 @@
 purple_request_field_account_get_value(field)
 	Purple::Request::Field field
 
-Purple::Request::Field
-purple_request_field_account_new(id, text, account = NULL)
-	const char *id
-	const char *text
-	Purple::Account account
-
 void
 purple_request_field_account_set_default_value(field, default_value)
 	Purple::Request::Field field
@@ -214,6 +256,15 @@
 	Purple::Request::Field field
 	Purple::Account value
 
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
+
+Purple::Request::Field
+purple_request_field_bool_new(id, text, default_value = TRUE)
+	const char *id
+	const char *text
+	gboolean default_value
+
 gboolean
 purple_request_field_bool_get_default_value(field)
 	Purple::Request::Field field
@@ -222,12 +273,6 @@
 purple_request_field_bool_get_value(field)
 	Purple::Request::Field field
 
-Purple::Request::Field
-purple_request_field_bool_new(id, text, default_value = TRUE)
-	const char *id
-	const char *text
-	gboolean default_value
-
 void
 purple_request_field_bool_set_default_value(field, default_value)
 	Purple::Request::Field field
@@ -238,6 +283,15 @@
 	Purple::Request::Field field
 	gboolean value
 
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
+
+Purple::Request::Field
+purple_request_field_choice_new(id, text, default_value = 0)
+	const char *id
+	const char *text
+	int default_value
+
 void
 purple_request_field_choice_add(field, label)
 	Purple::Request::Field field
@@ -261,12 +315,6 @@
 purple_request_field_choice_get_value(field)
 	Purple::Request::Field field
 
-Purple::Request::Field
-purple_request_field_choice_new(id, text, default_value = 0)
-	const char *id
-	const char *text
-	int default_value
-
 void
 purple_request_field_choice_set_default_value(field, default_value)
 	Purple::Request::Field field
@@ -277,25 +325,14 @@
 	Purple::Request::Field field
 	int value
 
-void
-purple_request_field_destroy(field)
-	Purple::Request::Field field
-
-const char *
-purple_request_field_get_id(field)
-	Purple::Request::Field field
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
 
-const char *
-purple_request_field_get_label(field)
-	Purple::Request::Field field
-
-Purple::RequestFieldType
-purple_request_field_get_type(field)
-	Purple::Request::Field field
-
-const char *
-purple_request_field_get_type_hint(field)
-	Purple::Request::Field field
+Purple::Request::Field
+purple_request_field_int_new(id, text, default_value = 0)
+	const char *id
+	const char *text
+	int default_value
 
 int
 purple_request_field_int_get_default_value(field)
@@ -305,12 +342,6 @@
 purple_request_field_int_get_value(field)
 	Purple::Request::Field field
 
-Purple::Request::Field
-purple_request_field_int_new(id, text, default_value = 0)
-	const char *id
-	const char *text
-	int default_value
-
 void
 purple_request_field_int_set_default_value(field, default_value)
 	Purple::Request::Field field
@@ -325,15 +356,22 @@
 purple_request_field_is_required(field)
 	Purple::Request::Field field
 
-gboolean
-purple_request_field_is_visible(field)
-	Purple::Request::Field field
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
 
 Purple::Request::Field
 purple_request_field_label_new(id, text)
 	const char *id
 	const char *text
 
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
+
+Purple::Request::Field
+purple_request_field_list_new(id, text)
+	const char *id
+	const char *text
+
 void
 purple_request_field_list_add(field, item, data)
 	Purple::Request::Field field
@@ -383,16 +421,14 @@
 	Purple::Request::Field field
 	const char *item
 
-Purple::Request::Field
-purple_request_field_list_new(id, text)
-	const char *id
-	const char *text
-
 void
 purple_request_field_list_set_multi_select(field, multi_select)
 	Purple::Request::Field field
 	gboolean multi_select
 
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
+
 Purple::Request::Field
 purple_request_field_new(id, text, type)
 	const char *id
@@ -419,6 +455,16 @@
 	Purple::Request::Field field
 	gboolean visible
 
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
+
+Purple::Request::Field
+purple_request_field_string_new(id, text, default_value, multiline)
+	const char *id
+	const char *text
+	const char *default_value
+	gboolean multiline
+
 const char *
 purple_request_field_string_get_default_value(field)
 	Purple::Request::Field field
@@ -439,13 +485,6 @@
 purple_request_field_string_is_multiline(field)
 	Purple::Request::Field field
 
-Purple::Request::Field
-purple_request_field_string_new(id, text, default_value, multiline)
-	const char *id
-	const char *text
-	const char *default_value
-	gboolean multiline
-
 void
 purple_request_field_string_set_default_value(field, default_value)
 	Purple::Request::Field field
@@ -466,13 +505,6 @@
 	Purple::Request::Field field
 	const char *value
 
-Purple::Request::UiOps
-purple_request_get_ui_ops()
-
-void
-purple_request_set_ui_ops(ops)
-	Purple::Request::UiOps ops
-
 MODULE = Purple::Request  PACKAGE = Purple::Request::Field::Group  PREFIX = purple_request_field_group_
 PROTOTYPES: ENABLE
 
@@ -503,9 +535,39 @@
 purple_request_field_group_new(title)
 	const char *title
 
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
+PROTOTYPES: ENABLE
+
+void
+purple_request_field_destroy(field)
+	Purple::Request::Field field
+
+const char *
+purple_request_field_get_id(field)
+	Purple::Request::Field field
+
+const char *
+purple_request_field_get_label(field)
+	Purple::Request::Field field
+
+Purple::RequestFieldType
+purple_request_field_get_type(field)
+	Purple::Request::Field field
+
+const char *
+purple_request_field_get_type_hint(field)
+	Purple::Request::Field field
+
+gboolean
+purple_request_field_is_visible(field)
+	Purple::Request::Field field
+
 MODULE = Purple::Request  PACKAGE = Purple::Request::Fields  PREFIX = purple_request_fields_
 PROTOTYPES: ENABLE
 
+Purple::Request::Fields
+purple_request_fields_new()
+
 void
 purple_request_fields_add_group(fields, group)
 	Purple::Request::Fields fields
@@ -578,6 +640,3 @@
 purple_request_fields_is_field_required(fields, id)
 	Purple::Request::Fields fields
 	const char *id
-
-Purple::Request::Fields
-purple_request_fields_new()
--- a/libpurple/plugins/perl/common/Roomlist.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Roomlist.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,31 @@
 MODULE = Purple::Roomlist  PACKAGE = Purple::Roomlist  PREFIX = purple_roomlist_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *room_stash = gv_stashpv("Purple::Roomlist::Room::Type", 1);
+	HV *field_stash = gv_stashpv("Purple::Roomlist::Field::Type", 1);
+
+	static const constiv *civ, room_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_ROOMLIST_ROOMTYPE_##name}
+		const_iv(CATEGORY),
+		const_iv(ROOM),
+	};
+	static const constiv field_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_ROOMLIST_FIELD_##name}
+		const_iv(BOOL),
+		const_iv(INT),
+		const_iv(STRING),
+	};
+
+	for (civ = room_const_iv + sizeof(room_const_iv) / sizeof(room_const_iv[0]); civ-- > room_const_iv; )
+		newCONSTSUB(room_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = field_const_iv + sizeof(field_const_iv) / sizeof(field_const_iv[0]); civ-- > field_const_iv; )
+		newCONSTSUB(field_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void 
 purple_roomlist_cancel_get_list(list)
 	Purple::Roomlist list
--- a/libpurple/plugins/perl/common/Sound.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Sound.xs	Tue May 01 14:19:44 2007 +0000
@@ -3,6 +3,29 @@
 MODULE = Purple::Sound  PACKAGE = Purple::Sound  PREFIX = purple_sound_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *stash = gv_stashpv("Purple::SoundEventID", 1);
+
+	static const constiv *civ, const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_SOUND_##name}
+		const_iv(BUDDY_ARRIVE),
+		const_iv(BUDDY_LEAVE),
+		const_iv(RECEIVE),
+		const_iv(FIRST_RECEIVE),
+		const_iv(SEND),
+		const_iv(CHAT_JOIN),
+		const_iv(CHAT_LEAVE),
+		const_iv(CHAT_YOU_SAY),
+		const_iv(CHAT_SAY),
+		const_iv(POUNCE_DEFAULT),
+		const_iv(CHAT_NICK),
+	};
+
+	for (civ = const_iv + sizeof(const_iv) / sizeof(const_iv[0]); civ-- > const_iv; )
+		newCONSTSUB(stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 Purple::Sound::UiOps
 purple_sound_get_ui_ops()
 
--- a/libpurple/plugins/perl/common/Status.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Status.xs	Tue May 01 14:19:44 2007 +0000
@@ -42,6 +42,38 @@
 MODULE = Purple::Status  PACKAGE = Purple::Presence  PREFIX = purple_presence_
 PROTOTYPES: ENABLE
 
+BOOT:
+{
+	HV *context_stash = gv_stashpv("Purple::Presence::Context", 1);
+	HV *primitive_stash = gv_stashpv("Purple::Status::Primitive", 1);
+
+	static const constiv *civ, context_const_iv[] = {
+#define const_iv(name) {#name, (IV)PURPLE_PRESENCE_CONTEXT_##name}
+		const_iv(UNSET),
+		const_iv(ACCOUNT),
+		const_iv(CONV),
+		const_iv(BUDDY),
+	};
+	static const constiv primitive_const_iv[] = {
+#undef const_iv
+#define const_iv(name) {#name, (IV)PURPLE_STATUS_##name}
+		const_iv(UNSET),
+		const_iv(OFFLINE),
+		const_iv(AVAILABLE),
+		const_iv(UNAVAILABLE),
+		const_iv(INVISIBLE),
+		const_iv(AWAY),
+		const_iv(EXTENDED_AWAY),
+		const_iv(MOBILE),
+	};
+
+	for (civ = context_const_iv + sizeof(context_const_iv) / sizeof(context_const_iv[0]); civ-- > context_const_iv; )
+		newCONSTSUB(context_stash, (char *)civ->name, newSViv(civ->iv));
+
+	for (civ = primitive_const_iv + sizeof(primitive_const_iv) / sizeof(primitive_const_iv[0]); civ-- > primitive_const_iv; )
+		newCONSTSUB(primitive_stash, (char *)civ->name, newSViv(civ->iv));
+}
+
 void
 purple_presence_add_list(presence, source_list)
 	Purple::Presence presence
--- a/libpurple/plugins/perl/common/Util.xs	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/Util.xs	Tue May 01 14:19:44 2007 +0000
@@ -28,44 +28,11 @@
 MODULE = Purple::Util  PACKAGE = Purple::Util  PREFIX = purple_
 PROTOTYPES: ENABLE
 
-void
-purple_util_fetch_url(handle, url, full, user_agent, http11, cb)
-	Purple::Plugin handle
-	const char *url
-	gboolean full
-	const char *user_agent
-	gboolean http11
-	SV * cb
-CODE:
-	PurplePerlUrlData *gpr;
-	STRLEN len;
-	char *basename;
-
-	basename = g_path_get_basename(handle->path);
-	purple_perl_normalize_script_name(basename);
-	gpr = g_new(PurplePerlUrlData, 1);
-
-	gpr->cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cb, len));
-	g_free(basename);
-	purple_util_fetch_url(url, full, user_agent, http11, purple_perl_util_url_cb, gpr);
-
 int
 purple_build_dir(path, mode)
 	const char *path
 	int mode
 
-const char *
-purple_date_format_full(tm)
-	const struct tm *tm
-
-const char *
-purple_date_format_long(tm)
-	const struct tm *tm
-
-const char *
-purple_date_format_short(tm)
-	const struct tm *tm
-
 gboolean
 purple_email_is_valid(address)
 	const char *address
@@ -82,53 +49,6 @@
 purple_home_dir()
 
 gboolean
-purple_markup_extract_info_field(str, len, user_info, start_token, skip, end_token, check_value, no_value_token, display_name, is_link, link_prefix, format_cb)
-	const char *str
-	int len
-	Purple::NotifyUserInfo user_info
-	const char *start_token
-	int skip
-	const char *end_token
-	char check_value
-	const char *no_value_token
-	const char *display_name
-	gboolean is_link
-	const char *link_prefix
-	Purple::Util::InfoFieldFormatCallback format_cb
-
-gboolean
-purple_markup_find_tag(needle, haystack, start, end, attributes)
-	const char *needle
-	const char *haystack
-	const char **start
-	const char **end
-	GData **attributes
-
-gchar_own *
-purple_markup_get_tag_name(tag)
-	const char *tag
-
-void
-purple_markup_html_to_xhtml(html, dest_xhtml, dest_plain)
-	const char *html
-	char **dest_xhtml
-	char **dest_plain
-
-gchar_own *
-purple_markup_linkify(str)
-	const char *str
-
-gchar_own *
-purple_markup_slice(str, x, y)
-	const char *str
-	guint x
-	guint y
-
-gchar_own *
-purple_markup_strip_html(str)
-	const char *str
-
-gboolean
 purple_message_meify(message, len)
 	char *message
 	size_t len
@@ -148,46 +68,6 @@
 	const char *program
 
 gchar_own *
-purple_str_add_cr(str)
-	const char *str
-
-gchar_own *
-purple_str_binary_to_ascii(binary, len)
-	const unsigned char *binary
-	guint len
-
-gboolean
-purple_str_has_prefix(s, p)
-	const char *s
-	const char *p
-
-gboolean
-purple_str_has_suffix(s, x)
-	const char *s
-	const char *x
-
-gchar_own *
-purple_str_seconds_to_string(sec)
-	guint sec
-
-gchar_own *
-purple_str_size_to_units(size)
-	size_t size
-
-void
-purple_str_strip_char(str, thechar)
-	char *str
-	char thechar
-
-time_t
-purple_str_to_time(timestamp, utc = FALSE, tm = NULL, tz_off = NULL, rest = NULL)
-	const char *timestamp
-	gboolean utc
-	struct tm *tm
-	long *tz_off
-	const char **rest
-
-gchar_own *
 purple_strcasereplace(string, delimiter, replacement)
 	const char *string
 	const char *delimiter
@@ -256,6 +136,138 @@
 const char *
 purple_utf8_strftime(const char *format, const struct tm *tm);
 
+MODULE = Purple::Util  PACKAGE = Purple::Util::Str  PREFIX = purple_str_
+PROTOTYPES: ENABLE
+
+gchar_own *
+purple_str_add_cr(str)
+	const char *str
+
+gchar_own *
+purple_str_binary_to_ascii(binary, len)
+	const unsigned char *binary
+	guint len
+
+gboolean
+purple_str_has_prefix(s, p)
+	const char *s
+	const char *p
+
+gboolean
+purple_str_has_suffix(s, x)
+	const char *s
+	const char *x
+
+gchar_own *
+purple_str_seconds_to_string(sec)
+	guint sec
+
+gchar_own *
+purple_str_size_to_units(size)
+	size_t size
+
+void
+purple_str_strip_char(str, thechar)
+	char *str
+	char thechar
+
+time_t
+purple_str_to_time(timestamp, utc = FALSE, tm = NULL, tz_off = NULL, rest = NULL)
+	const char *timestamp
+	gboolean utc
+	struct tm *tm
+	long *tz_off
+	const char **rest
+
+MODULE = Purple::Util  PACKAGE = Purple::Util::Date  PREFIX = purple_date_
+PROTOTYPES: ENABLE
+
+const char *
+purple_date_format_full(tm)
+	const struct tm *tm
+
+const char *
+purple_date_format_long(tm)
+	const struct tm *tm
+
+const char *
+purple_date_format_short(tm)
+	const struct tm *tm
+
+MODULE = Purple::Util  PACKAGE = Purple::Util::Markup  PREFIX = purple_markup_
+PROTOTYPES: ENABLE
+
+gboolean
+purple_markup_extract_info_field(str, len, user_info, start_token, skip, end_token, check_value, no_value_token, display_name, is_link, link_prefix, format_cb)
+	const char *str
+	int len
+	Purple::NotifyUserInfo user_info
+	const char *start_token
+	int skip
+	const char *end_token
+	char check_value
+	const char *no_value_token
+	const char *display_name
+	gboolean is_link
+	const char *link_prefix
+	Purple::Util::InfoFieldFormatCallback format_cb
+
+gboolean
+purple_markup_find_tag(needle, haystack, start, end, attributes)
+	const char *needle
+	const char *haystack
+	const char **start
+	const char **end
+	GData **attributes
+
+gchar_own *
+purple_markup_get_tag_name(tag)
+	const char *tag
+
+void
+purple_markup_html_to_xhtml(html, dest_xhtml, dest_plain)
+	const char *html
+	char **dest_xhtml
+	char **dest_plain
+
+gchar_own *
+purple_markup_linkify(str)
+	const char *str
+
+gchar_own *
+purple_markup_slice(str, x, y)
+	const char *str
+	guint x
+	guint y
+
+gchar_own *
+purple_markup_strip_html(str)
+	const char *str
+
+MODULE = Purple::Util  PACKAGE = Purple::Util  PREFIX = purple_util_
+PROTOTYPES: ENABLE
+
+void
+purple_util_fetch_url(handle, url, full, user_agent, http11, cb)
+	Purple::Plugin handle
+	const char *url
+	gboolean full
+	const char *user_agent
+	gboolean http11
+	SV * cb
+CODE:
+	PurplePerlUrlData *gpr;
+	STRLEN len;
+	char *basename;
+
+	basename = g_path_get_basename(handle->path);
+	purple_perl_normalize_script_name(basename);
+	gpr = g_new(PurplePerlUrlData, 1);
+
+	gpr->cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cb, len));
+	g_free(basename);
+	purple_util_fetch_url(url, full, user_agent, http11, purple_perl_util_url_cb, gpr);
+
 void
 purple_util_set_user_dir(dir)
 	const char *dir
--- a/libpurple/plugins/perl/common/module.h	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/plugins/perl/common/module.h	Tue May 01 14:19:44 2007 +0000
@@ -276,3 +276,7 @@
 
 typedef gchar gchar_own;
 
+typedef struct _constiv {
+	const char *name;
+	IV iv;
+} constiv;
--- a/libpurple/server.c	Tue May 01 14:11:35 2007 +0000
+++ b/libpurple/server.c	Tue May 01 14:19:44 2007 +0000
@@ -20,6 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
+/* This file is the fullcrap */
+
 #include "internal.h"
 #include "blist.h"
 #include "conversation.h"
--- a/pidgin.spec.in	Tue May 01 14:11:35 2007 +0000
+++ b/pidgin.spec.in	Tue May 01 14:19:44 2007 +0000
@@ -229,10 +229,9 @@
 # Delete files that we don't want to put in any of the RPMs
 rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple/liboscar.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple/libjabber.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple/private/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
@@ -291,9 +290,11 @@
 %pre
 if [ "$1" -gt 1 -a -n "`which gconftool-2 2>/dev/null`" ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
+    if [ -f %{_sysconfdir}/gconf/schemas/purple.schemas ]; then
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
+        killall -HUP gconfd-2 || :
+    fi
 fi
 
 %post
@@ -303,6 +304,8 @@
         %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
     killall -HUP gconfd-2 || :
 fi
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %post -n libpurple -p /sbin/ldconfig
 
@@ -316,6 +319,10 @@
     killall -HUP gconfd-2 || :
 fi
 
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %postun -n libpurple -p /sbin/ldconfig
 
 %postun -n finch -p /sbin/ldconfig
@@ -433,6 +440,11 @@
 %endif
 
 %changelog
+* Tue May  1 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Run gtk-update-icon-cache on installation/uninstallation
+- Guard against errors when upgrading from Gaim/Pidgin 1.5.x which had
+  no schemas file
+
 * Sun Apr 29 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Update to reflect perl Purple::GtkUI -> Pidgin change
 
--- a/pidgin/gtkmain.c	Tue May 01 14:11:35 2007 +0000
+++ b/pidgin/gtkmain.c	Tue May 01 14:19:44 2007 +0000
@@ -318,6 +318,7 @@
 	pidgin_xfers_init();
 	pidgin_roomlist_init();
 	pidgin_log_init();
+	pidgin_docklet_init();
 }
 
 static void
@@ -745,7 +746,6 @@
 
 	/* load plugins we had when we quit */
 	purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded");
-	pidgin_docklet_init();
 
 	/* TODO: Move pounces loading into purple_pounces_init() */
 	purple_pounces_load();
--- a/pidgin/plugins/perl/common/GtkFt.xs	Tue May 01 14:11:35 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkFt.xs	Tue May 01 14:19:44 2007 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Pidgin::Xfer  PACKAGE = Pidgin::Xfer  PREFIX = pidgin_xfer_
+MODULE = Pidgin::Xfer  PACKAGE = Pidgin::Xfer  PREFIX = pidgin_
 PROTOTYPES: ENABLE
 
 void
--- a/po/zh_CN.po	Tue May 01 14:11:35 2007 +0000
+++ b/po/zh_CN.po	Tue May 01 14:19:44 2007 +0000
@@ -1,14 +1,14 @@
-# gaim 软件包的简体中文翻译。
-# Copyright (C) 2003 gaim team.
-# This file is distributed under the same license as the gaim package.
+# pidgin 软件包的简体中文翻译。
+# Copyright (C) 2003 pidgin team.
+# This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gaim HEAD\n"
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-08 00:00-0500\n"
-"PO-Revision-Date: 2007-02-17 16:17+0800\n"
+"POT-Creation-Date: 2007-04-09 08:32-0400\n"
+"PO-Revision-Date: 2007-05-01 13:46+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -16,678 +16,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim 互联网通讯程序"
-
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "互联网通讯程序"
-
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "通过多种协议发送即时消息"
-
-#: ../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
-msgid "Error"
-msgstr "出错"
-
-#: ../console/gntaccount.c:119
-msgid "Account was not added"
-msgstr "账户未添加"
-
-#: ../console/gntaccount.c:120
-msgid "Screenname of an account must be non-empty."
-msgstr "账户的用户名必须非空。"
-
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
-msgid "New mail notifications"
-msgstr "新邮件通知"
-
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
-msgid "Remember password"
-msgstr "记住密码"
-
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
-msgid "Modify Account"
-msgstr "修改账户"
-
-#: ../console/gntaccount.c:474
-msgid "New Account"
-msgstr "新建账户"
-
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/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
-msgid "Screen name:"
-msgstr "用户名:"
-
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
-msgid "Password:"
-msgstr "密码:"
-
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
-msgid "Alias:"
-msgstr "别名:"
-
-#. 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
-msgid "Cancel"
-msgstr "取消"
-
-#. 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
-msgid "Save"
-msgstr "保存"
-
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/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
-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
-msgid "Delete"
-msgstr "删除"
-
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
-msgid "Accounts"
-msgstr "账户"
-
-#: ../console/gntaccount.c:650
-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
-msgid "Add"
-msgstr "添加"
-
-#: ../console/gntaccount.c:677
-msgid "Modify"
-msgstr "修改"
-
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
-#, 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
-msgid "Add buddy to your list?"
-msgstr "将用户加为好友吗?"
-
-#: ../console/gntblist.c:264
-msgid "You must provide a screename for the buddy."
-msgstr "您必须提供好友的用户名。"
-
-#: ../console/gntblist.c:266
-msgid "You must provide a group."
-msgstr "您必须提供组。"
-
-#: ../console/gntblist.c:268
-msgid "You must select an account."
-msgstr "您必须选择账户。"
-
-#: ../console/gntblist.c:272
-msgid "Error adding buddy"
-msgstr "添加好友出错"
-
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
-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
-msgid "Alias"
-msgstr "别名"
-
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
-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
-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
-msgid "Add Buddy"
-msgstr "添加好友"
-
-#: ../console/gntblist.c:312
-msgid "Please enter buddy information."
-msgstr "请输入好友信息。"
-
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
-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
-msgid "Name"
-msgstr "名称"
-
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
-msgid "Add Chat"
-msgstr "添加聊天"
-
-#: ../console/gntblist.c:379
-msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-msgid "Error adding group"
-msgstr "添加组出错"
-
-#: ../console/gntblist.c:391
-msgid "You must give a name for the group to add."
-msgstr "您必须给出要添加的组名称。"
-
-#: ../console/gntblist.c:404
-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
-msgid "Add Group"
-msgstr "添加组"
-
-#: ../console/gntblist.c:411
-msgid "Enter the name of the group"
-msgstr "请输入组名称"
-
-#: ../console/gntblist.c:736
-msgid "Edit Chat"
-msgstr "编辑聊天"
-
-#: ../console/gntblist.c:736
-msgid "Please Update the necessary fields."
-msgstr "请更新必要的字段。"
-
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
-msgid "Edit"
-msgstr "编辑"
-
-#: ../console/gntblist.c:751
-msgid "Auto-join"
-msgstr "自动加入"
-
-#: ../console/gntblist.c:760
-msgid "Edit Settings"
-msgstr "编辑设置"
-
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "信息"
-
-#: ../console/gntblist.c:811
-msgid "Add Buddy Pounce"
-msgstr "添加好友千里眼"
-
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
-msgid "Send File"
-msgstr "发送文件"
-
-#: ../console/gntblist.c:822
-msgid "View Log"
-msgstr "查看日志"
-
-#: ../console/gntblist.c:902
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "请输入 %s 的新名称"
-
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
-msgid "Rename"
-msgstr "重命名"
-
-#: ../console/gntblist.c:904
-msgid "Enter empty string to reset the name."
-msgstr "输入空字符串可重置名称。"
-
-#: ../console/gntblist.c:977
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "删除此联系人也将删除该联系人中的全部好友"
-
-#: ../console/gntblist.c:985
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr "删除此组也将删除该组中的全部好友"
-
-#: ../console/gntblist.c:990
-#, 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
-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
-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
-msgid "Buddy List"
-msgstr "好友列表"
-
-#: ../console/gntblist.c:1123
-#, fuzzy
-msgid "Place tagged"
-msgstr "已取消"
-
-#: ../console/gntblist.c:1128
-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
-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
-msgid "Idle"
-msgstr "发呆"
-
-#: ../console/gntblist.c:1270
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"在线: %d\n"
-"总计: %d"
-
-#: ../console/gntblist.c:1279
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "账户:%s(%s)"
-
-#: ../console/gntblist.c:1291
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"上次看见:%s前"
-
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
-msgid "New..."
-msgstr "新建..."
-
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
-msgid "Saved..."
-msgstr "已存..."
-
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
-msgid "Plugins"
-msgstr "插件"
-
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
-msgid "_Name"
-msgstr "名称(_N)"
-
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
-msgid "_Account"
-msgstr "账户(_A)"
-
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
-msgid "New Instant Message"
-msgstr "新即时消息"
-
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
-
-#: ../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
-msgid "OK"
-msgstr "确定"
-
-#. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
-msgid "Options"
-msgstr "选项"
-
-#: ../console/gntblist.c:2045
-msgid "Send IM..."
-msgstr "发送消息..."
-
-#: ../console/gntblist.c:2049
-msgid "Toggle offline buddies"
-msgstr "切换离线好友"
-
-#: ../console/gntblist.c:2053
-msgid "Sort by status"
-msgstr "按状态排序"
-
-#: ../console/gntblist.c:2057
-msgid "Sort alphabetically"
-msgstr "按字母序排序"
-
-#: ../console/gntblist.c:2061
-msgid "Sort by log size"
-msgstr "按日志大小排序"
-
-#: ../console/gntconn.c:36
-#, c-format
-msgid "%s (%s)"
-msgstr "%s(%s)"
-
-#: ../console/gntconn.c:39
-#, c-format
-msgid "%s disconnected."
-msgstr "%s 已断开连接。"
-
-#: ../console/gntconn.c:40
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"由于下列错误 %s 已经断开:\n"
-"%s"
-
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: ../console/gntconv.c:102
-msgid "No such command."
-msgstr "没有这样的命令。"
-
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "系统错误: 您给命令传送的参数个数不对。"
-
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
-msgid "Your command failed for an unknown reason."
-msgstr "您的命令失败,原因未知。"
-
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
-msgid "That command only works in chats, not IMs."
-msgstr "该命令只在聊天中可用,对话中无效。"
-
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
-msgid "That command only works in IMs, not chats."
-msgstr "该命令只在对话中可用,聊天中无效。"
-
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
-msgid "That command doesn't work on this protocol."
-msgstr "命令无法在此协议下工作。"
-
-#: ../console/gntconv.c:130
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "命令尚未支持。消息未送出。"
-
-#: ../console/gntconv.c:232
-#, c-format
-msgid "%s (%s -- %s)"
-msgstr "%s (%s -- %s)"
-
-#: ../console/gntconv.c:255
-#, c-format
-msgid "%s [%s]"
-msgstr "%s [%s]"
-
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
-#, c-format
-msgid ""
-"\n"
-"%s is typing..."
-msgstr "\n%s 正在打字..."
-
-#: ../console/gntconv.c:399
-msgid "<AUTO-REPLY> "
-msgstr "<自动回复> "
-
-#. Print the list of users in the room
-#: ../console/gntconv.c:501
-msgid "List of users:\n"
-msgstr "用户列表:\n"
-
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
-msgid "Supported debug options are:  version"
-msgstr "支持的调试选项有: version"
-
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
-msgid "No such command (in this context)."
-msgstr "没有这样的命令(在此环境中)。"
-
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
-"此环境下可使用下列命令:\n"
-
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
-
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
-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
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
-
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: 清除对话回滚。"
-
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
-
-#: ../console/gntconv.c:719
-msgid "plugins: Show the plugins window."
-msgstr "plugins: 显示插件窗口。"
-
-#: ../console/gntconv.c:722
-msgid "buddylist: Show the buddylist."
-msgstr "buddylist: 显示好友列表。"
-
-#: ../console/gntconv.c:725
-msgid "accounts: Show the accounts window."
-msgstr ""
-
-#: ../console/gntconv.c:728
-msgid "debugwin: Show the debug window."
-msgstr ""
-
-#: ../console/gntconv.c:731
-msgid "prefs: Show the preference window."
-msgstr ""
-
-#: ../console/gntconv.c:734
-msgid "statuses: Show the savedstatuses window."
-msgstr ""
-
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
-msgid "Debug Window"
-msgstr "调试窗口"
-
-#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
-#. * 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
-msgid "Clear"
-msgstr "清除"
-
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
-msgid "Pause"
-msgstr "暂停"
-
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "时间戳"
-
-#: ../console/gntgaim.c:227
+#: ../finch/finch.c:229
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。试试“%s -h”查看帮助。\n"
 
-#: ../console/gntgaim.c:229
+#: ../finch/finch.c:231
 #, c-format
 msgid ""
 "%s\n"
@@ -708,74 +42,878 @@
 "  -n, --nologin       不自动登入\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: ../console/gntnotify.c:146
+#: ../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 "出错"
+
+#: ../finch/gntaccount.c:119
+msgid "Account was not added"
+msgstr "账户未添加"
+
+#: ../finch/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "账户的用户名必须非空。"
+
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+msgid "New mail notifications"
+msgstr "新邮件通知"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+msgid "Remember password"
+msgstr "记住密码"
+
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
+#: ../pidgin/gtkblist.c:3891
+msgid "Modify Account"
+msgstr "修改账户"
+
+#: ../finch/gntaccount.c:474
+msgid "New Account"
+msgstr "新建账户"
+
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "协议:"
+
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
+#: ../pidgin/gtkblist.c:5293
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "用户名:"
+
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+msgid "Password:"
+msgstr "密码:"
+
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
+#: ../pidgin/gtkblist.c:5677
+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
+#: ../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 "取消"
+
+#. 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
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "保存"
+
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../pidgin/gtksavedstatuses.c:328
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: ../finch/gntaccount.c:614
+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
+msgid "Delete"
+msgstr "删除"
+
+#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+msgid "Accounts"
+msgstr "账户"
+
+#: ../finch/gntaccount.c:650
+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
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "添加"
+
+#. Modify button
+#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+msgid "Modify"
+msgstr "修改"
+
+#: ../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 已经将 %s 加为好友%s%s"
+
+#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+msgid "Add buddy to your list?"
+msgstr "将用户加为好友吗?"
+
+#: ../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 想要将 %s 添加为好友%s%s"
+
+#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
+#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+msgid "Authorize buddy?"
+msgstr "同意吗?"
+
+#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
+#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+msgid "Authorize"
+msgstr "同意"
+
+#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
+#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+msgid "Deny"
+msgstr "拒绝"
+
+#: ../finch/gntblist.c:266
+msgid "You must provide a screename for the buddy."
+msgstr "您必须提供好友的用户名。"
+
+#: ../finch/gntblist.c:268
+msgid "You must provide a group."
+msgstr "您必须提供组。"
+
+#: ../finch/gntblist.c:270
+msgid "You must select an account."
+msgstr "您必须选择账户。"
+
+#: ../finch/gntblist.c:274
+msgid "Error adding buddy"
+msgstr "添加好友出错"
+
+#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
+#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+msgid "Screen Name"
+msgstr "用户名"
+
+#: ../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 "别名"
+
+#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+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
+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
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+msgid "Add Buddy"
+msgstr "添加好友"
+
+#: ../finch/gntblist.c:315
+msgid "Please enter buddy information."
+msgstr "请输入好友信息。"
+
+#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+msgid "Chats"
+msgstr "聊天"
+
+#. 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
+#: ../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
+msgid "Add Chat"
+msgstr "添加聊天"
+
+#: ../finch/gntblist.c:382
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+msgid "Error adding group"
+msgstr "添加组出错"
+
+#: ../finch/gntblist.c:394
+msgid "You must give a name for the group to add."
+msgstr "您必须给出要添加的组名称。"
+
+#: ../finch/gntblist.c:407
+msgid "A group with the name already exists."
+msgstr "已存在同名组。"
+
+#: ../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 "添加组"
+
+#: ../finch/gntblist.c:414
+msgid "Enter the name of the group"
+msgstr "请输入组名称"
+
+#: ../finch/gntblist.c:739
+msgid "Edit Chat"
+msgstr "编辑聊天"
+
+#: ../finch/gntblist.c:739
+msgid "Please Update the necessary fields."
+msgstr "请更新必要的字段。"
+
+#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+msgid "Edit"
+msgstr "编辑"
+
+#: ../finch/gntblist.c:754
+msgid "Auto-join"
+msgstr "自动加入"
+
+#: ../finch/gntblist.c:763
+msgid "Edit Settings"
+msgstr "编辑设置"
+
+#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "信息"
+
+#: ../finch/gntblist.c:831
+msgid "Add Buddy Pounce"
+msgstr "添加好友千里眼"
+
+#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#: ../pidgin/gtkconv.c:1599
+msgid "Send File"
+msgstr "发送文件"
+
+#: ../finch/gntblist.c:842
+msgid "View Log"
+msgstr "查看日志"
+
+#: ../finch/gntblist.c:922
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "请输入 %s 的新名称"
+
+#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+msgid "Rename"
+msgstr "重命名"
+
+#: ../finch/gntblist.c:924
+msgid "Enter empty string to reset the name."
+msgstr "输入空字符串可重置名称。"
+
+#: ../finch/gntblist.c:997
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "删除此联系人也将删除该联系人中的全部好友"
+
+#: ../finch/gntblist.c:1005
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "删除此组也将删除该组中的全部好友"
+
+#: ../finch/gntblist.c:1010
+#, 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
+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
+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
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "好友列表"
+
+#: ../finch/gntblist.c:1143
+#, fuzzy
+msgid "Place tagged"
+msgstr "已取消"
+
+#: ../finch/gntblist.c:1148
+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
+#: ../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 "昵称"
+
+#. Idle stuff
+#: ../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 "发呆"
+
+#: ../finch/gntblist.c:1290
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"在线: %d\n"
+"总计: %d"
+
+#: ../finch/gntblist.c:1299
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "账户:%s(%s)"
+
+#: ../finch/gntblist.c:1311
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"上次看见:%s前"
+
+#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
+#: ../pidgin/gtkstatusbox.c:1102
+msgid "New..."
+msgstr "新建..."
+
+#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
+#: ../pidgin/gtkstatusbox.c:1103
+msgid "Saved..."
+msgstr "已存..."
+
+#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+msgid "Plugins"
+msgstr "插件"
+
+#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+msgid "_Name"
+msgstr "名称(_N)"
+
+#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+msgid "_Account"
+msgstr "账户(_A)"
+
+#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+msgid "New Instant Message"
+msgstr "新即时消息"
+
+#: ../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 "您想要跟谁聊?请输入他/她的用户名或别名。"
+
+#: ../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 "确定"
+
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+msgid "Options"
+msgstr "选项"
+
+#: ../finch/gntblist.c:2073
+msgid "Send IM..."
+msgstr "发送消息..."
+
+#: ../finch/gntblist.c:2077
+msgid "Toggle offline buddies"
+msgstr "切换离线好友"
+
+#: ../finch/gntblist.c:2083
+msgid "Sort by status"
+msgstr "按状态排序"
+
+#: ../finch/gntblist.c:2087
+msgid "Sort alphabetically"
+msgstr "按字母序排序"
+
+#: ../finch/gntblist.c:2091
+msgid "Sort by log size"
+msgstr "按日志大小排序"
+
+#: ../finch/gntconn.c:38
+#, c-format
+msgid "%s (%s)"
+msgstr "%s(%s)"
+
+#: ../finch/gntconn.c:41
+#, c-format
+msgid "%s disconnected."
+msgstr "%s 已断开连接。"
+
+#: ../finch/gntconn.c:42
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"由于下列错误 %s 已经断开:\n"
+"%s"
+
+#: ../finch/gntconn.c:45 ../libpurple/account.c:996
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
+#: ../pidgin/gtkblist.c:3892
+msgid "Connect"
+msgstr "连接"
+
+#: ../finch/gntconv.c:103
+msgid "No such command."
+msgstr "没有这样的命令。"
+
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "系统错误: 您给命令传送的参数个数不对。"
+
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+msgid "Your command failed for an unknown reason."
+msgstr "您的命令失败,原因未知。"
+
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+msgid "That command only works in chats, not IMs."
+msgstr "该命令只在聊天中可用,对话中无效。"
+
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+msgid "That command only works in IMs, not chats."
+msgstr "该命令只在对话中可用,聊天中无效。"
+
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+msgid "That command doesn't work on this protocol."
+msgstr "命令无法在此协议下工作。"
+
+#: ../finch/gntconv.c:131
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "命令尚未支持。消息未送出。"
+
+#: ../finch/gntconv.c:234
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:257
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s 正在打字..."
+
+#: ../finch/gntconv.c:403
+msgid "<AUTO-REPLY> "
+msgstr "<自动回复> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:505
+msgid "List of users:\n"
+msgstr "用户列表:\n"
+
+#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+msgid "Supported debug options are:  version"
+msgstr "支持的调试选项有: version"
+
+#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+msgid "No such command (in this context)."
+msgstr "没有这样的命令(在此环境中)。"
+
+#: ../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"
+msgstr ""
+"使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
+"此环境下可使用下列命令:\n"
+
+#: ../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;消息&gt;: 发送普通消息,就好像您未使用命令。"
+
+#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+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
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
+
+#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: 清除对话回滚。"
+
+#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
+
+#: ../finch/gntconv.c:723
+msgid "plugins: Show the plugins window."
+msgstr "plugins: 显示插件窗口。"
+
+#: ../finch/gntconv.c:726
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: 显示好友列表。"
+
+#: ../finch/gntconv.c:729
+msgid "accounts: Show the accounts window."
+msgstr "accounts:显示账户窗口。"
+
+#: ../finch/gntconv.c:732
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+#: ../finch/gntconv.c:735
+msgid "prefs: Show the preference window."
+msgstr ""
+
+#: ../finch/gntconv.c:738
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "调试窗口"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * 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
+msgid "Clear"
+msgstr "清除"
+
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+msgid "Pause"
+msgstr "暂停"
+
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "时间戳"
+
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+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: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 "状态"
+
+#: ../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: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 "关闭"
+
+#: ../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 "已失败"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f KB/秒"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "已完成"
+
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "文件传送"
+
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "电子邮件"
 
-#: ../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 封新邮件。"
 
-#: ../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:1627 ../pidgin/gtkdebug.c:862
 msgid "Info"
 msgstr "信息"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "开聊"
 
-#: ../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:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -792,290 +930,466 @@
 "网站: %s\n"
 "文件名: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "在您配置插件之前必须先装入它。"
 
-#: ../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 ""
 
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "此插件无配置选项。"
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:221
 msgid "You can (un)load plugins from the following list."
 msgstr "您可以卸载以下列表中的插件。"
 
-#: ../console/gntplugin.c:264
+#: ../finch/gntplugin.c:264
 msgid "Configure Plugin"
 msgstr "配置插件"
 
-#: ../console/gntprefs.c:122
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+msgid "Please enter a buddy to pounce."
+msgstr "请输入要监视的好友。"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "New Buddy Pounce"
+msgstr "新建好友千里眼"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+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:443 ../pidgin/gtkblist.c:5341
+#: ../pidgin/gtkblist.c:5657
+msgid "Account:"
+msgstr "账户:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "好友名称:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+msgid "Pounce When Buddy..."
+msgstr "监视好友的行动..."
+
+#: ../finch/gntpounce.c:372
+msgid "Signs on"
+msgstr "登入"
+
+#: ../finch/gntpounce.c:373
+msgid "Signs off"
+msgstr "登出"
+
+#: ../finch/gntpounce.c:374
+msgid "Goes away"
+msgstr "离开"
+
+#: ../finch/gntpounce.c:375
+msgid "Returns from away"
+msgstr "回来"
+
+#: ../finch/gntpounce.c:376
+msgid "Becomes idle"
+msgstr "发起了呆"
+
+#: ../finch/gntpounce.c:377
+msgid "Is no longer idle"
+msgstr "发完了呆"
+
+#: ../finch/gntpounce.c:378
+msgid "Starts typing"
+msgstr "开始打字"
+
+#: ../finch/gntpounce.c:379
+msgid "Pauses while typing"
+msgstr "输入时暂停"
+
+#: ../finch/gntpounce.c:380
+msgid "Stops typing"
+msgstr "停止打字"
+
+#: ../finch/gntpounce.c:381
+msgid "Sends a message"
+msgstr "发送消息"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+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:1278
+msgid "Recurring"
+msgstr "在线"
+
+#: ../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 "您真的想要删除 %s 在 %s 上的千里眼吗?"
+
+#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+msgid "Buddy Pounces"
+msgstr "好友千里眼"
+
+#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s 开始向您打字(%s)"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s 在给您打字时停了下来(%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s 已登入(%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s 发完呆了(%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s 回来了(%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s 停止了给您打字(%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s 已登出(%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s 发起了呆(%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s 走了。(%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s 给您发送了消息。(%s)"
+
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+msgid "Unknown pounce event. Please report this!"
+msgstr "未知的千里眼。请报告此错误!"
+
+#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+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
+msgid "Never"
+msgstr "从不"
+
+#: ../finch/gntprefs.c:159
 msgid "Show Idle Time"
 msgstr "显示发呆时间"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:160
 msgid "Show Offline Buddies"
 msgstr "显示离线好友"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:166
 msgid "Show Timestamps"
 msgstr "显示时间戳"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:167
 msgid "Notify buddies when you are typing"
 msgstr "提醒好友您正在打字给他们"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:173
 msgid "Log format"
 msgstr "日志格式"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:174
 msgid "Log IMs"
 msgstr "记录对话"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:175
 msgid "Log chats"
 msgstr "记录聊天"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:176
 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:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../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:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
 msgid "Logging"
 msgstr "日志"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
+#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkprefs.c:1951
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:521
 msgid "Not implemented yet."
 msgstr "未实现。"
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
+#: ../pidgin/gtkrequest.c:1559
+msgid "Save File..."
+msgstr "保存文件..."
+
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
+#: ../pidgin/gtkrequest.c:1560
+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:167 ../pidgin/gtksavedstatuses.c:556
 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: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 "标题"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
 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: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 "消息"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
 msgid "Use"
 msgstr "使用"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:291
 msgid "Invalid title"
 msgstr "无效的标题"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:292
 msgid "Please enter a non-empty title for the status."
 msgstr "请为状态输入非空标题。"
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:299
 msgid "Duplicate title"
 msgstr "重复标题"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:300
 msgid "Please enter a different title for the status."
 msgstr "为下列状态使用不同的标题。"
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:440
 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:451 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "状态:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:466
 msgid "Message:"
 msgstr "消息:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:515
 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:557
 msgid "Use different status for following accounts"
 msgstr "为下列账户使用不同的状态"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:591
 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 ""
+
+#: ../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 ""
+
+#: ../finch/plugins/gntgf.c:209
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 刚刚登入"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:216
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 刚刚登出"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:224
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 给您发送了消息"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:243
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 中提到了您的昵称"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:245
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 中发送了消息"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:283
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:284
 msgid "You receive an IM"
 msgstr "您接受了 IM"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:285
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天中别人在聊天中提到您的名字"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:286
 msgid "Someone says your name in a chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:314
 msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:329
 msgid "Beep too!"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:335
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:355
 msgid "GntGf"
 msgstr ""
 
-#: ../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
+#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+msgid "Toaster plugin"
+msgstr ""
+
+#: ../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"
@@ -1083,4532 +1397,226 @@
 "the same conversation type(s)."
 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
 #, fuzzy
 msgid "GntLastlog"
 msgstr "历史"
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr ""
-
-#: ../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 "开聊(_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"
-"您尚未配置即时通讯帐户。要用 Gaim 开始连接,请单击下方的"
-"<b>添加</b>按钮,以便配置您的第一个帐户。如果您想要让 Gaim 连接到多个即时通讯帐户,请再次单击<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 "/工具(T)/静音(S)"
-
-#: ../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 "/好友(B)/新即时消息(_M)..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/好友(B)/加入聊天(_C)..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/好友(B)/获取用户信息(_I)..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/好友(B)/查看用户日志(_L)..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/好友(B)/显示离线好友(_O)"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友(B)/显示空组(_E)"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/好友(B)/显示好友详细资料(_D)"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/好友(B)/显示发呆时间(_T)"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/好友(B)/好友排序(_S)"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/好友(B)/添加好友(_A)..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/好友(B)/添加聊天(_H)..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/好友(B)/添加组(_G)..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/好友(B)/退出(_Q)"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/账户(_A)"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
-msgid "/Accounts/Add\\/Edit"
-msgstr "/账户(A)/添加\\/编辑"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/工具(_T)"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/工具(T)/好友千里眼(_P)"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/工具(T)/插件(_G)"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/工具(T)/首选项(_E)"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具(T)/隐私(_I)"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/工具(T)/文件传送(_F)"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/工具(T)/房间列表(_O)"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/工具(T)/系统日志(_L)"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/工具(T)/静音(_S)"
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/帮助(_H)"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/帮助(H)/在线帮助(_H)"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/帮助(H)/调试窗口(_D)"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/帮助(H)/关于(_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 "发呆中 (%d小时%02d分) "
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "发呆 %d分"
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "/好友(B)/新即时消息..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/好友(B)/加入聊天(C)..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/好友(B)/获取用户信息..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/好友(B)/添加好友..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/好友(B)/添加聊天..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/好友(B)/添加组..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/工具(T)/好友千里眼(P)"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/工具(T)/隐私(I)"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/工具(T)/房间列表(O)"
-
-#: ../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"
-
-#: ../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 "/账户(A)"
-
-#. 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'>欢迎使用 Gaim!</span>\n"
-"\n"
-"您没有启用帐户。请通过<b>帐户->添加编辑</b>打开<b>帐户</b>窗口,从中启用您的即时通讯帐户。当您启用帐户之后,"
-"才可以登录、设定状态、和朋友交谈。"
-
-#. 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 "/好友(B)/显示离线好友(O)"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/好友(B)/显示空组(E)"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/好友(B)/显示好友详细资料(D)"
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/好友(B)/显示发呆时间(T)"
-
-#: ../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>/账户(A)/"
-
-#: ../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>/帐户(A)/启用帐户"
-
-#: ../gtk/gtkblist.c:6438
-msgid "/Tools"
-msgstr "/工具(T)"
-
-#: ../gtk/gtkblist.c:6508
-msgid "/Buddies/Sort Buddies"
-msgstr "/好友(B)/好友排序(S)"
-
-#: ../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 将不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
-
-#: ../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 "/对话(C)/新即时消息(_M)..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/对话(C)/查找(_F)..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/对话(C)/查看日志(_L)"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/对话(C)/另存为(_S)..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/对话(C)/清除回滚(_R)"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/对话(C)/发送文件(_N)..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/对话(C)/添加好友千里眼(_P)..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/对话(C)/获取信息(_G)"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/对话(C)/邀请(_V)..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/对话(C)/更多(_O)"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/对话(C)/别名(_L)..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/对话(C)/屏蔽(_B)..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/对话(C)/添加(_A)..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/对话(C)/删除(_R)..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/插入链接(_K)..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/对话(C)/插入图像(_E)..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/对话(C)/关闭(_C)"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/选项(_O)"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/选项(O)/允许记录日志(_L)"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/选项(O)/允许声音(_S)"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/选项(O)/显示好友图标(_I)"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/选项(O)/显示格式工具栏(_T)"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/选项(O)/显示时间戳(_I)"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/对话(C)/更多(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 "/对话(C)"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/对话(C)/查看日志(L)"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/对话(C)/发送文件(N)..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/对话(C)/添加好友千里眼(P)..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/对话(C)/获取信息(G)"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/对话(C)/邀请(V)..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/对话(C)/别名(L)..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/对话(C)/屏蔽(B)..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/对话(C)/添加(A)..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/对话(C)/删除(R)..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/对话(C)/插入链接(K)..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/对话(C)/插入图像(I)..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/选项(O)/允许记录(L)"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/选项(O)/允许声音(S)"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/选项(O)/显示格式工具栏(T)"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/选项(O)/显示时间戳(I)"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/选项(O)/显示好友图标(I)"
-
-#: ../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 个人"
-
-#: ../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 "昵称说"
-
-#: ../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 "分离即时消息和聊天窗口"
-
-#: ../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 "支持/质控"
-
-#: ../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
-#, fuzzy
-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 越南语团队"
-
-#: ../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 ""
-
-#: ../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 "疯狂补丁编写者"
-
-#: ../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 个其它好友的联系人。您真的要这么做"
-"吗?"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "删除联系人"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "删除联系人(_R)"
-
-#: ../gtk/gtkdialogs.c:1047
-#, fuzzy, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr "您即将从您的好友列表中删除组 %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 KB/秒"
-
-#: ../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 "超级链接悬停颜色"
-
-#: ../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 "复制电子邮件地址(_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"
-
-#: ../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'>于 %2$s 在 %1$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'>在 %2$s 与 %1$s 的对话</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%Y年%m月"
-
-#: ../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=目录   使用“目录”存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\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 ""
-
-#: ../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 封新邮件。"
-
-#: ../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>"
-
-#: ../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>\t%s\n"
-"<span weight=\"bold\">网站:</span>\t\t%s\n"
-"<span weight=\"bold\">文件名:</span>\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\">错误:%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
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "您真的想要删除 %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
-#, fuzzy, 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 "隐藏新的 IM 对话(_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 "在同一标签窗口内显示即时消息和聊天(_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:"
-
-#: ../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"
-"(%s 代表 URL)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "日志格式(_F):"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "记录所有即时消息(_I)"
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../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
-#, fuzzy
-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 ""
-
-#. 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 "在对话中应用"
-
-#: ../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 "按数字放置时分离即时消息和聊天窗口"
-
-#. *< 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 "限制每个窗口的对话数,可选分离即时消息和聊天窗口"
-
-#. *< 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 "Gaim 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 "无法发送电子邮件。"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr "Evolution 可执行文件未在 PATH 中找到。"
-
-#: ../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 "添加到地址簿"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "发送电子邮件"
-
-#. 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 "电子邮件:"
-
-#. *< 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
-#, fuzzy
-msgid "Markerline"
-msgstr "下划线"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-#, fuzzy
-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 "即时消息窗口(_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 属性中插入新消息数(_X)"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "设置窗口管理器“紧急”提示(_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 "Raw"
-
-#: ../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)。在输入框中按回车"
-"键可以发送。看看调试窗口。"
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "您正在使用 Gaim 版本 %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 "定期检查新版本并通知用户更新记录。"
-
-#: ../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 "区分大小写匹配(不选中代表自动处理大小写)"
-
-#: ../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 "每 N 分钟显示一次 iChat 风格的时间戳。"
-
-#: ../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 "账户:"
-
-#: ../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 "即时消息对话窗口"
-
-#: ../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 ""
-"此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
-"\n"
-"* 注意: 此插件需要 Win2000 或更高版本。"
-
-#: ../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 "提供 Gaim 在 Windows 下特定的选项,比如好友列表停靠。"
-
-#: ../libgaim/account.c:769
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr ""
+
+#: ../libpurple/account.c:777
 msgid "accounts"
 msgstr "账户"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:923
 msgid "Password is required to sign on."
 msgstr "需要密码才能登入。"
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "输入 %s(%s) 的密码"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:955
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:960
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../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 "缺少 %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 "新密码不相同。"
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1163
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1186
 msgid "Original password"
 msgstr "旧密码"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1193
 msgid "New password"
 msgstr "新密码"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1200
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1206
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1214
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1244
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %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 "设置用户信息"
 
-#: ../libgaim/blist.c:548
+#: ../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 "未知"
+
+#: ../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 "好友"
+
+#: ../libpurple/blist.c:550
 msgid "buddy list"
 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] ""
-"%2$s 组中的 %1$d 个好友未删除,原因是他们属于目前已禁用或离线的账户。这些好友"
-"和该组不会被删除。\n"
-
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-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:1692
+#: ../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:1162
 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
-#, fuzzy, c-format
+#: ../libpurple/dbus-server.c:603
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "存储图像失败:%s\n"
-
-#: ../libgaim/dnsquery.c:491
+msgstr "获取服务器名称失败:%s"
+
+#: ../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"
@@ -5617,33 +1625,35 @@
 "解析 %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"
 "%s"
-msgstr "从解析器进程读取时出错:\n%s"
-
-#: ../libgaim/dnsquery.c:558
+msgstr ""
+"从解析器进程读取时出错:\n"
+"%s"
+
+#: ../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:409
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5652,7 +1662,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5661,7 +1671,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5670,39 +1680,39 @@
 "访问 %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:340
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:388
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:392
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5713,243 +1723,243 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:425
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 正在发送文件 %s"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:477
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:498
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:510
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "开始来自 %2$s 的 %1$s 传送"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:664
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:667
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1084
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1089
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1147
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1152
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1209
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "给 %s 传送文件失败。"
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1211
 #, 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”URL 的处理程序"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr ""
-
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgstr "“gg”URL 的处理程序"
+
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr ""
-
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgstr "“icq”URL 的处理程序"
+
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "<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"
-
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr ""
+
+#: ../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-"
@@ -5958,7 +1968,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&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-"
@@ -5967,162 +1977,159 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&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 <自动回复>: %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 ""
+
+#: ../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 "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: ../libgaim/plugin.c:538
-#, fuzzy
-msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim 与 ICQ 服务器通讯错误。"
-
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "无法装入插件"
+
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim 无法装入您的插件。"
-
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "无法装入您的插件。"
+
+#: ../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."
-msgstr "Gaim 卸载插件时遇到了错误。"
-
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "卸载插件时遇到了错误。"
+
+#: ../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 ../libpurple/plugins/autoreply.c:225
 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/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 "取消(_C)"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:166
 msgid "Ask"
 msgstr "询问"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:167
 msgid "Auto Accept"
 msgstr "自动接受"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Auto Reject"
 msgstr "自动拒绝"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:181
 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:211
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
-msgstr "保存文件的路径\n(请提供完整路径)"
-
-#: ../libgaim/plugins/autoaccept.c:216
+msgstr ""
+"保存文件的路径\n"
+"(请提供完整路径)"
+
+#: ../libpurple/plugins/autoaccept.c:216
 msgid "Automatically reject from users not in buddy list"
 msgstr "自动拒绝不在好友列表中的用户的请求"
 
-#: ../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 ""
 
-#: ../libgaim/plugins/autoreply.c:23
+#: ../libpurple/plugins/autoreply.c:23
 msgid "Autoreply"
 msgstr "自动回复"
 
-#: ../libgaim/plugins/autoreply.c:25
+#: ../libpurple/plugins/autoreply.c:25
 msgid "Autoreply for all the protocols"
 msgstr ""
 
-#: ../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 "
@@ -6132,97 +2139,93 @@
 msgstr ""
 
 #. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
-#, fuzzy, c-format
+#: ../libpurple/plugins/autoreply.c:218
+#, c-format
 msgid "Set autoreply message for %s"
-msgstr "来自 %2$s 的 %1$d 条未读消息\n"
-
-#: ../libgaim/plugins/autoreply.c:220
-#, fuzzy
+msgstr "设定 %s 的自动回复消息"
+
+#: ../libpurple/plugins/autoreply.c:220
 msgid "Set Autoreply Message"
-msgstr "获得离开消息"
-
-#: ../libgaim/plugins/autoreply.c:221
+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 ""
 
-#: ../libgaim/plugins/autoreply.c:238
+#: ../libpurple/plugins/autoreply.c:238
 msgid "Set _Autoreply Message"
 msgstr "设定自动回复消息(_A)"
 
-#: ../libgaim/plugins/autoreply.c:249
+#: ../libpurple/plugins/autoreply.c:249
 msgid "Autoreply message"
 msgstr "自动回复消息"
 
-#: ../libgaim/plugins/autoreply.c:336
-#, fuzzy
+#: ../libpurple/plugins/autoreply.c:336
 msgid "Send autoreply messages when"
-msgstr "发送消息(_M)"
-
-#: ../libgaim/plugins/autoreply.c:340
-#, fuzzy
+msgstr "发送自动回复消息的情况"
+
+#: ../libpurple/plugins/autoreply.c:340
 msgid "When my account is _away"
-msgstr "谈到我的昵称时"
-
-#: ../libgaim/plugins/autoreply.c:344
-#, fuzzy
+msgstr "当我的账户离开时(_A)"
+
+#: ../libpurple/plugins/autoreply.c:344
 msgid "When my account is _idle"
-msgstr "谈到我的昵称时"
-
-#: ../libgaim/plugins/autoreply.c:348
+msgstr "当我的帐户发呆时(_I)"
+
+#: ../libpurple/plugins/autoreply.c:348
 msgid "_Default reply"
 msgstr "默认回复(_D)"
 
-#: ../libgaim/plugins/autoreply.c:354
+#: ../libpurple/plugins/autoreply.c:354
 msgid "Status message"
 msgstr "状态消息"
 
-#: ../libgaim/plugins/autoreply.c:358
+#: ../libpurple/plugins/autoreply.c:358
 msgid "Autoreply with status message"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:362
+#: ../libpurple/plugins/autoreply.c:362
 msgid "Always when there is a status message"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:364
+#: ../libpurple/plugins/autoreply.c:364
 msgid "Only when there's no autoreply message"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:369
+#: ../libpurple/plugins/autoreply.c:369
 msgid "Delay between autoreplies"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:373
+#: ../libpurple/plugins/autoreply.c:373
 msgid "_Minimum delay (mins)"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:377
+#: ../libpurple/plugins/autoreply.c:377
 msgid "Times to send autoreplies"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:381
+#: ../libpurple/plugins/autoreply.c:381
 msgid "Ma_ximum count"
-msgstr ""
-
-#: ../libgaim/plugins/autoreply.c:428
+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 "我目前不在。请给我留言,我会尽快给您回复。"
 
-#: ../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 "备注"
 
-#: ../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:61
 msgid "Edit Notes..."
 msgstr "编辑备注..."
 
@@ -6232,18 +2235,18 @@
 #. *< 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
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "在好友列表中添加好友备注的选项。"
 
@@ -6253,7 +2256,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr ""
 
@@ -6261,8 +2264,8 @@
 #. *< 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
@@ -6271,7 +2274,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus 示例"
 
@@ -6279,7 +2282,8 @@
 #. *< 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 插件示例"
 
@@ -6289,58 +2293,58 @@
 #. *< 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 "允许您输入文件中的命令来控制 Gaim。"
-
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "允许您输入文件中的命令来控制。"
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
 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: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 "设定账户发呆时间"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "您的全部账户都没有设为发呆。"
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "取消账户发呆时间的设定"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:202
 msgid "_Unset"
 msgstr "取消设置(_U)"
 
-#: ../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 "设定全部账户的发呆时间"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "取消全部账户的发呆时间"
 
-#: ../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 "允许您手动配置您发了多长时间呆"
 
@@ -6350,19 +2354,19 @@
 #. *< 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."
@@ -6374,116 +2378,158 @@
 #. *< 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:264
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:267
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  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 "(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 "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 "日志目录"
 
@@ -6493,19 +2539,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "日志读取器"
 
 #. *< 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 "在日志查看器中包含其它即时通讯客户的日志。"
 
 #. * 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"
@@ -6518,12 +2564,12 @@
 "\n"
 "警告:此插件仍处于内测阶段,可能会经常崩溃。请小心使用!"
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:211
 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:213
+#: ../libpurple/plugins/mono/loader/mono.c:214
 msgid "Loads .NET plugins with Mono."
 msgstr "装入 Mono 编写的 .NET 插件。"
 
@@ -6536,60 +2582,77 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
-#, fuzzy
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
-msgstr "新建窗口"
+msgstr "新行"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
-#, fuzzy
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
-msgstr "无法发送消息。"
+msgstr "在显示的消息前添加新行。"
 
 #. *  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 ""
 
-#: ../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."
 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 "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:156
-#, fuzzy
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
-msgstr "未读消息"
-
-#: ../libgaim/plugins/offlinemsg.c:157
+msgstr "离线消息"
+
+#: ../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: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 "是"
+
+#: ../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 "否"
+
+#: ../libpurple/plugins/offlinemsg.c:187
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:191
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -6599,48 +2662,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:588
 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:590 ../libpurple/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr ""
 
-#: ../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 ""
-
-#: ../libgaim/plugins/psychic.c:66
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "仅对好友列表中的用户启用"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "离开时禁用"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "对话时显示通知消息"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:99
 #, fuzzy
 msgid "Raise psychic conversations"
 msgstr "于隐藏对话"
@@ -6651,7 +2714,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -6659,7 +2722,8 @@
 #. *< 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 "测试看看所有的信号是否都工作正确。"
 
@@ -6669,7 +2733,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "简单插件"
 
@@ -6677,7 +2741,7 @@
 #. *< 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 "测试看看大多数功能是否正常。"
 
@@ -6687,7 +2751,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6695,7 +2759,7 @@
 #. *< 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 支持库。"
 
@@ -6705,7 +2769,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6713,8 +2777,8 @@
 #. *< 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 "提供通过 GNUTLS 的 SSL 支持。"
 
@@ -6724,7 +2788,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:409
 msgid "NSS"
 msgstr "NSS"
 
@@ -6732,48 +2796,49 @@
 #. *< 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 "提供通过 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)"
 
@@ -6783,7 +2848,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "好友状态通知"
 
@@ -6791,36 +2856,56 @@
 #. *< 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 "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
 
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/tcl/tcl.c:415
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: ../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 "提供装入 Tcl 插件的支持"
 
-#: ../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 "无法监听连入的 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: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 "离开"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6831,393 +2916,419 @@
 #. *< 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
+#, fuzzy
+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 "主机名"
 
 #. 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 "名"
 
-#: ../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 "姓"
 
-#: ../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 "电子邮件"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:580
 msgid "AIM Account"
 msgstr "AIM 账户"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber 账户"
-
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+msgid "XMPP Account"
+msgstr "XMPP 账户"
+
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr ""
 
-#: ../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
 #, fuzzy
 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
 #, fuzzy
 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 "保存好友列表..."
 
-#: ../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:380
 msgid "Fill in the registration fields."
 msgstr "填入注册字段。"
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "无法创建新账户。发生了错误。\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
-#, fuzzy
+msgstr "注册了新的 Gadu-Gadu 账户"
+
+#: ../libpurple/protocols/gg/gg.c:408
 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
+msgstr "注册成功!"
+
+#: ../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 "密码"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
 msgid "Password (retype)"
-msgstr "密码已送出"
-
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+msgstr "密码(重新输入)"
+
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
 #, fuzzy
 msgid "Enter current token"
 msgstr "%s 目前未登入。"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
 #, fuzzy
 msgid "Current token"
 msgstr "目前位于"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
-msgstr "注册新的 Jabber 账户"
-
-#: ../libgaim/protocols/gg/gg.c:495
+msgstr "注册新的 Gadu-Gadu 账户"
+
+#: ../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 "城市"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:637
 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: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 "性别"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:641
 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:642
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../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:643
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "女"
 
-#: ../libgaim/protocols/gg/gg.c:647
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Only online"
-msgstr "在线"
-
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+msgstr "只在线"
+
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "查找好友"
 
-#: ../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 ""
 
-#: ../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 "您目前的密码与您所指定的密码不同。"
 
-#: ../libgaim/protocols/gg/gg.c:716
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occurred.\n"
 msgstr "无法更改密码。发生了错误。\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "更改 Gadu-Gadu 帐户的密码"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "密码成功更改!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "当前密码"
 
-#: ../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 "请输入您目前 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 "更改 Gadu-Gadu 密码"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:863
 #, 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: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 "离线"
+
+#: ../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 "可用"
+
+#: ../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 "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: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 "名"
 
-#: ../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 "出生年份"
 
-#: ../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 "Gadu-Gadu 公开目录"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../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 "无法读取套接字"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr "好友列表已下载"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr "您的好友列表已经从服务器上下载。"
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr "好友列表已上传"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1391
 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:1496 ../libpurple/protocols/gg/gg.c:1702
 msgid "Connection failed."
 msgstr "连接失败。"
 
-#: ../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 "被屏蔽"
 
-#: ../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 "屏蔽"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Chat _name:"
 msgstr "聊天名(_N):"
 
-#: ../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 "查找好友..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2014
 msgid "Change password..."
 msgstr "更改密码..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2020
 msgid "Upload buddylist to Server"
 msgstr "将好友列表上传到服务器"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Download buddylist from Server"
 msgstr "从服务器下载好友列表"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Delete buddylist from Server"
 msgstr "从服务器删除好友列表"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Save buddylist to file..."
 msgstr "将好友列表保存到文件..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Load buddylist from file..."
 msgstr "从文件装入好友列表..."
 
@@ -7232,122 +3343,147 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "波兰流行的即时通讯软件"
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2183
 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:1575
 #, 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:1283
 #, 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:1287
 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 无法打开监听端口。"
-
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "无法打开监听端口。"
+
+#: ../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: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 "查看 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: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 "正连接"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../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:1584
 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:595 ../libpurple/protocols/irc/irc.c:620
 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:759
+#: ../libpurple/protocols/silc/chat.c:1421
+#: ../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: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 "话题"
 
@@ -7359,280 +3495,286 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:893
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:894
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
 #. 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 "服务器"
 
 #. 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 "端口"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:919
 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: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 "用户名"
 
-#: ../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 "真名"
 
 #.
-#. 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 "使用 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 "您被 %s 屏蔽了。"
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Banned"
 msgstr "屏蔽"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:209
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "无法屏蔽 %s:屏蔽列表已满"
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:290
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:291
 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:292
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../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:318
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "目前位于"
 
-#: ../libgaim/protocols/irc/msgs.c:250
-#, fuzzy
+#: ../libpurple/protocols/irc/msgs.c:323
 msgid "Idle for"
-msgstr "发呆"
-
-#: ../libgaim/protocols/irc/msgs.c:253
+msgstr "发呆时长"
+
+#: ../libpurple/protocols/irc/msgs.c:326
 msgid "Online since"
 msgstr "上线时间"
 
-#: ../libgaim/protocols/irc/msgs.c:257
-#, fuzzy
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>定义形容词:</b>显赫<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:257
-#, fuzzy
+msgstr "<b>定义形容词:</b>"
+
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "Glorious"
-msgstr "组"
-
-#: ../libgaim/protocols/irc/msgs.c:333
+msgstr "显赫"
+
+#: ../libpurple/protocols/irc/msgs.c:406
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
-#, fuzzy, c-format
+#: ../libpurple/protocols/irc/msgs.c:408
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s 将话题改为: %s"
-
-#: ../libgaim/protocols/irc/msgs.c:343
+msgstr "%s 清除了话题。"
+
+#: ../libpurple/protocols/irc/msgs.c:416
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:434
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:435
 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 服务器无法理解的信息。"
-
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:435
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC 服务器收到了无法理解的信息。"
+
+#: ../libpurple/protocols/irc/msgs.c:456
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%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 "IRC 服务器的本地时间为:"
 
-#: ../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 "用户未登入"
 
-#: ../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 "无法发送"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:660
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:661
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:773
 #, 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:778 ../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:801
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$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 "无效的昵称"
 
-#: ../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."
 msgstr "您所选的昵称被服务器拒绝。其中可能包含无效的字符。"
 
-#: ../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."
 msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:953
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:995
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:997
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1078
 #, 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:1079
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1113
 msgid "Nick or channel is temporarily unavailable."
 msgstr "昵称或频道暂时不可用。"
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1125
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:118
 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:119
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:120
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: 向 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 ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: ../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 "
@@ -7641,13 +3783,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: ../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 "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: ../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."
@@ -7655,7 +3797,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: ../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."
@@ -7663,1001 +3805,1037 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: ../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 "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: ../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 ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:128
 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:129
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: 向 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 ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
 
-#: ../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 "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: ../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 "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:134
 #, fuzzy
 msgid "nickserv: Send a command to nickserv"
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: ../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 ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: ../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 "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:137
 #, fuzzy
 msgid "operserv: Send a command to operserv"
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: ../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 "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: ../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 "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: ../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 "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: ../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 [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: ../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 "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: ../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: 显示 IRC 服务器上当前的本地时间。"
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: ../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 "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: ../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 ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: ../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 "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:150
 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:444
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 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: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 "已断开连接。"
 
-#: ../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 "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#: ../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 "服务器的响应无效。"
 
-#: ../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 错误"
 
-#: ../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 "全名"
 
-#: ../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 "姓"
 
-#: ../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 "名"
 
-#: ../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 "街道地址"
 
-#: ../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 "额外地址"
 
-#: ../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 "地区"
 
-#: ../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 "区域"
 
-#: ../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 "邮政编码"
 
-#: ../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 "国家"
 
-#: ../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 "电话号码"
 
-#: ../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 "电子邮件"
 
-#: ../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 "组织名称"
 
-#: ../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 "组织单元"
 
-#: ../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 "职务"
 
-#: ../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 "生日"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "编辑 Jabber vCard"
-
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../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 "描述"
+
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
+msgid "Edit XMPP vCard"
+msgstr "编辑 XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: ../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 "客户"
 
-#: ../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 "操作系统"
 
-#: ../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
+#: ../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 "优先级"
 
-#: ../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 "中名"
 
-#: ../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: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 "地址"
 
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:851
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Photo"
 msgstr "相片"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Logo"
 msgstr "图符"
 
-#: ../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 "临时隐身"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1356
+#: ../libpurple/protocols/jabber/buddy.c:1363
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1370
 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:1379
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: ../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 "唠叨"
 
-#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1416 ../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: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 "请勿打扰"
 
-#: ../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 "姓"
 
-#: ../libgaim/protocols/jabber/buddy.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:1599
 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
+#. current comment from XMPP User Directory users.jabber.org
+#: ../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 "服务器指令:%s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: ../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:1736
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+#: ../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 "电子邮件地址"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
-#: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "搜索 Jabber 用户"
-
-#: ../libgaim/protocols/jabber/buddy.c:1773
+#: ../libpurple/protocols/jabber/buddy.c:1765
+#: ../libpurple/protocols/jabber/buddy.c:1766
+msgid "Search for XMPP users"
+msgstr "搜索 XMPP 用户"
+
+#. "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 "搜索"
+
+#: ../libpurple/protocols/jabber/buddy.c:1780
 msgid "Invalid Directory"
 msgstr "无效的目录"
 
-#: ../libgaim/protocols/jabber/buddy.c:1790
+#: ../libpurple/protocols/jabber/buddy.c:1797
 msgid "Enter a User Directory"
 msgstr "进入用户目录"
 
-#: ../libgaim/protocols/jabber/buddy.c:1791
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Select a user directory to search"
 msgstr "选择要搜索的用户目录"
 
-#: ../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 "房间(_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 "不支持在非 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
-msgid "Invalid Jabber ID"
-msgstr "无效的 Jabber ID"
-
-#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:910
+msgid "Invalid XMPP ID"
+msgstr "无效的 XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:638
 #, 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:640
+#: ../libpurple/protocols/jabber/jabber.c:641
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: ../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 "未知错误"
 
-#: ../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 "注册失败"
 
-#: ../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 "已注册"
 
-#: ../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 "州/省"
 
-#: ../libgaim/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/jabber/jabber.c:847
 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:852
+#: ../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:862
 msgid "Date"
 msgstr "日期"
 
-#: ../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 "请在下面填入信息以注册您新的账户。"
 
-#: ../libgaim/protocols/jabber/jabber.c:858
-#: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "注册新的 Jabber 账户"
-
-#: ../libgaim/protocols/jabber/jabber.c:1025
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:874
+msgid "Register New XMPP Account"
+msgstr "注册新的 XMPP 账户"
+
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+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: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 "未认证"
 
-#: ../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 "来自(待推迟)"
 
-#: ../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 "无"
+
+#: ../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
-msgid "Change Jabber Password"
-msgstr "更改 Jabber 密码"
-
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1369
+msgid "Change XMPP Password"
+msgstr "更改 XMPP 密码"
+
+#: ../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:1379
+#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/silc/silc.c:1013
 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:1384
+#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/silc/silc.c:1009
 msgid "Change Password..."
 msgstr "更改密码..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1389
 msgid "Search for Users..."
 msgstr "搜索用户..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1467
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Conflict"
 msgstr "冲突"
 
-#: ../libgaim/protocols/jabber/jabber.c:1463
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "禁止"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Gone"
 msgstr "已走"
 
-#: ../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 "内部服务器错误"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "Jabber ID 格式错误"
-
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1481
+msgid "Malformed XMPP ID"
+msgstr "XMPP ID 格式错误"
+
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: ../libgaim/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: ../libgaim/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: ../libgaim/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: ../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 "服务器超载"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: ../libgaim/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: ../libgaim/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: ../libgaim/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: ../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 "主机宕机"
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: ../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 "无效 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 "无效的 XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: ../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 "限制的 XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: ../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 "不支持的编码"
 
-#: ../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 "不支持的版本"
 
-#: ../libgaim/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: ../libgaim/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Stream Error"
 msgstr "流错误"
 
-#: ../libgaim/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1655
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1675
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "未知的错误代码: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1680
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "无法邀请用户(%s)。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1699
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "未知角色:“%s”"
 
-#: ../libgaim/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, fuzzy, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "无法发送消息: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/jabber/jabber.c:1759
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1790
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1794
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/jabber/jabber.c:1803
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1808
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: ../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 "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: ../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 "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
 
-#: ../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 "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: ../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 "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: ../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 "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
@@ -8672,111 +4850,112 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1962
-#: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 协议插件"
-
-#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:1974
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 协议插件"
+
+#: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
 msgstr "强制旧 SSL(5223 端口)"
 
-#: ../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 "连接端口"
 
 #. 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 "来自 %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
-msgid "Jabber Message Error"
-msgstr "Jabber 消息错误"
-
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:272
+msgid "XMPP Message Error"
+msgstr "XMPP 消息错误"
+
+#: ../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: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 "创建新房间"
 
-#: ../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 "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "配置房间(_C)"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:363
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:404
 #, 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. "
@@ -8784,281 +4963,282 @@
 msgstr ""
 "本地列表中的 %s 位于组“%s”中,但未出现在服务器列表中。您是否想要添加此好友?"
 
-#: ../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 "本地列表中的 %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 的 bug)"
-
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "错误(可能是客户端的 bug)"
+
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "无效的电子邮件地址"
 
-#: ../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
 #, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "缺少全称域名"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 #, fuzzy
 msgid "Already logged in"
 msgstr "已登入"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 #, fuzzy
 msgid "Invalid screen name"
 msgstr "用户名无效"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 #, fuzzy
 msgid "Invalid friendly name"
 msgstr "友好的名称无效"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 #, fuzzy
 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 "无法删除零组"
 
-#: ../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
 #, fuzzy
 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
 #, fuzzy
 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
-#, fuzzy
+#: ../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 "Passport 未验证"
 
-#: ../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 "没有父母在的儿童 Passport"
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#: ../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: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 "允许 MSN 移动寻呼吗?"
 
-#: ../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?"
@@ -9066,308 +5246,316 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: ../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 "此 Hotmail 账户可能未激活。"
 
-#: ../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
+#: ../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 "忙碌"
 
-#: ../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 "接听电话"
 
-#: ../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 "外出就餐"
 
-#: ../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 "打开 Hotmail 收件箱"
 
-#: ../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 "发起聊天(_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."
-msgstr ""
-"MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
-"ssl.php 中的更多信息。"
-
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:694
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
+
+#: ../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 "常规"
+
+#: ../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 "年龄"
 
-#: ../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 "职业"
 
-#: ../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 "位置"
 
-#: ../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 "嗜好和兴趣"
 
-#: ../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 "婚姻状况"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1551
 msgid "Interests"
 msgstr "兴趣"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1552
 msgid "Pets"
 msgstr "宠物"
 
-#: ../libgaim/protocols/msn/msn.c:1575
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:1553
 msgid "Hometown"
-msgstr "主机未知"
-
-#: ../libgaim/protocols/msn/msn.c:1576
-#, fuzzy
+msgstr "家乡"
+
+#: ../libpurple/protocols/msn/msn.c:1554
 msgid "Places Lived"
-msgstr "已取消"
-
-#: ../libgaim/protocols/msn/msn.c:1577
+msgstr "住所"
+
+#: ../libpurple/protocols/msn/msn.c:1555
 msgid "Fashion"
 msgstr "时尚"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1556
 msgid "Humor"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1557
 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:1558 ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: ../libgaim/protocols/msn/msn.c:1597
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Contact Info"
-msgstr "账户信息"
-
-#: ../libgaim/protocols/msn/msn.c:1598
-#, fuzzy
+msgstr "联系信息"
+
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Personal"
-msgstr "个人 IM"
-
-#: ../libgaim/protocols/msn/msn.c:1601
+msgstr "个人"
+
+#: ../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 "家庭电话"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1581
 msgid "Home Phone 2"
 msgstr "家庭电话 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 "家庭住址"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1583
 msgid "Personal Mobile"
 msgstr "个人手机"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1584
 msgid "Home Fax"
 msgstr "家庭传真"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1585
 msgid "Personal E-Mail"
 msgstr "个人电子邮件"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Personal IM"
 msgstr "个人 IM"
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Anniversary"
 msgstr "纪念日"
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Work"
-msgstr "办公 IM"
-
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+msgstr "工作"
+
+#: ../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 "公司"
 
-#: ../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 "部门"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1609
 msgid "Profession"
 msgstr "职业"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1610
 msgid "Work Phone"
 msgstr "工作电话"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1611
 msgid "Work Phone 2"
 msgstr "办公电话 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 "办公地址"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1613
 msgid "Work Mobile"
 msgstr "办公手机"
 
-#: ../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 "办公传真"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Work E-Mail"
 msgstr "办公电子邮件"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1617
 msgid "Work IM"
 msgstr "办公 IM"
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1618
 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: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 "上次更新"
 
-#: ../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 "主页"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: ../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 "
@@ -9376,14 +5564,14 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: ../libgaim/protocols/msn/msn.c:1812
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
-
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1790
+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/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -9397,96 +5585,96 @@
 #. *< 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 "MSN 协议插件"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2108
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2113
 msgid "Show custom smileys"
 msgstr "显示自定义如下:"
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2121
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:向用户发送闪屏震动,以便引起他的注意"
 
-#: ../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 "
@@ -9508,15 +5696,15 @@
 "\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"
@@ -9525,409 +5713,400 @@
 "%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:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:201
 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 "获得 cookie"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: ../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
-#, fuzzy
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
-msgstr "密码不对。"
-
-#: ../libgaim/protocols/novell/nmuser.c:1912
+msgstr "密码不对"
+
+#: ../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
-#, fuzzy
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
-msgstr "昵称或密码不对。"
-
-#: ../libgaim/protocols/novell/nmuser.c:1940
-#, fuzzy
+msgstr "昵称或密码不对"
+
+#: ../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
-#, fuzzy
+#: ../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
-#, fuzzy
+#: ../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 "试用版本不允许超过十个用户同时在线"
 
-#: ../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 "
 "creating folder (%s)."
 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 "
 "list (%s)."
 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:1650
 #, 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: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 "用户 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:1518
 msgid "Full name"
 msgstr "全名"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: ../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"
@@ -9938,36 +6117,36 @@
 "\n"
 "发出时间: %s"
 
-#: ../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 "%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: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 "出错。SSL 支持未安装。"
 
-#: ../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 "此会议已关筹。不会再送出消息。"
 
@@ -9981,48 +6160,48 @@
 #. *< 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 "Novell GroupWise Messenger 协议插件"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3535
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../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
-#, fuzzy
+#: ../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 "%s 已经关闭了对话。"
-
-#: ../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
+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/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, fuzzy, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
 msgstr "未连接到服务器。"
 
-#: ../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
 #, fuzzy
 msgid "Received invalid data on connection with server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, fuzzy, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -10039,21 +6218,12 @@
 #. *< 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
 #, fuzzy
 msgid "AIM Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-#, fuzzy
-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
@@ -10064,156 +6234,147 @@
 #. *< 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
 #, fuzzy
 msgid "ICQ Protocol Plugin"
 msgstr "IRC 协议插件"
 
-#: ../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 "编码"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-#, fuzzy
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"总是使用 AIM/ICQ 代理服务器\n"
-"(较慢,但不会暴露您的 IP 地址)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 #, fuzzy
 msgid "The remote user has closed the connection."
 msgstr "%s 已经关闭了对话。"
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 #, fuzzy
 msgid "The remote user has declined your request."
 msgstr "用户已经屏蔽了您"
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, fuzzy, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: ../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 "二人世界已建立"
 
-#: ../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 "无效错误"
 
-#: ../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 "
@@ -10221,159 +6382,179 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:438
 #, fuzzy, 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 "好友图标"
+
+#: ../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 二人世界"
 
-#: ../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:5955
 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 直接连接"
 
-#: ../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 "Nihilist"
 
-#: ../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 "Hiptop"
 
-#: ../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:5728
 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:5763
 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:5749
 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:2894 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+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:3709
+#: ../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
 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
 #, fuzzy, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr "无法连接到身份验证服务器"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:984
 #, fuzzy, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
 msgstr "无法连接到 BOS 服务器"
 
-#: ../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 "
@@ -10383,29 +6564,28 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/yahoo/yahoo.c:1929
 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:1035
+#: ../libpurple/protocols/yahoo/yahoo.c:1947
 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."
@@ -10413,46 +6593,45 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: ../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 "输入的 SecurID 密钥无效。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1430
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: ../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
 #, fuzzy
 msgid "_OK"
 msgstr "确定"
 
-#: ../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 "
@@ -10460,54 +6639,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 登录码。"
-
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1474
+#: ../libpurple/protocols/oscar/oscar.c:1517
+msgid "Unable to get a valid AIM login hash."
+msgstr "无法获取有效的 AIM 登录码。"
+
+#: ../libpurple/protocols/oscar/oscar.c:1603
 #, 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 无法获取有效的登录码。"
-
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1606
+msgid "Unable to get a valid login hash."
+msgstr "无法获取有效的登录码。"
+
+#: ../libpurple/protocols/oscar/oscar.c:1632
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:1688
 msgid "Unable to initialize connection"
-msgstr "无法创建连接"
-
-#: ../libgaim/protocols/oscar/oscar.c:2203
+msgstr "无法初始化连接"
+
+#: ../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 "认证请求消息:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2241
 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: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 "没有给出理由。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2286
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: ../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 "
@@ -10517,17 +6695,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2414
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. 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 "用户 %u 同意您将他/她加为好友。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10540,7 +6718,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2437
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10553,7 +6731,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: ../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"
@@ -10566,32 +6744,36 @@
 "内容是:\n"
 "%s"
 
-#: ../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 "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: ../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 "您是否想要将此人加为好友?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "添加(_A)"
+
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../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] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: ../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] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: ../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."
@@ -10599,96 +6781,91 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: ../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] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: ../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] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: ../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] "您错过了 %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:2760
 #, 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:2760
+#: ../libpurple/protocols/oscar/oscar.c:2765
+#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2831
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: ../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 "无法给 %s 发送消息:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2827
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用:%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2830
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2859
 msgid "Online Since"
 msgstr "上线时间"
 
-#: ../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 "注册时间"
 
-#: ../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
 #, fuzzy
 msgid "Profile"
 msgstr "MSN 个人资料"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2990
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. 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."
@@ -10696,156 +6873,147 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: ../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 "您已经断开与聊天室 %s 的连接。"
 
-#: ../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 "移动电话"
 
-#: ../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 "额外信息"
 
-#: ../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 "邮政编码"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Division"
 msgstr "部门"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Position"
 msgstr "职务"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Web Page"
 msgstr "网页"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Work Information"
 msgstr "工作信息"
 
-#: ../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] "下列用户名已经和 %s 关联"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Screen name"
 msgstr "用户名"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: ../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 "您应当收到询问确认 %s 的邮件。"
 
-#: ../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 "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: ../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 "错误 0x%04x:无法格式化用户名,原因是用户名无效。"
 
-#: ../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 "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
 
-#: ../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 "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: ../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 "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: ../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 "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"您的用户名格式化后如下:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
-msgid "Account Info"
-msgstr "账户信息"
-
-#: ../libgaim/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4189
+#: ../libpurple/protocols/oscar/oscar.c:4037
+msgid "Account Info"
+msgstr "账户信息"
+
+#: ../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 "无法设置 AIM 配置文件。"
 
-#: ../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 "
@@ -10854,37 +7022,35 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4477
+#, c-format
+msgid ""
+"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] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
-
-#: ../libgaim/protocols/oscar/oscar.c:4461
+msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4505
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4527
+#, c-format
+msgid ""
+"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 字节。Gaim 自动为您截断了消息,并将您设为离"
-"开。"
-
-#: ../libgaim/protocols/oscar/oscar.c:4510
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4532
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: ../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 "
@@ -10894,35 +7060,34 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: ../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 "无法添加"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: ../libgaim/protocols/oscar/oscar.c:4686
-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 ""
-"Gaim 暂时无法从 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:4708
+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."
+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
 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 "
@@ -10930,12 +7095,12 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: ../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 "
@@ -10945,29 +7110,29 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: ../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 "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
 msgstr "给出的认证"
 
 #. 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 "用户 %s 允许您将他/她加入好友。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5218
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. 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 "
@@ -10977,113 +7142,114 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5222
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: ../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 "交换(_E):"
 
-#: ../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 "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: ../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 "离开消息"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(正获取)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5722
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: ../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 "您选择了与 %s 进行二人世界连接。"
 
-#: ../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 ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5926
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: ../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 "重新请求认证"
 
-#: ../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 "ICQ 隐私选项"
 
-#: ../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 "将地址更改为:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6152
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: ../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.\""
@@ -11091,96 +7257,101 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6173
 msgid "Find Buddy by E-Mail"
 msgstr "按电子邮件查找好友"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6174
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: ../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 "输入您想要搜索的好友的电子邮件地址。"
 
-#: ../libgaim/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6178
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6372
 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:6379
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: ../libgaim/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
 msgstr "显示当前注册的电子邮件地址"
 
-#: ../libgaim/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "更改当前注册的电子邮件地址..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6412
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: ../libgaim/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "按电子邮件搜索好友..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: ../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 "显示您发了多长时间呆"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6628
+#, fuzzy
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"总是使用 AIM/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 "请求 %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 "
@@ -11189,562 +7360,566 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1020
 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 "电子邮件"
 
-#: ../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:506
 msgid "Your information has been updated"
 msgstr "您的信息已更新"
 
-#: ../libgaim/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 "
-msgstr ""
-"您正在试图设定自定义头像。Gaim 目前只支持标准头像,请选择以下的头像"
-
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:565
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+msgstr "自定义头像目前不支持。请选择以下的头像"
+
+#: ../libpurple/protocols/qq/buddy_info.c:582
+#: ../libpurple/protocols/qq/buddy_info.c:595
 msgid "Invalid QQ Face"
 msgstr "无效的 QQ 头像"
 
-#: ../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 "您拒绝了 %d 的请求"
 
-#: ../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 "用户 %d 需要身份验证"
 
-#: ../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 "发送"
 
-#: ../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 "您已经将 %d 添加为好友"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:503
 msgid "QQid Error"
 msgstr "QQ 号错误"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:504
 msgid "Invalid QQid"
 msgstr "无效的 QQ 号"
 
-#: ../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 "QQ 群"
 
-#: ../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:122
 #, 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:123
+#: ../libpurple/protocols/qq/group_im.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:180
 #, 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: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 "QQ 群操作"
 
-#: ../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 "QQ 群认证"
 
-#: ../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 "您的身份验证操作已经被 QQ 服务器接受"
 
-#: ../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 "请注意,如果您是创始人,\n此操作将永久删除此群。"
-
-#: ../libgaim/protocols/qq/group_join.c:361
+msgstr ""
+"请注意,如果您是创始人,\n"
+"此操作将永久删除此群。"
+
+#: ../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 "代码 [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
+#: ../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 "系统消息"
 
-#: ../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 "发送对话失败\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: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 "无法连接。"
 
-#: ../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:438
 #, 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:439
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:443
 #, 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:444
 #, 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:445
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>我的公网 IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:450
 #, 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:451
 #, 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:452
 #, 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:456
 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 群"
 
@@ -11758,274 +7933,274 @@
 #. *< 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 "QQ 协议插件"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:740
 msgid "Login in TCP"
 msgstr "以 TCP 方式登录"
 
-#: ../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 "连接被拒绝"
 
-#: ../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: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 "您被 %s 添加为好友"
 
-#: ../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 "%s 已经将您[%s]添加为好友"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr "用户 %s 拒绝了您的请求"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr "用户 %s 批准了您的请求"
 
-#: ../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 "%s 想要将您[%s]添加为好友"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "消息:%s"
 
-#: ../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 "%s 不在您的好友列表中"
 
-#: ../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 "<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 ""
 
-#: ../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
 #, fuzzy, 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 "无法连接到主机"
 
-#: ../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 "无法发送消息: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2960
 #, fuzzy
 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 "文件传送"
 
-#: ../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 "支持"
 
-#: ../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 "请输入新会议的主题,以及向 %s 发送的邀请消息"
 
-#: ../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 "
@@ -12033,62 +8208,66 @@
 "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 "话题:"
+
+#: ../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 "Meanwhile 连接设置"
 
-#: ../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 "未知 (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4136
 #, fuzzy
 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 "用户名"
 
-#: ../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 "Sametime ID"
 
-#: ../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
 #, fuzzy, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12096,26 +8275,26 @@
 msgstr ""
 "发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4333
 msgid "Select User"
 msgstr "选择用户"
 
-#: ../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 "无法添加用户"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5010
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12124,63 +8303,63 @@
 "读取文件 %s 出错:\n"
 "%s。\n"
 
-#: ../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 "为账户 %s 导入 Sametime 列表"
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5247
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "为账户 %s 导出 Sametime 列表"
 
-#: ../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 "您的好友列表中已经存在名为“%s”的组。"
 
-#: ../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 "无法添加组"
 
-#: ../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 "Notes 地址簿组结果"
 
-#: ../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 "
@@ -12188,39 +8367,39 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5385
 msgid "Select Notes Address Book"
 msgstr "选择 Notes 地址簿"
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5427
 #, fuzzy
 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
 #, fuzzy
 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 "“%s”的搜索结果"
 
-#: ../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 "
@@ -12228,113 +8407,124 @@
 "buttons below."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: ../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 "导入 Sametime 列表..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "Export Sametime List..."
 msgstr "导出 Sametime 列表..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "Add Notes Address Book Group..."
 msgstr "添加 Notes 地址簿组..."
 
-#: ../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 "用户 %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: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 "收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12345,60 +8535,69 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: ../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 "获取公钥"
 
-#: ../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 "用户信息"
 
-#: ../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 "无法获取用户信息"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s 好友不可信"
 
-#: ../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."
@@ -12407,250 +8606,275 @@
 "钥。"
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "打开..."
 
-#: ../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 "%s 好友未出现于网络中"
 
-#: ../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 "导入(_I)..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "选择正确用户"
 
-#: ../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 "叫醒我"
 
-#: ../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 "多动"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1479
 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:1486
+#: ../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:1488
+#: ../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:1490
+#: ../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:1492
+#: ../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:1494
+#: ../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:1496
+#: ../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:1498
+#: ../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:1500
+#: ../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:1502
+#: ../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:1504
+#: ../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:1506
+#: ../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: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 "心情"
 
-#: ../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 "首选语言"
 
-#: ../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 "设备"
 
-#: ../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 "时区"
 
-#: ../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 "地理位置"
 
-#: ../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 "获取公钥..."
 
-#: ../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 "在白板上绘画"
 
-#: ../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>创建者密钥漏印:</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: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 "
@@ -12662,317 +8886,331 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: ../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 "添加/删除"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:578
 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: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 "请输入 %s 频道私有组的名称和密码句。"
 
-#: ../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 "允许限制"
 
-#: ../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 "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: ../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 "设置用户限制"
 
-#: ../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 "您是 <I>%s</I> 的频道建立者"
 
-#: ../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 "<I>%s</I> 的频道建立者是 <I>%s</I>"
 
-#: ../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 "在您加入私有组之前,必须先加入 %s 频道"
 
-#: ../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 "未知命令"
 
-#: ../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>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
 
-#: ../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:931
 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 "公钥漏印"
 
-#: ../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: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 "无法设定话题"
 
-#: ../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"
@@ -13007,113 +9245,115 @@
 "总计服务器管理员数: %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: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 "失败: 远程不支持提议的 KE 组"
 
-#: ../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 "失败: 远程不支持提议的 PKCS"
 
-#: ../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 "失败: 远程不支持 HMAC"
 
-#: ../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 "失败: 无效的 cookie"
 
-#: ../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 "收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
 
-#: ../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 "收到了 %s 的公钥。您想要接受此公钥吗?"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13126,65 +9366,74 @@
 "%s\n"
 "%s\n"
 
-#: ../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 "查看(_V)..."
 
-#: ../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 "连接失败"
 
-#: ../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
+#, fuzzy
+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 "您目前的心情"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+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"
@@ -13192,43 +9441,46 @@
 "\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 "短信"
 
-#: ../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 "彩信"
 
-#: ../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 "
@@ -13237,220 +9489,224 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: ../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 "创建新的 SILC 密钥对"
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:831
 msgid "Passphrases do not match"
 msgstr "密码句不匹配"
 
-#: ../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 "密钥长度"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:916
 msgid "Public key file"
 msgstr "公钥文件"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:918
 msgid "Private key file"
 msgstr "私钥文件"
 
-#: ../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 "在线状态"
 
-#: ../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 "创建 SILC 密钥对..."
 
-#: ../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 "用户 <I>%s</I> 未出现于网络中"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1295
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: ../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 "频道 %s 未找到"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1483
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%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 "%s 未设置频道模式"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1498
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: ../libgaim/protocols/silc/silc.c:1534
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "未知命令: %s,(可能是 Gaim bug)"
-
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1528
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "未知命令: %s,(可能是客户端 bug)"
+
+#: ../libpurple/protocols/silc/silc.c:1591
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1595
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1599
 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:1604
 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:1608
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1612
 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:1616
+#: ../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:1620
 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:1624
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1628
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1632
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1636
 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:1642
 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:1646
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1650
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: ../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 "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: ../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 ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1662
 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:1666
 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:1670
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: ../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 "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1678
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: ../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 "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: ../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 "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1690
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1694
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1699
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: ../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)"
@@ -13467,111 +9723,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1814
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1816
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+msgid "Network"
+msgstr "网络"
+
+#: ../libpurple/protocols/silc/silc.c:1853
 msgid "Public Key file"
 msgstr "公钥文件"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1857
 msgid "Private Key file"
 msgstr "私钥文件"
 
-#: ../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 "HMAC"
 
-#: ../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 "创建 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 "电子邮件:\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"
@@ -13582,7 +9843,7 @@
 "%s\n"
 "\n"
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -13591,72 +9852,73 @@
 "公钥漏印:\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 ""
 
-#: ../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 "白板"
 
 #. 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:1482
 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: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 "SIP 用户名不能包含空格或 @ 符号"
 
@@ -13668,159 +9930,159 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 协议插件"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 协议插件"
 
-#: ../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 "使用 UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "使用代理"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "代理"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1851
 #, fuzzy
 msgid "Auth User"
 msgstr "AP 用户"
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1853
 #, fuzzy
 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 的消息,原因是该消息太大。"
 
-#: ../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 的消息,原因是发送太快。"
 
-#: ../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 "电子邮件查阅被限制。"
 
-#: ../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."
@@ -13828,91 +10090,77 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: ../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 - 另存为..."
-
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "另存为..."
+
+#: ../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"
 
-#: ../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 请求您发送文件"
@@ -13927,60 +10175,59 @@
 #. *< 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:805
 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 "闪屏震动"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:875
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s 刚刚给您发送了闪屏振动!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "Authorization denied message:"
 msgstr "认证拒绝消息:"
 
-#: ../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 "%s 拒绝您将他/她加入好友。"
 
-#: ../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 "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: ../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."
-msgstr ""
-"Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
-"请检查 %s 上的更新。"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+"Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登入 Yahoo。请检查 %s 上"
+"的更新。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: ../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 "
@@ -13988,162 +10235,152 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 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 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
-"特性。"
-
-#: ../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 "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: ../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 "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: ../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 "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: ../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
 #, fuzzy
 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 "连接问题"
 
-#: ../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 "不在家"
 
-#: ../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 "不在桌前"
 
-#: ../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 "不在办公室"
 
-#: ../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 "度假中"
 
-#: ../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 "郊游"
 
-#: ../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 "不在服务器列表中"
 
-#: ../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
 #, fuzzy
 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
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: ../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
 #, fuzzy
 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 "激活哪个 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 "激活 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
+#, fuzzy
+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 "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: 列出 Yahoo 网络上的房间"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -14157,219 +10394,219 @@
 #. *< 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 "Yahoo 协议插件"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: ../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 "文件传送服务器"
 
-#: ../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 "文件传送端口"
 
-#: ../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 "聊天房间列表 URL"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天服务器"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 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"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 日本资料"
 
-#: ../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."
 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 "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接:"
 
-#: ../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 "酷链接 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: ../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."
 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 "
@@ -14378,107 +10615,109 @@
 "无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个"
 "人资料。如果您确定用户存在的话,请稍候再试。"
 
-#: ../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"
 "%s"
-msgstr "丢失与服务器的连接\n%s"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+msgstr ""
+"丢失与服务器的连接\n"
+"%s"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 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;"
 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;"
@@ -14486,7 +10725,7 @@
 "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;"
@@ -14494,15 +10733,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<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>,个人,*&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 "从服务器获取订阅"
 
@@ -14516,111 +10755,111 @@
 #. *< 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 "Zephyr 协议插件"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2960
 msgid "Use tzc"
 msgstr "使用 tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2963
 msgid "tzc command"
 msgstr "tzc 命令"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2966
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2969
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Import from .anyone"
 msgstr "从 .anyone 导入"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "Import from .zephyr.subs"
 msgstr "从 .zephyr.subs 导入"
 
-#: ../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
-#, fuzzy, c-format
+#: ../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 "无法创建套接字"
-
-#: ../libgaim/proxy.c:644
+msgstr "无法创建套接字:\n%s"
+
+#: ../libpurple/proxy.c:658
 #, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "无法发送消息: %s"
 
-#: ../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:1341
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 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:1360
 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:526
 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"
@@ -14629,149 +10868,4225 @@
 "%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:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 将状态从 %s 更改为 %s"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 现在 %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再 %s 了"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s 发起了呆"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 发完呆了"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 发起了呆"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1378
 #, 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:2442
 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %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 "读取您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2906
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2909
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:2935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:2947
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:2955
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小时"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:2961
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:2969
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:2975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../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 "无法连接到 %s"
 
-#: ../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
 #, fuzzy, c-format
 msgid "Error reading from %s: %s"
 msgstr "从套接字读取时出错。"
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3434
 #, fuzzy, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3459
 #, 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:390
+msgid "Login Options"
+msgstr "登入选项"
+
+#: ../pidgin/gtkaccount.c:492
+msgid "Local alias:"
+msgstr "本地别名:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:554
+msgid "User Options"
+msgstr "用户选项"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:572
+msgid "Use this buddy icon for this account:"
+msgstr "此账户使用此好友图标:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:684
+#, c-format
+msgid "%s Options"
+msgstr "%s 选项"
+
+#: ../pidgin/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "使用 GNOME 代理设置"
+
+#: ../pidgin/gtkaccount.c:882
+msgid "Use Global Proxy Settings"
+msgstr "使用全局代理设置"
+
+#: ../pidgin/gtkaccount.c:888
+msgid "No Proxy"
+msgstr "无代理"
+
+#: ../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 "使用环境设置"
+
+#. 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 "万事成蹉跎"
+
+#. 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 "明日复明日"
+
+#: ../pidgin/gtkaccount.c:975
+msgid "Proxy Options"
+msgstr "代理选项"
+
+#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "代理类型(_T):"
+
+#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "主机(_H):"
+
+#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "端口(_P):"
+
+#: ../pidgin/gtkaccount.c:1010
+msgid "_Username:"
+msgstr "用户名(_U):"
+
+#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "密码(_S):"
+
+#: ../pidgin/gtkaccount.c:1428
+msgid "Add Account"
+msgstr "添加账户"
+
+#: ../pidgin/gtkaccount.c:1452
+msgid "_Basic"
+msgstr "基本(_B)"
+
+#: ../pidgin/gtkaccount.c:1463
+msgid "_Advanced"
+msgstr "高级(_A)"
+
+#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../pidgin/gtkaccount.c:1961
+msgid "Protocol"
+msgstr "协议"
+
+#: ../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'>欢迎使用 %s!</span>\n"
+"\n"
+"您尚未配置即时通讯帐户。要用 %s 开始连接,请单击下方的<b>添加</b>按钮,以便配"
+"置您的第一个帐户。如果您想要让 %s 连接到多个即时通讯帐户,请再次单击<b>添加</"
+"b>按钮进行配置。\n"
+"\n"
+"如果您想要回到此窗口以便添加、编辑或删除帐户,可以从好友列表中窗口中选择<b>帐"
+"户->添加/编辑</b>"
+
+#: ../pidgin/gtkblist.c:704
+msgid "Join a Chat"
+msgstr "加入聊天"
+
+#: ../pidgin/gtkblist.c:725
+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/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "账户(_A):"
+
+#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:614
+msgid "_Block"
+msgstr "屏蔽(_B)"
+
+#: ../pidgin/gtkblist.c:1010
+msgid "Un_block"
+msgstr "取消屏蔽(_B)"
+
+#: ../pidgin/gtkblist.c:1061
+msgid "Get _Info"
+msgstr "资料(_I)"
+
+#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+msgid "I_M"
+msgstr "开聊(_M)"
+
+#: ../pidgin/gtkblist.c:1070
+msgid "_Send File"
+msgstr "传送(_S)"
+
+#: ../pidgin/gtkblist.c:1077
+msgid "Add Buddy _Pounce"
+msgstr "添加好友千里眼(_P)"
+
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
+#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+msgid "View _Log"
+msgstr "查看日志(_L)"
+
+#: ../pidgin/gtkblist.c:1097
+msgid "Alias..."
+msgstr "别名..."
+
+#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1213
+msgid "_Alias..."
+msgstr "别名(_A)..."
+
+#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
+#: ../pidgin/gtkblist.c:1215
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../pidgin/gtkblist.c:1155
+msgid "Add a _Buddy"
+msgstr "添加好友(_B)"
+
+#: ../pidgin/gtkblist.c:1157
+msgid "Add a C_hat"
+msgstr "添加聊天(_H)"
+
+#: ../pidgin/gtkblist.c:1160
+msgid "_Delete Group"
+msgstr "删除组(_D)"
+
+#: ../pidgin/gtkblist.c:1162
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#. join button
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: ../pidgin/gtkblist.c:1182
+msgid "Auto-Join"
+msgstr "自动加入"
+
+#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+msgid "_Collapse"
+msgstr "折叠(_C)"
+
+#: ../pidgin/gtkblist.c:1248
+msgid "_Expand"
+msgstr "展开(_E)"
+
+#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
+#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+msgid "/Tools/Mute Sounds"
+msgstr "/工具(T)/静音(S)"
+
+#: ../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 "您目前登入的协议中没有一个可以添加好友的。"
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2757
+msgid "/_Buddies"
+msgstr "/好友(_B)"
+
+#: ../pidgin/gtkblist.c:2758
+msgid "/Buddies/New Instant _Message..."
+msgstr "/好友(B)/新即时消息(_M)..."
+
+#: ../pidgin/gtkblist.c:2759
+msgid "/Buddies/Join a _Chat..."
+msgstr "/好友(B)/加入聊天(_C)..."
+
+#: ../pidgin/gtkblist.c:2760
+msgid "/Buddies/Get User _Info..."
+msgstr "/好友(B)/获取用户信息(_I)..."
+
+#: ../pidgin/gtkblist.c:2761
+msgid "/Buddies/View User _Log..."
+msgstr "/好友(B)/查看用户日志(_L)..."
+
+#: ../pidgin/gtkblist.c:2763
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/好友(B)/显示离线好友(_O)"
+
+#: ../pidgin/gtkblist.c:2764
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/好友(B)/显示空组(_E)"
+
+#: ../pidgin/gtkblist.c:2765
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/好友(B)/显示好友详细资料(_D)"
+
+#: ../pidgin/gtkblist.c:2766
+msgid "/Buddies/Show Idle _Times"
+msgstr "/好友(B)/显示发呆时间(_T)"
+
+#: ../pidgin/gtkblist.c:2767
+msgid "/Buddies/_Sort Buddies"
+msgstr "/好友(B)/好友排序(_S)"
+
+#: ../pidgin/gtkblist.c:2769
+msgid "/Buddies/_Add Buddy..."
+msgstr "/好友(B)/添加好友(_A)..."
+
+#: ../pidgin/gtkblist.c:2770
+msgid "/Buddies/Add C_hat..."
+msgstr "/好友(B)/添加聊天(_H)..."
+
+#: ../pidgin/gtkblist.c:2771
+msgid "/Buddies/Add _Group..."
+msgstr "/好友(B)/添加组(_G)..."
+
+#: ../pidgin/gtkblist.c:2773
+msgid "/Buddies/_Quit"
+msgstr "/好友(B)/退出(_Q)"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2776
+msgid "/_Accounts"
+msgstr "/账户(_A)"
+
+#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+msgid "/Accounts/Add\\/Edit"
+msgstr "/账户(A)/添加\\/编辑"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2780
+msgid "/_Tools"
+msgstr "/工具(_T)"
+
+#: ../pidgin/gtkblist.c:2781
+msgid "/Tools/Buddy _Pounces"
+msgstr "/工具(T)/好友千里眼(_P)"
+
+#: ../pidgin/gtkblist.c:2782
+msgid "/Tools/Plu_gins"
+msgstr "/工具(T)/插件(_G)"
+
+#: ../pidgin/gtkblist.c:2783
+msgid "/Tools/Pr_eferences"
+msgstr "/工具(T)/首选项(_E)"
+
+#: ../pidgin/gtkblist.c:2784
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具(T)/隐私(_I)"
+
+#: ../pidgin/gtkblist.c:2786
+msgid "/Tools/_File Transfers"
+msgstr "/工具(T)/文件传送(_F)"
+
+#: ../pidgin/gtkblist.c:2787
+msgid "/Tools/R_oom List"
+msgstr "/工具(T)/房间列表(_O)"
+
+#: ../pidgin/gtkblist.c:2788
+msgid "/Tools/System _Log"
+msgstr "/工具(T)/系统日志(_L)"
+
+#: ../pidgin/gtkblist.c:2790
+msgid "/Tools/Mute _Sounds"
+msgstr "/工具(T)/静音(_S)"
+
+#. Help
+#: ../pidgin/gtkblist.c:2793
+msgid "/_Help"
+msgstr "/帮助(_H)"
+
+#: ../pidgin/gtkblist.c:2794
+msgid "/Help/Online _Help"
+msgstr "/帮助(H)/在线帮助(_H)"
+
+#: ../pidgin/gtkblist.c:2795
+msgid "/Help/_Debug Window"
+msgstr "/帮助(H)/调试窗口(_D)"
+
+#: ../pidgin/gtkblist.c:2796
+msgid "/Help/_About"
+msgstr "/帮助(H)/关于(_A)"
+
+#: ../pidgin/gtkblist.c:2824
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>账户:</b>%s"
+
+#: ../pidgin/gtkblist.c:2902
+msgid "Buddy Alias"
+msgstr "好友别名"
+
+#: ../pidgin/gtkblist.c:2923
+msgid "Logged In"
+msgstr "已登入"
+
+#: ../pidgin/gtkblist.c:2969
+msgid "Last Seen"
+msgstr "上次见面"
+
+#: ../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 "发呆中 (%d小时%02d分) "
+
+#: ../pidgin/gtkblist.c:3320
+#, c-format
+msgid "Idle %dm"
+msgstr "发呆 %d分"
+
+#: ../pidgin/gtkblist.c:3457
+msgid "/Buddies/New Instant Message..."
+msgstr "/好友(B)/新即时消息..."
+
+#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+msgid "/Buddies/Join a Chat..."
+msgstr "/好友(B)/加入聊天(C)..."
+
+#: ../pidgin/gtkblist.c:3459
+msgid "/Buddies/Get User Info..."
+msgstr "/好友(B)/获取用户信息..."
+
+#: ../pidgin/gtkblist.c:3460
+msgid "/Buddies/Add Buddy..."
+msgstr "/好友(B)/添加好友..."
+
+#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+msgid "/Buddies/Add Chat..."
+msgstr "/好友(B)/添加聊天..."
+
+#: ../pidgin/gtkblist.c:3462
+msgid "/Buddies/Add Group..."
+msgstr "/好友(B)/添加组..."
+
+#: ../pidgin/gtkblist.c:3497
+msgid "/Tools/Buddy Pounces"
+msgstr "/工具(T)/好友千里眼(P)"
+
+#: ../pidgin/gtkblist.c:3500
+msgid "/Tools/Privacy"
+msgstr "/工具(T)/隐私(I)"
+
+#: ../pidgin/gtkblist.c:3503
+msgid "/Tools/Room List"
+msgstr "/工具(T)/房间列表(O)"
+
+#: ../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] "来自 %2$s 的 %1$d 条未读消息\n"
+
+#: ../pidgin/gtkblist.c:3677
+msgid "Manually"
+msgstr "手动"
+
+#: ../pidgin/gtkblist.c:3679
+msgid "Alphabetically"
+msgstr "按字母序"
+
+#: ../pidgin/gtkblist.c:3680
+msgid "By status"
+msgstr "按状态"
+
+#: ../pidgin/gtkblist.c:3681
+msgid "By log size"
+msgstr "按日志大小"
+
+#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s 已断开连接"
+
+#: ../pidgin/gtkblist.c:3892
+msgid "Re-enable Account"
+msgstr "重新启用账户"
+
+#: ../pidgin/gtkblist.c:3913
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s 已经断开连接:%s</span>"
+
+#: ../pidgin/gtkblist.c:4066
+msgid "<b>Username:</b>"
+msgstr "<b>用户名:</b>"
+
+#: ../pidgin/gtkblist.c:4073
+msgid "<b>Password:</b>"
+msgstr "<b>密码:</b>"
+
+#: ../pidgin/gtkblist.c:4084
+msgid "_Login"
+msgstr "登录(_L)"
+
+#: ../pidgin/gtkblist.c:4169
+msgid "/Accounts"
+msgstr "/账户(A)"
+
+#. 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 size='larger' weight='bold'>欢迎使用 %s!</span>\n"
+"\n"
+"您没有启用帐户。请通过<b>帐户->添加编辑</b>打开<b>帐户</b>窗口,从中启用您的"
+"即时通讯帐户。当您启用帐户之后,才可以登录、设定状态、和朋友交谈。"
+
+#. 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 "/好友(B)/显示离线好友(O)"
+
+#: ../pidgin/gtkblist.c:4428
+msgid "/Buddies/Show Empty Groups"
+msgstr "/好友(B)/显示空组(E)"
+
+#: ../pidgin/gtkblist.c:4434
+msgid "/Buddies/Show Buddy Details"
+msgstr "/好友(B)/显示好友详细资料(D)"
+
+#: ../pidgin/gtkblist.c:4437
+msgid "/Buddies/Show Idle Times"
+msgstr "/好友(B)/显示发呆时间(T)"
+
+#: ../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 ""
+"您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
+"的话,别名将会替代用户名显示。\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 "组:"
+
+#: ../pidgin/gtkblist.c:5590
+msgid "This protocol does not support chat rooms."
+msgstr "此协议不支持聊天室。"
+
+#: ../pidgin/gtkblist.c:5606
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您目前登入的协议中没有一个可以聊天的。"
+
+#: ../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 "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
+
+#: ../pidgin/gtkblist.c:5730
+msgid "Please enter the name of the group to be added."
+msgstr "请输入要添加的组名称。"
+
+#: ../pidgin/gtkblist.c:6364
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/账户(A)/"
+
+#: ../pidgin/gtkblist.c:6388
+msgid "_Edit Account"
+msgstr "编辑账户(_E)"
+
+#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+msgid "No actions available"
+msgstr "没有可用的操作"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "_Disable"
+msgstr "禁用(_D)"
+
+#: ../pidgin/gtkblist.c:6421
+msgid "Enable Account"
+msgstr "启用账户"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/帐户(A)/启用帐户"
+
+#: ../pidgin/gtkblist.c:6476
+msgid "/Tools"
+msgstr "/工具(T)"
+
+#: ../pidgin/gtkblist.c:6546
+msgid "/Buddies/Sort Buddies"
+msgstr "/好友(B)/好友排序(S)"
+
+#: ../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:1141
+#: ../pidgin/gtksavedstatuses.c:1477
+msgid "_Message:"
+msgstr "消息(_M):"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../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:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+msgid "Find"
+msgstr "查找"
+
+#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "搜索文字(_S):"
+
+#: ../pidgin/gtkconv.c:1338
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
+
+#: ../pidgin/gtkconv.c:1346
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "记录已停止。此会话中的后续消息将不会被记录。"
+
+#: ../pidgin/gtkconv.c:1614
+msgid "Un-Ignore"
+msgstr "取消忽略"
+
+#: ../pidgin/gtkconv.c:1617
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../pidgin/gtkconv.c:1637
+msgid "Get Away Message"
+msgstr "获得离开消息"
+
+#: ../pidgin/gtkconv.c:1660
+msgid "Last said"
+msgstr "上次说道"
+
+#: ../pidgin/gtkconv.c:2495
+msgid "Unable to save icon file to disk."
+msgstr "无法将图标文件保存到磁盘。"
+
+#: ../pidgin/gtkconv.c:2565
+msgid "Save Icon"
+msgstr "保存图标"
+
+#: ../pidgin/gtkconv.c:2614
+msgid "Animate"
+msgstr "动画"
+
+#: ../pidgin/gtkconv.c:2619
+msgid "Hide Icon"
+msgstr "隐藏图标"
+
+#: ../pidgin/gtkconv.c:2622
+msgid "Save Icon As..."
+msgstr "图标另存为..."
+
+#: ../pidgin/gtkconv.c:2626
+msgid "Set Custom Icon..."
+msgstr "设置自定义图标..."
+
+#: ../pidgin/gtkconv.c:2633
+msgid "Remove Custom Icon"
+msgstr "删除自定义图标"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2774
+msgid "/_Conversation"
+msgstr "/对话(_C)"
+
+#: ../pidgin/gtkconv.c:2776
+msgid "/Conversation/New Instant _Message..."
+msgstr "/对话(C)/新即时消息(_M)..."
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/_Find..."
+msgstr "/对话(C)/查找(_F)..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/View _Log"
+msgstr "/对话(C)/查看日志(_L)"
+
+#: ../pidgin/gtkconv.c:2784
+msgid "/Conversation/_Save As..."
+msgstr "/对话(C)/另存为(_S)..."
+
+#: ../pidgin/gtkconv.c:2786
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/对话(C)/清除回滚(_R)"
+
+#: ../pidgin/gtkconv.c:2790
+msgid "/Conversation/Se_nd File..."
+msgstr "/对话(C)/发送文件(_N)..."
+
+#: ../pidgin/gtkconv.c:2791
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/对话(C)/添加好友千里眼(_P)..."
+
+#: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/_Get Info"
+msgstr "/对话(C)/获取信息(_G)"
+
+#: ../pidgin/gtkconv.c:2795
+msgid "/Conversation/In_vite..."
+msgstr "/对话(C)/邀请(_V)..."
+
+#: ../pidgin/gtkconv.c:2797
+msgid "/Conversation/M_ore"
+msgstr "/对话(C)/更多(_O)"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Conversation/Al_ias..."
+msgstr "/对话(C)/别名(_L)..."
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Conversation/_Block..."
+msgstr "/对话(C)/屏蔽(_B)..."
+
+#: ../pidgin/gtkconv.c:2805
+msgid "/Conversation/_Unblock..."
+msgstr "/对话(C)/取消屏蔽(_U)..."
+
+#: ../pidgin/gtkconv.c:2807
+msgid "/Conversation/_Add..."
+msgstr "/对话(C)/添加(_A)..."
+
+#: ../pidgin/gtkconv.c:2809
+msgid "/Conversation/_Remove..."
+msgstr "/对话(C)/删除(_R)..."
+
+#: ../pidgin/gtkconv.c:2814
+msgid "/Conversation/_Close"
+msgstr "/对话(C)/关闭(_C)"
+
+#. Options
+#: ../pidgin/gtkconv.c:2818
+msgid "/_Options"
+msgstr "/选项(_O)"
+
+#: ../pidgin/gtkconv.c:2819
+msgid "/Options/Enable _Logging"
+msgstr "/选项(O)/允许记录日志(_L)"
+
+#: ../pidgin/gtkconv.c:2820
+msgid "/Options/Enable _Sounds"
+msgstr "/选项(O)/允许声音(_S)"
+
+#: ../pidgin/gtkconv.c:2821
+msgid "/Options/Show Buddy _Icon"
+msgstr "/选项(O)/显示好友图标(_I)"
+
+#: ../pidgin/gtkconv.c:2823
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/选项(O)/显示格式工具栏(_T)"
+
+#: ../pidgin/gtkconv.c:2824
+msgid "/Options/Show Ti_mestamps"
+msgstr "/选项(O)/显示时间戳(_I)"
+
+#: ../pidgin/gtkconv.c:2899
+msgid "/Conversation/More"
+msgstr "/对话(C)/更多(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:2944 ../pidgin/gtkconv.c:2976
+msgid "/Conversation"
+msgstr "/对话(C)"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/View Log"
+msgstr "/对话(C)/查看日志(L)"
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Send File..."
+msgstr "/对话(C)/发送文件(N)..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/对话(C)/添加好友千里眼(P)..."
+
+#: ../pidgin/gtkconv.c:3000
+msgid "/Conversation/Get Info"
+msgstr "/对话(C)/获取信息(G)"
+
+#: ../pidgin/gtkconv.c:3004
+msgid "/Conversation/Invite..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Conversation/Alias..."
+msgstr "/对话(C)/别名(L)..."
+
+#: ../pidgin/gtkconv.c:3014
+msgid "/Conversation/Block..."
+msgstr "/对话(C)/屏蔽(B)..."
+
+#: ../pidgin/gtkconv.c:3018
+msgid "/Conversation/Unblock..."
+msgstr "/对话(C)/取消屏蔽(U)..."
+
+#: ../pidgin/gtkconv.c:3022
+msgid "/Conversation/Add..."
+msgstr "/对话(C)/添加(A)..."
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Conversation/Remove..."
+msgstr "/对话(C)/删除(R)..."
+
+#: ../pidgin/gtkconv.c:3030
+msgid "/Options/Enable Logging"
+msgstr "/选项(O)/允许记录(L)"
+
+#: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Sounds"
+msgstr "/选项(O)/允许声音(S)"
+
+#: ../pidgin/gtkconv.c:3046
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/选项(O)/显示格式工具栏(T)"
+
+#: ../pidgin/gtkconv.c:3049
+msgid "/Options/Show Timestamps"
+msgstr "/选项(O)/显示时间戳(I)"
+
+#: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Buddy Icon"
+msgstr "/选项(O)/显示好友图标(I)"
+
+#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+msgid "User is typing..."
+msgstr "用户正在打字..."
+
+#: ../pidgin/gtkconv.c:3176
+msgid "User has typed something and stopped"
+msgstr "用户打了几个字,停了一下"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3358
+msgid "_Send To"
+msgstr "发送到(_S)"
+
+#: ../pidgin/gtkconv.c:4065
+msgid "_Send"
+msgstr "发送(_S)"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4213
+msgid "0 people in room"
+msgstr "聊天室里没有人"
+
+#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "聊天室里有 %d 个人"
+
+#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+msgid "Typing"
+msgstr "正打字"
+
+#: ../pidgin/gtkconv.c:5986
+msgid "Stopped Typing"
+msgstr "停止打字"
+
+#: ../pidgin/gtkconv.c:5991
+msgid "Nick Said"
+msgstr "昵称说"
+
+#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "未读消息"
+
+#: ../pidgin/gtkconv.c:6001
+msgid "New Event"
+msgstr "新事件"
+
+#: ../pidgin/gtkconv.c:7122
+msgid "Confirm close"
+msgstr "确认关闭"
+
+#: ../pidgin/gtkconv.c:7154
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "您有未读取的消息。您确定真的想要关闭窗口吗?"
+
+#: ../pidgin/gtkconv.c:7689
+msgid "Close other tabs"
+msgstr "关闭其它标签"
+
+#: ../pidgin/gtkconv.c:7695
+msgid "Close all tabs"
+msgstr "关闭全部标签"
+
+#: ../pidgin/gtkconv.c:7703
+msgid "Detach this tab"
+msgstr "此标签漂移"
+
+#: ../pidgin/gtkconv.c:7709
+msgid "Close this tab"
+msgstr "关闭此标签"
+
+#: ../pidgin/gtkconv.c:8012
+msgid "Close conversation"
+msgstr "关闭对话"
+
+#: ../pidgin/gtkconv.c:8476
+msgid "Last created window"
+msgstr "上次创建的窗口"
+
+#: ../pidgin/gtkconv.c:8478
+msgid "Separate IM and Chat windows"
+msgstr "分离即时消息和聊天窗口"
+
+#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "新建窗口"
+
+#: ../pidgin/gtkconv.c:8482
+msgid "By group"
+msgstr "按组"
+
+#: ../pidgin/gtkconv.c:8484
+msgid "By account"
+msgstr "按账户"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "保存调试日志"
+
+#: ../pidgin/gtkdebug.c:594
+msgid "Invert"
+msgstr "反转"
+
+#: ../pidgin/gtkdebug.c:597
+msgid "Highlight matches"
+msgstr "突出显示匹配项"
+
+#: ../pidgin/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "只有图标(_I)"
+
+#: ../pidgin/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "只有文本(_T)"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "图标和文本(_B)"
+
+#: ../pidgin/gtkdebug.c:802
+msgid "Filter"
+msgstr "过滤"
+
+#: ../pidgin/gtkdebug.c:821
+msgid "Right click for more options."
+msgstr "用右键单击可查看更多选项。"
+
+#: ../pidgin/gtkdebug.c:851
+msgid "Level "
+msgstr "级别 "
+
+#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "选择调试过滤器级别。"
+
+#: ../pidgin/gtkdebug.c:860
+msgid "All"
+msgstr "全部"
+
+#: ../pidgin/gtkdebug.c:861
+msgid "Misc"
+msgstr "杂类"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Warning"
+msgstr "警告"
+
+#: ../pidgin/gtkdebug.c:864
+msgid "Error "
+msgstr "错误 "
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "严重错误"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+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:86
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+msgid "developer"
+msgstr "开发者"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "开发者和网管"
+
+#: ../pidgin/gtkdialogs.c:84
+msgid "support"
+msgstr "支持"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support/QA"
+msgstr "支持/质控"
+
+#: ../pidgin/gtkdialogs.c:107
+msgid "win32 port"
+msgstr "Win32 移植"
+
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+msgid "maintainer"
+msgstr "维护者"
+
+#: ../pidgin/gtkdialogs.c:110
+msgid "libfaim maintainer"
+msgstr "libfaim 维护者"
+
+#. 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 "骇客和专属驱动程序[lazy bum]"
+
+#: ../pidgin/gtkdialogs.c:113
+msgid "XMPP developer"
+msgstr "XMPP 开发者"
+
+#: ../pidgin/gtkdialogs.c:114
+msgid "original author"
+msgstr "原作者"
+
+#: ../pidgin/gtkdialogs.c:121
+msgid "Afrikaans"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:122
+msgid "Arabic"
+msgstr "阿拉伯语"
+
+#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:205
+msgid "Bulgarian"
+msgstr "保加利亚语"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+msgid "Bengali"
+msgstr "孟加拉语"
+
+#: ../pidgin/gtkdialogs.c:129
+msgid "Bosnian"
+msgstr "波斯尼亚语"
+
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+msgid "Catalan"
+msgstr "加泰罗尼亚语"
+
+#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+msgid "Valencian-Catalan"
+msgstr "巴伦西亚-加泰罗尼亚语"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+msgid "Czech"
+msgstr "捷克语"
+
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+msgid "Danish"
+msgstr "丹麦语"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:209
+msgid "German"
+msgstr "德语"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+msgid "Dzongkha"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+msgid "Greek"
+msgstr "希腊语"
+
+#: ../pidgin/gtkdialogs.c:143
+msgid "Australian English"
+msgstr "澳大利亚英语"
+
+#: ../pidgin/gtkdialogs.c:144
+msgid "Canadian English"
+msgstr "加拿大英语"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "British English"
+msgstr "英国英语"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Esperanto"
+msgstr "世界语"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
+msgid "Persian"
+msgstr "波斯语"
+
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "French"
+msgstr "法语"
+
+#: ../pidgin/gtkdialogs.c:155
+msgid "Galician"
+msgstr "加利西亚语"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+msgid "Gujarati"
+msgstr "古吉拉特语"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+msgid "Hebrew"
+msgstr "希伯莱语"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Hindi"
+msgstr "印地语"
+
+#: ../pidgin/gtkdialogs.c:160
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: ../pidgin/gtkdialogs.c:161
+#, fuzzy
+msgid "Indonesian"
+msgstr "马其顿语"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+msgid "Italian"
+msgstr "意大利语"
+
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+msgid "Japanese"
+msgstr "日语"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Georgian"
+msgstr "乔治亚语"
+
+#: ../pidgin/gtkdialogs.c:165
+#, fuzzy
+msgid "Kannada"
+msgstr "屏蔽"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgid "Korean"
+msgstr "朝鲜语"
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:169
+msgid "Kurdish"
+msgstr "库得语"
+
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: ../pidgin/gtkdialogs.c:171
+msgid "Macedonian"
+msgstr "马其顿语"
+
+#: ../pidgin/gtkdialogs.c:172
+#, fuzzy
+msgid "Bokmål Norwegian"
+msgstr "挪威语"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Nepali"
+msgstr "尼泊尔语"
+
+#: ../pidgin/gtkdialogs.c:174
+#, fuzzy
+msgid "Dutch, Flemish"
+msgstr "荷兰语"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Norwegian"
+msgstr "挪威语"
+
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgid "Polish"
+msgstr "波兰语"
+
+#: ../pidgin/gtkdialogs.c:179
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Portuguese-Brazil"
+msgstr "巴西葡萄牙语"
+
+#: ../pidgin/gtkdialogs.c:181
+#, fuzzy
+msgid "Pashto"
+msgstr "相片"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+msgid "Russian"
+msgstr "俄语"
+
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+msgid "Slovak"
+msgstr "斯洛伐克语"
+
+#: ../pidgin/gtkdialogs.c:185
+msgid "Slovack"
+msgstr "斯洛伐克语"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Albanian"
+msgstr "阿尔巴尼亚语"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+msgid "Serbian"
+msgstr "塞尔维亚语"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: ../pidgin/gtkdialogs.c:191
+msgid "Tamil"
+msgstr "泰米尔语"
+
+#: ../pidgin/gtkdialogs.c:192
+msgid "Telugu"
+msgstr "泰卢固语"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Thai"
+msgstr "泰语"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Vietnamese"
+msgstr "越南语"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh 及 Gnome 越南语团队"
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:238
+msgid "Traditional Chinese"
+msgstr "繁体中文"
+
+#: ../pidgin/gtkdialogs.c:204
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: ../pidgin/gtkdialogs.c:323
+#, c-format
+msgid "About %s"
+msgstr "关于 %s"
+
+#: ../pidgin/gtkdialogs.c:359
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
+"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 ""
+
+#: ../pidgin/gtkdialogs.c:374
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidwin<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> irc.freenode.net 上的 #pidgin<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:383
+msgid "Current Developers"
+msgstr "当前开发者"
+
+#: ../pidgin/gtkdialogs.c:398
+msgid "Crazy Patch Writers"
+msgstr "疯狂补丁编写者"
+
+#: ../pidgin/gtkdialogs.c:413
+msgid "Retired Developers"
+msgstr "退休开发者"
+
+#: ../pidgin/gtkdialogs.c:428
+msgid "Artists"
+msgstr "美工"
+
+#: ../pidgin/gtkdialogs.c:443
+msgid "Current Translators"
+msgstr "当前翻译者"
+
+#: ../pidgin/gtkdialogs.c:463
+msgid "Past Translators"
+msgstr "先前翻译者"
+
+#: ../pidgin/gtkdialogs.c:481
+msgid "Debugging Information"
+msgstr "调试信息"
+
+#: ../pidgin/gtkdialogs.c:855
+msgid "Get User Info"
+msgstr "获取用户信息"
+
+#: ../pidgin/gtkdialogs.c:857
+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:967
+msgid "Alias Contact"
+msgstr "给联系人起名"
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Enter an alias for this contact."
+msgstr "请输入此联系人的别名。"
+
+#: ../pidgin/gtkdialogs.c:988
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "输入 %s 的别名。"
+
+#: ../pidgin/gtkdialogs.c:990
+msgid "Alias Buddy"
+msgstr "好友别名"
+
+#: ../pidgin/gtkdialogs.c:1009
+msgid "Alias Chat"
+msgstr "给聊天起名"
+
+#: ../pidgin/gtkdialogs.c:1010
+msgid "Enter an alias for this chat."
+msgstr "请输入此聊天的别名。"
+
+#: ../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] ""
+"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
+"吗?"
+
+#: ../pidgin/gtkdialogs.c:1055
+msgid "Remove Contact"
+msgstr "删除联系人"
+
+#: ../pidgin/gtkdialogs.c:1056
+msgid "_Remove Contact"
+msgstr "删除联系人(_R)"
+
+#: ../pidgin/gtkdialogs.c:1086
+#, fuzzy, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
+
+#: ../pidgin/gtkdialogs.c:1093
+msgid "Merge Groups"
+msgstr "合并组"
+
+#: ../pidgin/gtkdialogs.c:1094
+msgid "_Merge Groups"
+msgstr "合并组(_M)"
+
+#: ../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 "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
+
+#: ../pidgin/gtkdialogs.c:1147
+msgid "Remove Group"
+msgstr "删除组"
+
+#: ../pidgin/gtkdialogs.c:1148
+msgid "_Remove Group"
+msgstr "删除组(_R)"
+
+#: ../pidgin/gtkdialogs.c:1181
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
+
+#: ../pidgin/gtkdialogs.c:1184
+msgid "Remove Buddy"
+msgstr "删除好友"
+
+#: ../pidgin/gtkdialogs.c:1185
+msgid "_Remove Buddy"
+msgstr "删除好友(_R)"
+
+#: ../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 "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
+
+#: ../pidgin/gtkdialogs.c:1209
+msgid "Remove Chat"
+msgstr "删除聊天"
+
+#: ../pidgin/gtkdialogs.c:1210
+msgid "_Remove Chat"
+msgstr "删除聊天(_R)"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr "用鼠标右键单击可查看更多未读消息...\n"
+
+#: ../pidgin/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "更改状态"
+
+#: ../pidgin/gtkdocklet.c:495
+msgid "Show Buddy List"
+msgstr "显示好友列表"
+
+#: ../pidgin/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "新消息..."
+
+#: ../pidgin/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "静音"
+
+#: ../pidgin/gtkdocklet.c:543
+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
+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:96
+msgid "_Pause"
+msgstr "暂停(_P)"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "继续(_R)"
+
+#: ../pidgin/gtkimhtml.c:793
+msgid "Paste as Plain _Text"
+msgstr "粘贴为纯文本(_T)"
+
+#: ../pidgin/gtkimhtml.c:810
+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 "超级链接悬停颜色"
+
+#: ../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 "复制电子邮件地址(_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: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。"
+
+#: ../pidgin/gtkimhtml.c:3274
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"无法识别文件类型\n"
+"\n"
+"默认为 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'>保存图像出错</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3290
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"保存图像出错\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+msgid "Save Image"
+msgstr "保存图像"
+
+#: ../pidgin/gtkimhtml.c:3410
+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"
+
+#: ../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: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 "您真的想要删除 %s 吗?"
+
+#: ../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 "您真的想要删除 %s 吗?"
+
+#: ../pidgin/gtklog.c:278
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "您真的想要删除选中的已存状态吗?"
+
+#: ../pidgin/gtklog.c:419
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>于 %2$s 在 %1$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'>在 %2$s 与 %1$s 的对话</span>"
+
+#: ../pidgin/gtklog.c:469
+msgid "%B %Y"
+msgstr "%Y年%m月"
+
+#: ../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 "未找到日志。"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:542
+msgid "_Browse logs folder"
+msgstr "浏览日志文件夹(_B)"
+
+#: ../pidgin/gtklog.c:606
+msgid "Total log size:"
+msgstr "总计日志大小:"
+
+#: ../pidgin/gtklog.c:675
+#, c-format
+msgid "Conversations in %s"
+msgstr "与 %s 的对话"
+
+#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#, c-format
+msgid "Conversations with %s"
+msgstr "与 %s 的对话"
+
+#: ../pidgin/gtklog.c:760
+msgid "System Log"
+msgstr "系统日志"
+
+#: ../pidgin/gtkmain.c:364
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s。试试“%s -h”查看帮助。\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"
+"用法: %s [选项]...\n"
+"\n"
+"  -c, --config=目录   使用“目录”存储配置文件\n"
+"  -d, --debug         将调试信息打印到标准输出\n"
+"  -h, --help          显示帮助并退出\n"
+"  -n, --nologin       不自动登入\n"
+"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
+"  -v, --version       显示当前版本并退出\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 "打开全部消息"
+
+#: ../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 封新邮件。"
+
+#: ../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>"
+
+#: ../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:285
+msgid "Unload Plugins"
+msgstr "卸载插件"
+
+#: ../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\">编写者:</span>\t%s\n"
+"<span weight=\"bold\">网站:</span>\t\t%s\n"
+"<span weight=\"bold\">文件名:</span>\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\">错误:%s\n"
+"请检查插件网站中的更新。</span>"
+
+#: ../pidgin/gtkplugin.c:533
+msgid "Configure Pl_ugin"
+msgstr "配置插件(_U)"
+
+#: ../pidgin/gtkplugin.c:596
+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:522
+msgid "Pounce on Whom"
+msgstr "监视对象"
+
+#: ../pidgin/gtkpounce.c:549
+msgid "_Buddy name:"
+msgstr "好友名称(_B):"
+
+#: ../pidgin/gtkpounce.c:583
+msgid "Si_gns on"
+msgstr "登入(_G)"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Signs o_ff"
+msgstr "登出(_F)"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "离开(_W)"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "回来(_U)"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "发起了呆(_I)"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Is no longer i_dle"
+msgstr "发完了呆(_D)"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Starts _typing"
+msgstr "开始打字(_T)"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "P_auses while typing"
+msgstr "输入时暂停(_A)"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "Stops t_yping"
+msgstr "停止打字(_Y)"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Sends a _message"
+msgstr "发送消息(_M)"
+
+#: ../pidgin/gtkpounce.c:644
+msgid "Ope_n an IM window"
+msgstr "打开即时消息窗口(_N)"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "_Pop up a notification"
+msgstr "弹出通知(_P)"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "Send a _message"
+msgstr "发送消息(_M)"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "E_xecute a command"
+msgstr "执行命令(_X)"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "P_lay a sound"
+msgstr "播放声音(_L)"
+
+#: ../pidgin/gtkpounce.c:657
+msgid "Brows_e..."
+msgstr "浏览(_E)..."
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Br_owse..."
+msgstr "浏览(_O)..."
+
+#: ../pidgin/gtkpounce.c:660
+msgid "Pre_view"
+msgstr "预览(_V)"
+
+#: ../pidgin/gtkpounce.c:784
+msgid "P_ounce only when my status is not available"
+msgstr "仅当我的状态不可用时才监视(_O)"
+
+#: ../pidgin/gtkpounce.c:789
+msgid "_Recurring"
+msgstr "再现(_R)"
+
+#: ../pidgin/gtkpounce.c:1243
+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:1646
+#: ../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 "隐藏新的 IM 对话(_H):"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+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 "在同一标签窗口内显示即时消息和聊天(_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:"
+
+#: ../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"
+"(%s 代表 URL)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "日志格式(_F):"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "记录所有即时消息(_I)"
+
+#: ../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:1521
+msgid "Quietest"
+msgstr "最小"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "较小"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "小"
+
+#: ../pidgin/gtkprefs.c:1529
+msgid "Loud"
+msgstr "大"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Louder"
+msgstr "较大"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Loudest"
+msgstr "最大"
+
+#: ../pidgin/gtkprefs.c:1596
+msgid "Sound Method"
+msgstr "声音方式"
+
+#: ../pidgin/gtkprefs.c:1597
+msgid "_Method:"
+msgstr "方式(_M):"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "Console beep"
+msgstr "控制台响铃"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Automatic"
+msgstr "自动"
+
+#: ../pidgin/gtkprefs.c:1604
+msgid "Command"
+msgstr "命令"
+
+#: ../pidgin/gtkprefs.c:1605
+msgid "No sounds"
+msgstr "无声音"
+
+#: ../pidgin/gtkprefs.c:1613
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"声音命令(_O):\n"
+"(%s 代表文件名)"
+
+#: ../pidgin/gtkprefs.c:1639
+msgid "Sound Options"
+msgstr "声音选项"
+
+#: ../pidgin/gtkprefs.c:1640
+msgid "Sounds when conversation has _focus"
+msgstr "对话获得焦点后发声(_F)"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "启用声音:"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "仅当可用时"
+
+#: ../pidgin/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "仅当不可用时"
+
+#: ../pidgin/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "音量:"
+
+#: ../pidgin/gtkprefs.c:1681
+msgid "Sound Events"
+msgstr "声音事件"
+
+#: ../pidgin/gtkprefs.c:1732
+msgid "Play"
+msgstr "播放"
+
+#: ../pidgin/gtkprefs.c:1739
+msgid "Event"
+msgstr "事件"
+
+#: ../pidgin/gtkprefs.c:1758
+msgid "Test"
+msgstr "测试"
+
+#: ../pidgin/gtkprefs.c:1762
+msgid "Reset"
+msgstr "重置"
+
+#: ../pidgin/gtkprefs.c:1766
+msgid "Choose..."
+msgstr "选择..."
+
+#: ../pidgin/gtkprefs.c:1809
+msgid "_Report idle time:"
+msgstr "报告发呆时间(_R):"
+
+#: ../pidgin/gtkprefs.c:1814
+msgid "Based on keyboard or mouse use"
+msgstr "根据键盘或鼠标使用"
+
+#: ../pidgin/gtkprefs.c:1823
+msgid "_Auto-reply:"
+msgstr "自动回复(_A):"
+
+#: ../pidgin/gtkprefs.c:1827
+msgid "When both away and idle"
+msgstr "离开和发呆时"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1833
+msgid "Auto-away"
+msgstr "自动离开"
+
+#: ../pidgin/gtkprefs.c:1835
+msgid "Change status when _idle"
+msgstr "发呆时更改状态(_I)"
+
+#: ../pidgin/gtkprefs.c:1839
+msgid "_Minutes before changing status:"
+msgstr "更改状态前等几分钟(_M):"
+
+#: ../pidgin/gtkprefs.c:1847
+msgid "Change _status to:"
+msgstr "将状态更改为(_S):"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1868
+msgid "Status at Startup"
+msgstr "启动时的状态"
+
+#: ../pidgin/gtkprefs.c:1870
+msgid "Use status from last _exit at startup"
+msgstr "启动时使用上次退出时的状态(_E)"
+
+#: ../pidgin/gtkprefs.c:1876
+msgid "Status to a_pply at startup:"
+msgstr "启动时应用的状态(_P):"
+
+#: ../pidgin/gtkprefs.c:1914
+msgid "Interface"
+msgstr "界面"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Smiley Themes"
+msgstr "表情主题"
+
+#: ../pidgin/gtkprefs.c:1917
+msgid "Sounds"
+msgstr "声音"
+
+#: ../pidgin/gtkprefs.c:1923
+msgid "Browser"
+msgstr "浏览器"
+
+#: ../pidgin/gtkprefs.c:1927
+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:576
+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:578
+msgid "_Permit"
+msgstr "允许(_P)"
+
+#: ../pidgin/gtkprivacy.c:570
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "允许 %s 联系您吗?"
+
+#: ../pidgin/gtkprivacy.c:572
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "您真的想要允许 %s 联系您吗?"
+
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+msgid "Block User"
+msgstr "屏蔽用户"
+
+#: ../pidgin/gtkprivacy.c:600
+msgid "Type a user to block."
+msgstr "输入要屏蔽的用户。"
+
+#: ../pidgin/gtkprivacy.c:601
+msgid "Please enter the name of the user you wish to block."
+msgstr "请输入您想要屏蔽的用户名称。"
+
+#: ../pidgin/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "屏蔽 %s 吗?"
+
+#: ../pidgin/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "您真的想要屏蔽 %s 吗?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "应用"
+
+#: ../pidgin/gtkrequest.c:1469
+msgid "That file already exists"
+msgstr "该文件已存在"
+
+#: ../pidgin/gtkrequest.c:1470
+msgid "Would you like to overwrite it?"
+msgstr "您是否想要覆盖?"
+
+#: ../pidgin/gtkrequest.c:1471
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: ../pidgin/gtkrequest.c:1472
+msgid "Choose New Name"
+msgstr "选择新名称"
+
+#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+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:579 ../pidgin/gtksavedstatuses.c:1213
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: ../pidgin/gtksavedstatuses.c:725
+msgid "Title already in use.  You must choose a unique title."
+msgstr "标题已在使用中。您必须选择唯一的标题。"
+
+#: ../pidgin/gtksavedstatuses.c:913
+msgid "Different"
+msgstr "不同"
+
+#: ../pidgin/gtksavedstatuses.c:1106
+msgid "_Title:"
+msgstr "标题(_T):"
+
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+msgid "_Status:"
+msgstr "状态(_S):"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1157
+msgid "Use a _different status for some accounts"
+msgstr "为某些账户使用不同的状态(_D)"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1221
+msgid "Sa_ve & Use"
+msgstr "保存并使用(_V)"
+
+#: ../pidgin/gtksavedstatuses.c:1427
+#, 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:611
+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:1420
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "无法发送文件夹 %s。"
+
+#: ../pidgin/gtkutils.c:1421
+#, 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
+msgid "You have dragged an image"
+msgstr "您拖曳了图像"
+
+#: ../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 ""
+"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
+
+#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+msgid "Set as buddy icon"
+msgstr "设置为好友头像"
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+msgid "Send image file"
+msgstr "发送图像文件"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+msgid "Insert in message"
+msgstr "在消息中插入"
+
+#: ../pidgin/gtkutils.c:1463
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "您是否想要将其设置为此用户的头像?"
+
+#: ../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 ""
+"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图"
+"标。"
+
+#: ../pidgin/gtkutils.c:1470
+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: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>文件:</b> %s\n"
+"<b>文件大小:</b> %s\n"
+"<b>图像大小:</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 ""
+
+#: ../pidgin/gtkutils.c:2613
+msgid "Icon Error"
+msgstr "图标错误"
+
+#: ../pidgin/gtkutils.c:2614
+msgid "Could not set icon"
+msgstr "无法设定图标"
+
+#: ../pidgin/gtkutils.c:2715
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "打开文件“%s”:%s"
+
+#: ../pidgin/gtkutils.c:2764
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "保存文件"
+
+#: ../pidgin/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "选择颜色"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Alias"
+msgstr "别名(_A)"
+
+#: ../pidgin/pidginstock.c:90
+msgid "Close _tabs"
+msgstr "关闭标签(_T)"
+
+#: ../pidgin/pidginstock.c:92
+msgid "_Get Info"
+msgstr "获得信息(_G)"
+
+#: ../pidgin/pidginstock.c:93
+msgid "_Invite"
+msgstr "邀请(_I)"
+
+#: ../pidgin/pidginstock.c:94
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: ../pidgin/pidginstock.c:95
+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
+#, fuzzy
+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:149
+msgid "minutes"
+msgstr "分钟"
+
+#. 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 "阀值:"
+
+#. *< 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 "在对话中应用"
+
+#: ../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 "按数字放置时分离即时消息和聊天窗口"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "扩展放置"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "额外的对话放置选项。"
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:139
+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 "一个范例插件 - 参看描述。"
+
+#. *  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"
+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:289
+msgid "Mouse Gestures"
+msgstr "鼠标手势"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "提供鼠标手势的支持"
+
+#. *  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 ""
+"允许在对话窗口中支持鼠标手势。\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 "无法发送电子邮件。"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "Evolution 可执行文件未在 PATH 中找到。"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "此好友未发现电子邮件地址。"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "添加到地址簿"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "发送电子邮件"
+
+#. 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 "电子邮件:"
+
+#. *< 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
+#, fuzzy
+msgid "Markerline"
+msgstr "下划线"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#, fuzzy
+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 "即时消息窗口(_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: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仅当别人在聊天中提到您的名字(_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 属性中插入新消息数(_X)"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "设置窗口管理器“紧急”提示(_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:895
+msgid "Message Notification"
+msgstr "消息通知"
+
+#. *< 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 "提供各种方法通知您有未读消息。"
+
+#: ../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:616
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ 主题控制"
+
+#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "提供对常用 gtkrc 设置的访问。"
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Raw"
+
+#: ../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 (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"允许您将输入原样发送给基于文本的协议(XMPP,MSN,IRC,TOC)。在输入框中按回车"
+"键可以发送。看看调试窗口。"
+
+#: ../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.sourceforge.net/"
+"\">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 "定期检查新版本并通知用户更新记录。"
+
+#: ../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 "区分大小写匹配(不选中代表自动处理大小写)"
+
+#: ../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:2367
+msgid "Text replacement"
+msgstr "文本替换"
+
+#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+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:136
+msgid "Display Timestamps Every"
+msgstr "显示时间戳的间隔"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:195
+msgid "Timestamp"
+msgstr "时间戳"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "显示 iChat 风格的时间戳"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "每 N 分钟显示一次 iChat 风格的时间戳。"
+
+#: ../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 "强制(传统 %s) 24小时制时间格式(_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:144
+msgid "Message Timestamp Formats"
+msgstr "消息时间戳格式"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:147
+msgid "Customizes the message timestamp formats."
+msgstr "自定义消息时间戳的格式。"
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:149
+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 "即时消息对话窗口"
+
+#: ../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:658
+msgid "Transparency"
+msgstr "透明度"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "好友列表和对话窗口的可变透明度。"
+
+#. *  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 ""
+"此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
+"\n"
+"* 注意: 此插件需要 Win2000 或更高版本。"
+
+#: ../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:369
+msgid "Pidgwin Options"
+msgstr "Pidgwin 选项"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Options specific to Pidgin for Windows."
+msgstr "Pidgin for Windows 特定的选项。"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "提供 Pidgin for Windows 特定的选项,比如好友列表停靠。"
+
+#: ../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 服务器或客户端。"
+